23.1.8 release

ChangeLog

@@ -1,3 +1,17 @@
+28-FEB-2024: 23.1.8
+
+- Remove unnecessary servlets from deployment
+- Fixes possible XSS in print preview title [CSP-3018]
+- Fixes editBlankUrl for subpaths [drawio-4152]
+- Fixes possible NPE in Sidebar
+- Salesforce shape library fix
+- AWS shapes update [DS-951]
+- [conf cloud] Fixed some re-indexing issues in logging and search text property [DID-10652]
+
+26-FEB-2024: 23.1.7
+
+- Debug build to attempt to find rogue resources load
+
 22-FEB-2024: 23.1.6
 
 - Fixes possible XSS in tooltips for overlays [CSP-2969]

README.md

@@ -11,7 +11,7 @@ The source code authored by us in this repo is licensed under the Apache v2. The
 
 The JGraph provided icons and diagram templates are licensed under the [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/). Additional terms may also apply where the icons are originally defined by a third-party copyright holder. We have checked in all cases that the original license allows use in this project. Also see the terms for using the draw.io logo below.
 
-Additional minified JavaScript files and Java libraries are used in this project. All of the licenses are deemed compatible with the Apache 2.0, nothing is GPL or AGPL, due diligence is performed on all third-party code.
+Additional minified JavaScript files and Java libraries are used in this project. All of the licenses are deemed compatible with the Apache 2.0, nothing is GPL or AGPL, due dilgence is performed on all third-party code.
 
 We make no copyright claim on the content you create with this software, regardless of the copyright of individual icons used in such content.
 
@@ -58,4 +58,4 @@ Do not use any draw.io logo as the icon or logo for your business/organization,
 
 Do not modify the permitted draw.io logos, including changing the color, dimensions, or combining with other words or design elements.
 
-Do not use JGraph trademarks or logos without JGraph’s prior written permission.
+Do not use JGraph trademarks or logos without JGraph’s prior written permission.

VERSION

@@ -1 +1 @@
-23.1.6
+23.1.8

src/main/mxgraph/view/mxPrintPreview.js

@@ -742,7 +742,7 @@ mxPrintPreview.prototype.writeHead = function(doc, css)
 {
 	if (this.title != null)
 	{
-		doc.writeln('<title>' + this.title + '</title>');
+		doc.writeln('<title>' + mxUtils.htmlEntities(this.title) + '</title>');
 	}
 
 	// Adds all required stylesheets
@@ -775,14 +775,14 @@ mxPrintPreview.prototype.writeHead = function(doc, css)
 			((pf.height / this.pixelsPerInch) + this.pageMargin).toFixed(2) + 'in;';
 
 		doc.writeln('@page {');
-		doc.writeln('  margin: ' + this.pageMargin + 'in;');
-		doc.writeln('  size: ' + size);
+		doc.writeln('  margin: ' + mxUtils.htmlEntities(this.pageMargin) + 'in;');
+		doc.writeln('  size: ' + mxUtils.htmlEntities(size));
 		doc.writeln('}');
 	}
 
 	if (css != null)
 	{
-		doc.writeln(css);
+		doc.writeln(mxUtils.htmlEntities(css, false, false, false));
 	}
 
 	doc.writeln('</style>');

src/main/webapp/js/diagramly/App.js

@@ -1103,7 +1103,7 @@ App.main = function(callback, createUi)
 					{
 						mxLanguage = 'en';
 						doLoad(mxResources.getDefaultBundle(RESOURCE_BASE, mxLanguage) ||
-								mxResources.getSpecialBundle(RESOURCE_BASE, mxLanguage));
+							mxResources.getSpecialBundle(RESOURCE_BASE, mxLanguage));
 					};
 				}
 			});

src/main/webapp/js/diagramly/DriveClient.js

@@ -1330,34 +1330,34 @@ DriveClient.prototype.saveFile = function(file, revision, success, errFn, noChec
 			}
 
 			// Logs failed save
