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

Fixing rgpath for terminal sandboxing (#301948)

Browse Source 
* Add experiment mode to terminal sandbox

* Updating regex to extract file name

* migrating to sandbox manager from srt

* updating the regex for picking folder paths

* updating the regex for picking folder paths

* correcting the code layers

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* refactor

* refactor

* changes

* changes

* refactor

* refactor

* fixing tests

* fixing tests

* fixing tests

* test cases fix

* default settings

* updating rgPath

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
dileepyavan
2026-03-15 22:38:58 -07:00
committed by GitHub
parent 6da8508c16
commit 00d6a0897d
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vs/platform/sandbox/node/sandboxHelperService.ts
View File

@@ -6,9 +6,10 @@
import { SandboxManager, type NetworkHostPattern } from '@anthropic-ai/sandbox-runtime';
import { Emitter } from '../../../base/common/event.js';
import { Disposable } from '../../../base/common/lifecycle.js';
import { posix, win32 } from '../../../base/common/path.js';
import { dirname, posix, win32 } from '../../../base/common/path.js';
import { generateUuid } from '../../../base/common/uuid.js';
import { IEnvironmentService, INativeEnvironmentService } from '../../environment/common/environment.js';
import { ILogService } from '../../log/common/log.js';
import { type ISandboxPermissionRequest, type ISandboxRuntimeConfig } from '../common/sandboxHelperIpc.js';
import { ISandboxHelperService } from '../common/sandboxHelperService.js';
@@ -22,6 +23,7 @@ export class SandboxHelperService extends Disposable implements ISandboxHelperSe
constructor(
@IEnvironmentService environmentService: IEnvironmentService,
@ILogService logService: ILogService,
) {
super();
const nativeEnvironmentService = environmentService as IEnvironmentService & Partial<INativeEnvironmentService>;
@@ -29,6 +31,7 @@ export class SandboxHelperService extends Disposable implements ISandboxHelperSe
? this._pathJoin(nativeEnvironmentService.appRoot, 'node_modules', '@vscode', 'ripgrep', 'bin', 'rg')
: undefined;
this._tempDir = nativeEnvironmentService.tmpDir?.path;
logService.debug('SandboxHelperService#constructor ripgrep path configured', !!this._rgPath);
}
async resolveSandboxPermissionRequest(requestId: string, allowed: boolean): Promise<void> {
@@ -67,8 +70,8 @@ export class SandboxHelperService extends Disposable implements ISandboxHelperSe
},
ignoreViolations: runtimeConfig.ignoreViolations,
enableWeakerNestedSandbox: runtimeConfig.enableWeakerNestedSandbox,
ripgrep: (this._rgPath || runtimeConfig.ripgrep) ? {
command: this._rgPath ?? runtimeConfig.ripgrep?.command ?? 'rg',
ripgrep: runtimeConfig.ripgrep ? {
command: runtimeConfig.ripgrep.command,
args: runtimeConfig.ripgrep?.args ? [...runtimeConfig.ripgrep.args] : undefined,
} : undefined,
mandatoryDenySearchDepth: runtimeConfig.mandatoryDenySearchDepth,
@@ -85,9 +88,25 @@ export class SandboxHelperService extends Disposable implements ISandboxHelperSe
env.push(this._toEnvironmentAssignment('TMPDIR', this._tempDir));
}
const pathWithRipgrep = this._getPathWithRipgrepDir();
if (pathWithRipgrep) {
env.push(this._toEnvironmentAssignment('PATH', pathWithRipgrep));
}
return env.join(' ');
}
private _getPathWithRipgrepDir(): string | undefined {
if (!this._rgPath) {
return undefined;
}
const rgDir = dirname(this._rgPath);
const currentPath = process.env['PATH'];
const path = process.platform === 'win32' ? win32 : posix;
return currentPath ? `${currentPath}${path.delimiter}${rgDir}` : rgDir;
}
private _toEnvironmentAssignment(name: string, value: string): string {
return `${name}="${value}"`;
}