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

Simplify service

Browse Source
This commit is contained in:
Rob Lourens
2024-05-03 13:33:42 -07:00
parent d4c6653763
commit 41dc697ef1
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+1 -1
View File
@@ -1043,7 +1043,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
const codeblocks: IChatCodeBlockInfo[] = [];
let codeBlockIndex = 0;
const result = this.renderer.render(markdown, {
remoteImageIsAllowed: (uri) => this.trustedDomainService.isValidSync(uri),
remoteImageIsAllowed: (uri) => this.trustedDomainService.isValid(uri),
fillInIncompleteTokens,
codeBlockRendererSync: (languageId, text) => {
const index = codeBlockIndex++;
src/vs/workbench/contrib/url/browser/trustedDomainService.ts
+3 -16
View File
@@ -17,12 +17,7 @@ export const ITrustedDomainService = createDecorator<ITrustedDomainService>('ITr
export interface ITrustedDomainService {
_serviceBrand: undefined;
isValid(resource: URI): Promise<boolean>;
/**
* This method does the validity check using the latest cached values of trusted domains, which may be slightly out of date.
*/
isValidSync(resource: URI): boolean;
isValid(resource: URI): boolean;
}
export class TrustedDomainService extends Disposable implements ITrustedDomainService {
@@ -52,20 +47,12 @@ export class TrustedDomainService extends Disposable implements ITrustedDomainSe
}));
}
async isValid(resource: URI): Promise<boolean> {
isValid(resource: URI): boolean {
const { defaultTrustedDomains, trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
const allTrustedDomains = [...defaultTrustedDomains, ...trustedDomains];
return isURLDomainTrusted(resource, allTrustedDomains);
}
isValidSync(resource: URI): boolean {
const allTrustedDomains = [
...this._staticTrustedDomainsResult.value,
];
return isURLDomainTrusted(resource, allTrustedDomains);
}
}
const rLocalhost = /^localhost(:\d+)?$/i;
@@ -98,7 +85,7 @@ function normalizeURL(url: string | URI): string {
* - There's no subdomain 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[]) {
export function isURLDomainTrusted(url: URI, trustedDomains: string[]): boolean {
url = URI.parse(normalizeURL(url));
trustedDomains = trustedDomains.map(normalizeURL);