-			try
-			{
-				if (!file.isConflict(e))
-				{
-					var err = 'sl_' + file.saveLevel + '-error_' +
-						(file.getErrorMessage(e) || 'unknown');
+			// try
+			// {
+			// 	if (!file.isConflict(e))
+			// 	{
+			// 		var err = 'sl_' + file.saveLevel + '-error_' +
+			// 			(file.getErrorMessage(e) || 'unknown');
 
-					if (e != null && e.error != null && e.error.code != null)
-					{
-						err += '-code_' + e.error.code;
-					}
+			// 		if (e != null && e.error != null && e.error.code != null)
+			// 		{
+			// 			err += '-code_' + e.error.code;
+			// 		}
 
-					EditorUi.logEvent({category: 'ERROR-SAVE-FILE-' + file.getHash() + '-rev_' +
-						file.desc.headRevisionId + '-mod_' + file.desc.modifiedDate +
-							'-size_' + file.getSize() + '-mime_' + file.desc.mimeType +
-						((this.ui.editor.autosave) ? '' : '-nosave') +
-						((file.isAutosave()) ? '' : '-noauto') +
-						((file.changeListenerEnabled) ? '' : '-nolisten') +
-						((file.inConflictState) ? '-conflict' : '') +
-						((file.invalidChecksum) ? '-invalid' : ''),
-						action: err, label: ((this.user != null) ? ('user_' + this.user.id) : 'nouser') +
-						((file.sync != null) ? ('-client_' + file.sync.clientId) : '-nosync')});
-				}
-			}
-			catch (ex)
-			{
-				// ignore
-			}
+			// 		EditorUi.logEvent({category: 'ERROR-SAVE-FILE-' + file.getHash() + '-rev_' +
+			// 			file.desc.headRevisionId + '-mod_' + file.desc.modifiedDate +
+			// 				'-size_' + file.getSize() + '-mime_' + file.desc.mimeType +
+			// 			((this.ui.editor.autosave) ? '' : '-nosave') +
+			// 			((file.isAutosave()) ? '' : '-noauto') +
+			// 			((file.changeListenerEnabled) ? '' : '-nolisten') +
+			// 			((file.inConflictState) ? '-conflict' : '') +
+			// 			((file.invalidChecksum) ? '-invalid' : ''),
+			// 			action: err, label: ((this.user != null) ? ('user_' + this.user.id) : 'nouser') +
+			// 			((file.sync != null) ? ('-client_' + file.sync.clientId) : '-nosync')});
+			// 	}
+			// }
+			// catch (ex)
+			// {
+			// 	// ignore
+			// }
 		});
 
 		var criticalError = mxUtils.bind(this, function(e)

src/main/webapp/js/diagramly/Editor.js

@@ -8204,7 +8204,7 @@
 	mxStencilRegistry.libraries['pid2misc'] = [SHAPES_PATH + '/pid2/mxPidMisc.js', STENCIL_PATH + '/pid/misc.xml'];
 	mxStencilRegistry.libraries['pid2valves'] = [SHAPES_PATH + '/pid2/mxPidValves.js'];
 	mxStencilRegistry.libraries['pidFlowSensors'] = [STENCIL_PATH + '/pid/flow_sensors.xml'];
-	mxStencilRegistry.libraries['salesforce'] = [SHAPES_PATH + '/mxSalesforce.js', STENCIL_PATH + '/salesforce.xml'];
+	mxStencilRegistry.libraries['salesforce'] = [STENCIL_PATH + '/salesforce.xml'];
 	mxStencilRegistry.libraries['emoji'] = [SHAPES_PATH + '/emoji/mxEmoji.js'];
 
 	// Triggers dynamic loading for markers

src/main/webapp/js/diagramly/EditorUi.js

@@ -2899,28 +2899,28 @@
 					EditorUi.debug('File.closed', [file]);
 				}
 
