Fix microsoft#84301

octref · octref · commit f4a8c1d587ca · 2019-11-11T10:11:28.000-08:00
diff --git a/src/vs/workbench/contrib/url/common/trustedDomainsValidator.ts b/src/vs/workbench/contrib/url/common/trustedDomainsValidator.ts
@@ -158,7 +158,11 @@ export function isURLDomainTrusted(url: URI, trustedDomains: string[]) {
 		}
 
 		if (url.authority === parsedTrustedDomain.authority) {
-			return pathMatches(url.path, parsedTrustedDomain.path);
+			if (pathMatches(url.path, parsedTrustedDomain.path)) {
+				return true;
+			} else {
+				continue;
+			}
 		}
 
 		if (trustedDomains[i].indexOf('*') !== -1) {
diff --git a/src/vs/workbench/test/contrib/linkProtection.test.ts b/src/vs/workbench/test/contrib/linkProtection.test.ts
@@ -70,5 +70,7 @@ suite('Link protection domain matching', () => {
 
 		linkNotAllowedByRules('https://a.x.org/bar', ['https://*.x.org/foo']);
 		linkNotAllowedByRules('https://a.b.x.org/bar', ['https://*.x.org/foo']);
+
+		linkAllowedByRules('https://github.com', ['https://github.com/foo/bar', 'https://github.com']);
 	});
 });

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,11 @@ export function isURLDomainTrusted(url: URI, trustedDomains: string[]) {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`if (url.authority === parsedTrustedDomain.authority) {`
`161`		`- return pathMatches(url.path, parsedTrustedDomain.path);`
	`161`	`+ if (pathMatches(url.path, parsedTrustedDomain.path)) {`
	`162`	`+ return true;`
	`163`	`+ } else {`
	`164`	`+ continue;`
	`165`	`+ }`
`162`	`166`	`}`
`163`	`167`
`164`	`168`	`if (trustedDomains[i].indexOf('*') !== -1) {`