Terminal sandboxing is broken when AllowTrustedDomains flag is set to true (#298388)

dileepyavan · web-flow · commit f5927e727c69 · 2026-02-28T01:01:30.000Z
* fixing when trusted domains are url's instead of just domains

* changes

* changes
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts
@@ -160,17 +160,10 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 				: {};
 			const configFileUri = URI.joinPath(this._tempDir, `vscode-sandbox-settings-${this._sandboxSettingsId}.json`);
 
-			const allowedDomainsSet = new Set(networkSetting.allowedDomains ?? []);
+			let allowedDomains = networkSetting.allowedDomains ?? [];
 			if (networkSetting.allowTrustedDomains) {
-				for (const domain of this._trustedDomainService.trustedDomains) {
-					// Filter out sole wildcard '*' as sandbox runtime doesn't allow it
-					// Wildcards like '*.github.com' are OK
-					if (domain !== '*') {
-						allowedDomainsSet.add(domain);
-					}
-				}
+				allowedDomains = this._addTrustedDomainsToAllowedDomains(allowedDomains);
 			}
-			const allowedDomains = Array.from(allowedDomainsSet);
 
 			const sandboxSettings = {
 				network: {
@@ -211,4 +204,19 @@ export class TerminalSandboxService extends Disposable implements ITerminalSandb
 			}
 		}
 	}
+
+	private _addTrustedDomainsToAllowedDomains(allowedDomains: string[]): string[] {
+		const allowedDomainsSet = new Set(allowedDomains);
+		for (const domain of this._trustedDomainService.trustedDomains) {
+			try {
+				const uri = new URL(domain);
+				allowedDomainsSet.add(uri.hostname);
+			} catch {
+				if (domain !== '*') {
+					allowedDomainsSet.add(domain);
+				}
+			}
+		}
+		return Array.from(allowedDomainsSet);
+	}
 }