-				if (file.isModified() && file.constructor == DriveFile &&
-					file.desc != null && this.drive != null)
-				{
-					var evt = {category: 'WARN-CLOSE-MODIFIED-FILE-' + file.getHash(),
-						action: (discarded ? 'DISCARDED' : 'WARNED') + ((file.savingFile) ? 'saving' : '') +
-						((file.savingFile && file.savingFileTime != null) ? '_' +
-							Math.round((Date.now() - file.savingFileTime.getTime()) / 1000) : '') +
-						((file.saveLevel != null) ? ('-sl_' + file.saveLevel) : '') +
-						'-age_' + ((file.ageStart != null) ? Math.round((Date.now() - file.ageStart.getTime()) / 1000) : 'x') +
-						((this.editor.autosave) ? '' : '-nosave') +
-						((file.isAutosave()) ? '' : '-noauto') +
-						'-open_' + ((file.opened != null) ? Math.round((Date.now() - file.opened.getTime()) / 1000) : 'x') +
-						'-save_' + ((file.lastSaved != null) ? Math.round((Date.now() - file.lastSaved.getTime()) / 1000) : 'x') +
-						'-change_' + ((file.lastChanged != null) ? Math.round((Date.now() - file.lastChanged.getTime()) / 1000) : 'x') +
-						'-alive_' + Math.round((Date.now() - App.startTime.getTime()) / 1000),
-						label: ((file.sync != null) ? ('client_' + file.sync.clientId) : 'nosync') +
-							((this.drive.user != null) ? ('-user_' + this.drive.user.id) : '-nouser') + '-rev_' +
-							file.desc.headRevisionId + '-mod_' + file.desc.modifiedDate + '-size_' + file.getSize() +
-							'-mime_' + file.desc.mimeType};
-
-					EditorUi.logEvent(evt);
-				}
+				// if (file.isModified() && file.constructor == DriveFile &&
+				// 	file.desc != null && this.drive != null)
+				// {
+				// 	var evt = {category: 'WARN-CLOSE-MODIFIED-FILE-' + file.getHash(),
+				// 		action: (discarded ? 'DISCARDED' : 'WARNED') + ((file.savingFile) ? 'saving' : '') +
+				// 		((file.savingFile && file.savingFileTime != null) ? '_' +
+				// 			Math.round((Date.now() - file.savingFileTime.getTime()) / 1000) : '') +
+				// 		((file.saveLevel != null) ? ('-sl_' + file.saveLevel) : '') +
+				// 		'-age_' + ((file.ageStart != null) ? Math.round((Date.now() - file.ageStart.getTime()) / 1000) : 'x') +
+				// 		((this.editor.autosave) ? '' : '-nosave') +
+				// 		((file.isAutosave()) ? '' : '-noauto') +
+				// 		'-open_' + ((file.opened != null) ? Math.round((Date.now() - file.opened.getTime()) / 1000) : 'x') +
+				// 		'-save_' + ((file.lastSaved != null) ? Math.round((Date.now() - file.lastSaved.getTime()) / 1000) : 'x') +
+				// 		'-change_' + ((file.lastChanged != null) ? Math.round((Date.now() - file.lastChanged.getTime()) / 1000) : 'x') +
+				// 		'-alive_' + Math.round((Date.now() - App.startTime.getTime()) / 1000),
+				// 		label: ((file.sync != null) ? ('client_' + file.sync.clientId) : 'nosync') +
+				// 			((this.drive.user != null) ? ('-user_' + this.drive.user.id) : '-nouser') + '-rev_' +
+				// 			file.desc.headRevisionId + '-mod_' + file.desc.modifiedDate + '-size_' + file.getSize() +
+				// 			'-mime_' + file.desc.mimeType};
+
+				// 	EditorUi.logEvent(evt);
+				// }
 			}
 		}
 		catch (e)
@@ -3138,20 +3138,20 @@
 					}
 				}
 
