Fix microsoft#143985 (microsoft#143989)

Jackson Kearl · web-flow · commit 194373761569 · 2022-02-28T08:44:50.000-08:00
* Fix microsoft#143985 * Sanitize md style image refs as welll
diff --git a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
@@ -161,7 +161,7 @@ function sanitize(documentContent: string, allowUnknownProtocols: boolean): stri
 		for (const attr of ['href', 'src']) {
 			if (node.hasAttribute(attr)) {
 				anchor.href = node.getAttribute(attr) as string;
-				if (!allowedProtocols.includes(anchor.protocol)) {
+				if (!allowedProtocols.includes(anchor.protocol.replace(/:$/, ''))) {
 					node.removeAttribute(attr);
 				}
 			}
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -474,7 +474,22 @@ export class GettingStartedPage extends EditorPane {
 	}
 
 	private mdCache = new ResourceMap<Promise<string>>();
-	private async readAndCacheStepMarkdown(path: URI): Promise<string> {
+	private async readAndCacheStepMarkdown(path: URI, base: URI): Promise<string> {
+
+		const transformUri = (src: string) => {
+			const path = joinPath(base, src);
+			return asWebviewUri(path).toString();
+		};
+		const transformUris = (content: string): string => content
+			.replace(/src="([^"]*)"/g, (_, src: string) => {
+				if (src.startsWith('https://')) { return `src="${src}"`; }
+				return `src="${transformUri(src)}"`;
+			})
+			.replace(/!\[([^\]]*)\]\(([^)]*)\)/g, (_, title: string, src: string) => {
+				if (src.startsWith('https://')) { return `![${title}](${src})`; }
+				return `![${title}](${transformUri(src)})`;
+			});
+
 		if (!this.mdCache.has(path)) {
 			this.mdCache.set(path, (async () => {
 				try {
@@ -483,7 +498,7 @@ export class GettingStartedPage extends EditorPane {
 						return new Promise<string>(resolve => {
 							require([moduleId], content => {
 								const markdown = content.default();
-								resolve(renderMarkdownDocument(markdown, this.extensionService, this.languageService, true, true));
+								resolve(renderMarkdownDocument(transformUris(markdown), this.extensionService, this.languageService, true, true));
 							});
 						});
 					}
@@ -512,7 +527,7 @@ export class GettingStartedPage extends EditorPane {
 								: path);
 
 					const markdown = bytes.value.toString();
-					return renderMarkdownDocument(markdown, this.extensionService, this.languageService, true, true);
+					return renderMarkdownDocument(transformUris(markdown), this.extensionService, this.languageService, true, true);
 				} catch (e) {
 					this.notificationService.error('Error reading markdown document at `' + path + '`: ' + e);
 					return '';
@@ -772,18 +787,10 @@ export class GettingStartedPage extends EditorPane {
 	}
 
 	private async renderMarkdown(path: URI, base: URI): Promise<string> {
-		const content = await this.readAndCacheStepMarkdown(path);
+		const content = await this.readAndCacheStepMarkdown(path, base);
 		const nonce = generateUuid();
 		const colorMap = TokenizationRegistry.getColorMap();
 
-		const uriTranformedContent = content.replace(/src="([^"]*)"/g, (_, src: string) => {
-			if (src.startsWith('https://')) { return `src="${src}"`; }
-
-			const path = joinPath(base, src);
-			const transformed = asWebviewUri(path).toString();
-			return `src="${transformed}"`;
-		});
-
 		const css = colorMap ? generateTokensCSSForColorMap(colorMap) : '';
 
 		const inDev = document.location.protocol === 'http:';
@@ -854,7 +861,7 @@ export class GettingStartedPage extends EditorPane {
 			</head>
 			<body>
 				<vertically-centered>
-					${uriTranformedContent}
+					${content}
 				</vertically-centered>
 			</body>
 			<script nonce="${nonce}">

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ function sanitize(documentContent: string, allowUnknownProtocols: boolean): stri`
`161`	`161`	`for (const attr of ['href', 'src']) {`
`162`	`162`	`if (node.hasAttribute(attr)) {`
`163`	`163`	`anchor.href = node.getAttribute(attr) as string;`
`164`		`- if (!allowedProtocols.includes(anchor.protocol)) {`
	`164`	`+ if (!allowedProtocols.includes(anchor.protocol.replace(/:$/, ''))) {`
`165`	`165`	`node.removeAttribute(attr);`
`166`	`166`	`}`
`167`	`167`	`}`