Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #81843

Browse Source
This commit is contained in:
Pine Wu
2019-10-03 11:44:56 -07:00
parent b88efcac1d
commit 8266e1c67b
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vs/workbench/contrib/url/common/trustedDomainsFileSystemProvider.ts
View File

@@ -33,8 +33,7 @@ const TRUSTED_DOMAINS_STAT: IStat = {
size: 0
};
const CONFIG_HELP_TEXT_PRE =
`// Links matching one or more entries in the list below can be opened without link protection.
const CONFIG_HELP_TEXT_PRE = `// Links matching one or more entries in the list below can be opened without link protection.
// The following examples show what entries can look like:
// - "https://microsoft.com": Matches this specific domain using https
// - "https://*.microsoft.com": Match all domains ending in "microsoft.com" using https
@@ -95,23 +94,36 @@ export class TrustedDomainsFileSystemProvider implements IFileSystemProvider, IW
}
readFile(resource: URI): Promise<Uint8Array> {
const { defaultTrustedDomains, trustedDomains } = readTrustedDomains(this.storageService, this.productService);
let trustedDomainsContent = this.storageService.get(
'http.linkProtectionTrustedDomainsContent',
StorageScope.GLOBAL
);
if (
!trustedDomainsContent ||
trustedDomainsContent.indexOf(CONFIG_HELP_TEXT_PRE) === -1 ||
trustedDomainsContent.indexOf(CONFIG_HELP_TEXT_AFTER) === -1
) {
const { defaultTrustedDomains, trustedDomains } = readTrustedDomains(this.storageService, this.productService);
trustedDomainsContent = computeTrustedDomainContent(defaultTrustedDomains, trustedDomains);
}
const trustedDomainsContent = computeTrustedDomainContent(defaultTrustedDomains, trustedDomains);
const buffer = VSBuffer.fromString(trustedDomainsContent).buffer;
return Promise.resolve(buffer);
}
writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): Promise<void> {
try {
const trustedDomains = parse(content.toString());
const trustedDomainsContent = content.toString();
const trustedDomains = parse(trustedDomainsContent);
this.storageService.store('http.linkProtectionTrustedDomainsContent', trustedDomainsContent, StorageScope.GLOBAL);
this.storageService.store(
'http.linkProtectionTrustedDomains',
JSON.stringify(trustedDomains),
StorageScope.GLOBAL
);
} catch (err) { }
return Promise.resolve();