-				if (EditorUi.enableLogging && !this.isOffline())
-				{
-		        	try
-		        	{
-		        		EditorUi.logEvent({category: 'ERROR-LOAD-FILE-' +
-		        			((file != null) ? file.getHash() : 'none'),
-		        			action: 'message_' + e.message,
-		        			label: 'stack_' + e.stack});
-		        	}
-		        	catch (e)
-		        	{
-		        		// ignore
-		        	}
-				}
+				// if (EditorUi.enableLogging && !this.isOffline())
+				// {
+		        // 	try
+		        // 	{
+		        // 		EditorUi.logEvent({category: 'ERROR-LOAD-FILE-' +
+		        // 			((file != null) ? file.getHash() : 'none'),
+		        // 			action: 'message_' + e.message,
+		        // 			label: 'stack_' + e.stack});
+		        // 	}
+		        // 	catch (e)
+		        // 	{
+		        // 		// ignore
+		        // 	}
+				// }
 
 				// Asynchronous handling of errors
 				var fn = mxUtils.bind(this, function()
@@ -8584,33 +8584,33 @@
 
 							try
 							{
-								EditorUi.logEvent({category: 'LUCIDCHART-IMPORT-FILE',
-									action: 'size_' + data.length});
+								// EditorUi.logEvent({category: 'LUCIDCHART-IMPORT-FILE',
+								// 	action: 'size_' + data.length});
 
-									if (window.console != null && urlParams['test'] == '1')
-									{
-										var args = [new Date().toISOString(), 'convertLucidChart', obj];
-
-										if (obj.state != null)
-										{
-											args.push(JSON.parse(obj.state));
-										}
-
-										if (obj.svgThumbs != null)
-										{
-											for (var i = 0; i < obj.svgThumbs.length; i++)
-											{
-												args.push(Editor.createSvgDataUri(obj.svgThumbs[i]));
-											}
-										}
+								if (window.console != null && urlParams['test'] == '1')
+								{
+									var args = [new Date().toISOString(), 'convertLucidChart', obj];
 
-										if (obj.thumb != null)
+									if (obj.state != null)
+									{
+										args.push(JSON.parse(obj.state));
+									}
+
+									if (obj.svgThumbs != null)
+									{
+										for (var i = 0; i < obj.svgThumbs.length; i++)
 										{
-											args.push(obj.thumb);
+											args.push(Editor.createSvgDataUri(obj.svgThumbs[i]));
 										}
+									}
 
-										console.log.apply(console, args);
+									if (obj.thumb != null)
+									{
+										args.push(obj.thumb);
 									}
+
+									console.log.apply(console, args);
+								}
 							}
 							catch (e)
 							{

src/main/webapp/js/diagramly/Trees.js

@@ -1307,7 +1307,8 @@
 		{
 			var result = sidebarCreateAdvancedShapes.apply(this, arguments);
 			var graph = this.graph;
-
+			var sb = this;
+
 			// Style that defines the key, value pairs to be used for creating styles of new connections if no incoming edge exists
 			var orgEdgeStyle = 'edgeStyle=elbowEdgeStyle;elbow=vertical;sourcePerimeterSpacing=0;' +
 				'targetPerimeterSpacing=0;startArrow=none;endArrow=none;rounded=0;curved=0;';
@@ -1562,7 +1563,7 @@
 
 					cell2.insertEdge(edge2, false);
 
-				    	return sb.createVertexTemplateFromCells([edge, edge2, cell, cell2], 220, 60, 'Sub Sections');
+				    return sb.createVertexTemplateFromCells([edge, edge2, cell, cell2], 220, 60, 'Sub Sections');
 				})
 			]);
 		};

src/main/webapp/js/diagramly/sidebar/Sidebar-AWS4.js

@@ -31,12 +31,12 @@
 		this.addAWS4ApplicationIntegrationPalette(s, w, h, w2, gn, sb);
 		this.setCurrentSearchEntryLibrary('aws4', 'aws4AR VR');
 		this.addAWS4ARVRPalette(s, w, h, w2, gn, sb);
-		this.setCurrentSearchEntryLibrary('aws4', 'aws4Cloud Financial Management');
-		this.addAWS4CloudFinancialManagementPalette(s, w, h, w2, gn, sb);
 		this.setCurrentSearchEntryLibrary('aws4', 'aws4Blockchain');
 		this.addAWS4BlockchainPalette(s, w, h, w2, gn, sb);
 		this.setCurrentSearchEntryLibrary('aws4', 'aws4Business Applications');
 		this.addAWS4BusinessApplicationsPalette(s, w, h, w2, gn, sb);
+		this.setCurrentSearchEntryLibrary('aws4', 'aws4Cloud Financial Management');
+		this.addAWS4CloudFinancialManagementPalette(s, w, h, w2, gn, sb);
 		this.setCurrentSearchEntryLibrary('aws4', 'aws4Compute');
 		this.addAWS4ComputePalette(s, w, h, w2, gn, sb);
 		this.setCurrentSearchEntryLibrary('aws4', 'aws4Contact Center');
