maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Case-normalize github paths to fix #99294.

Browse source
This commit is contained in:
Jackson Kearl 2020-06-03 12:20:15 -07:00
parent 6041d7b0ed
commit 38891ed12b
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
View file

@ -157,15 +157,33 @@ function isLocalhostAuthority(authority: string) {
return rLocalhost.test(authority) || r127.test(authority);
}
/**
* Case-normalize some case-insinsitive URLs, such as github.
*/
function normalizeURL(url: string | URI): string {
const caseInsensitiveAuthorities = ['github.com'];
try {
const parsed = typeof url === 'string' ? URI.parse(url, true) : url;
if (caseInsensitiveAuthorities.includes(parsed.authority)) {
return parsed.with({ path: parsed.path.toLowerCase() }).toString(true);
} else {
return parsed.toString(true);
}
} catch { return url.toString(); }
}
/**
* Check whether a domain like https://www.microsoft.com matches
* the list of trusted domains.
*
* - Schemes must match
* - There's no subdomain matching. For example https://microsoft.com doesn't match https://www.microsoft.com
* - There's no subdomsain matching. For example https://microsoft.com doesn't match https://www.microsoft.com
* - Star matches all subdomains. For example https://*.microsoft.com matches https://www.microsoft.com and https://foo.bar.microsoft.com
*/
export function isURLDomainTrusted(url: URI, trustedDomains: string[]) {
url = URI.parse(normalizeURL(url));
trustedDomains = trustedDomains.map(normalizeURL);
if (isLocalhostAuthority(url.authority)) {
return true;
}

6
src/vs/workbench/contrib/url/test/browser/trustedDomains.test.ts
View file

@ -78,4 +78,10 @@ suite('Link protection domain matching', () => {
linkAllowedByRules('https://github.com', ['https://github.com/foo/bar', 'https://github.com']);
});
test('case normalization', () => {
// https://github.com/microsoft/vscode/issues/99294
linkAllowedByRules('https://github.com/Microsoft/vscode/issues/new', ['https://github.com/microsoft']);
linkAllowedByRules('https://github.com/microsoft/vscode/issues/new', ['https://github.com/Microsoft']);
});
});