@@ -459,6 +459,8 @@
 					 w2, w2, '', 'Simple Queue Service', null, null, this.getTagsForStencil(gn, 'sqs simple queue service', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.appsync;',
 					 w2, w2, '', 'AppSync', null, null, this.getTagsForStencil(gn, 'appsync', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.b2b_data_interchange;',
+					 w2, w2, '', 'B2B Data Interchange', null, null, this.getTagsForStencil(gn, 'b2b data interchange', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.eventbridge;',
 					 w2, w2, '', 'EventBridge', null, null, this.getTagsForStencil(gn, 'eventbridge event bridge', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.managed_workflows_for_apache_airflow;',
@@ -588,8 +590,6 @@
 					 w2, w2, '', 'Chime SDK', null, null, this.getTagsForStencil(gn, 'chime sdk software development kit', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.chime;',
 					 w2, w2, '', 'Chime Voice Connector', null, null, this.getTagsForStencil(gn, 'chime voice connector', dt).join(' ')),
-			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.connect;',
-					 w2, w2, '', 'Connect', null, null, this.getTagsForStencil(gn, 'connect', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.honeycode;',
 					 w2, w2, '', 'Honeycode', null, null, this.getTagsForStencil(gn, 'honeycode', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.pinpoint;',
@@ -916,7 +916,9 @@
 		this.addPaletteFunctions('aws4Contact Center', 'AWS / Contact Center', false,
 		[
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.contact_center;',
-					 w2, w2, '', 'Contact Center', null, null, this.getTagsForStencil(gn, 'contact center', dt).join(' '))
+					 w2, w2, '', 'Contact Center', null, null, this.getTagsForStencil(gn, 'contact center', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.connect;',
+					 w2, w2, '', 'Connect', null, null, this.getTagsForStencil(gn, 'connect', dt).join(' '))
 		]);
 	};
 
@@ -993,6 +995,8 @@
 					 w2, w2, '', 'Professional Services', null, null, this.getTagsForStencil(gn, 'professional services', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.repost;',
 					 w2, w2, '', 'rePost', null, null, this.getTagsForStencil(gn, 'repost', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.repost_private;',
+					 w2, w2, '', 'rePost Private', null, null, this.getTagsForStencil(gn, 'repost private', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.support;',
 					 w2, w2, '', 'Support', null, null, this.getTagsForStencil(gn, 'support', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.training_certification;',
@@ -1204,6 +1208,8 @@
 					 w2, w2, '', 'WorkLink', null, null, this.getTagsForStencil(gn, 'worklink', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.workspaces_family;',
 					 w2, w2, '', 'WorkSpaces Family', null, null, this.getTagsForStencil(gn, 'workspaces family', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.workspaces_thin_client;',
+					 w2, w2, '', 'WorkSpaces Thin Client', null, null, this.getTagsForStencil(gn, 'workspaces thin client', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.workdocs;',
 					 w2, w2, '', 'WorkDocs', null, null, this.getTagsForStencil(gn, 'workdocs', dt).join(' ')),
 
@@ -1536,6 +1542,8 @@
 					 w2, w2, '', 'Personalize', null, null, this.getTagsForStencil(gn, 'personalize', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.polly;',
 					 w2, w2, '', 'Polly', null, null, this.getTagsForStencil(gn, 'polly', dt).join(' ')),
+			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.q;',
+					 w2, w2, '', 'Q', null, null, this.getTagsForStencil(gn, 'q', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.rekognition_2;',
 					 w2, w2, '', 'Rekognition', null, null, this.getTagsForStencil(gn, 'rekognition', dt).join(' ')),
 			 this.createVertexTemplateEntry(n2 + 'resourceIcon;resIcon=' + gn + '.sagemaker;',

src/main/webapp/js/diagramly/sidebar/Sidebar-DFD.js

@@ -2,6 +2,7 @@
 {
 	Sidebar.prototype.addDFDPalette = function()
 	{
+		var sb = this;
 		var w = 100;
 		var h = 100;
 		var s = 'html=1;dashed=0;whiteSpace=wrap;shape=mxgraph.dfd.';