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

Do not leak rpc proxies (#139498)

Browse Source
This commit is contained in:
Ladislau Szomoru
2021-12-20 11:50:49 +01:00
committed by GitHub
parent 1110b3a45a
commit 85694fcf4d
3 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/api/common/extHostCommands.ts
View File

@@ -42,10 +42,11 @@ export class ExtHostCommands implements ExtHostCommandsShape {
readonly _serviceBrand: undefined;
#proxy: MainThreadCommandsShape;
private readonly _commands = new Map<string, CommandHandler>();
private readonly _apiCommands = new Map<string, ApiCommand>();
private readonly _proxy: MainThreadCommandsShape;
private readonly _logService: ILogService;
private readonly _argumentProcessors: ArgumentProcessor[];
@@ -55,7 +56,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
@IExtHostRpcService extHostRpc: IExtHostRpcService,
@ILogService logService: ILogService
) {
this._proxy = extHostRpc.getProxy(MainContext.MainThreadCommands);
this.#proxy = extHostRpc.getProxy(MainContext.MainThreadCommands);
this._logService = logService;
this.converter = new CommandsConverter(
this,
@@ -146,13 +147,13 @@ export class ExtHostCommands implements ExtHostCommandsShape {
this._commands.set(id, { callback, thisArg, description, extension });
if (global) {
this._proxy.$registerCommand(id);
this.#proxy.$registerCommand(id);
}
return new extHostTypes.Disposable(() => {
if (this._commands.delete(id)) {
if (global) {
this._proxy.$unregisterCommand(id);
this.#proxy.$unregisterCommand(id);
}
}
});
@@ -195,7 +196,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
});
try {
const result = await this._proxy.$executeCommand<T>(id, hasBuffers ? new SerializableObjectWithBuffers(toArgs) : toArgs, retry);
const result = await this.#proxy.$executeCommand<T>(id, hasBuffers ? new SerializableObjectWithBuffers(toArgs) : toArgs, retry);
return revive<any>(result);
} catch (e) {
// Rerun the command when it wasn't known, had arguments, and when retry
@@ -267,7 +268,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
getCommands(filterUnderscoreCommands: boolean = false): Promise<string[]> {
this._logService.trace('ExtHostCommands#getCommands', filterUnderscoreCommands);
return this._proxy.$getCommands().then(result => {
return this.#proxy.$getCommands().then(result => {
if (filterUnderscoreCommands) {
result = result.filter(command => command[0] !== '_');
}

49
src/vs/workbench/api/common/extHostSCM.ts
View File

@@ -199,6 +199,8 @@ export interface IValidateInput {
export class ExtHostSCMInputBox implements vscode.SourceControlInputBox {
#proxy: MainThreadSCMShape;
private _value: string = '';
get value(): string {
@@ -207,7 +209,7 @@ export class ExtHostSCMInputBox implements vscode.SourceControlInputBox {
set value(value: string) {
value = value ?? '';
this._proxy.$setInputBoxValue(this._sourceControlHandle, value);
this.#proxy.$setInputBoxValue(this._sourceControlHandle, value);
this.updateValue(value);
}
@@ -224,7 +226,7 @@ export class ExtHostSCMInputBox implements vscode.SourceControlInputBox {
}
set placeholder(placeholder: string) {
this._proxy.$setInputBoxPlaceholder(this._sourceControlHandle, placeholder);
this.#proxy.$setInputBoxPlaceholder(this._sourceControlHandle, placeholder);
this._placeholder = placeholder;
}
@@ -244,7 +246,7 @@ export class ExtHostSCMInputBox implements vscode.SourceControlInputBox {
}
this._validateInput = fn;
this._proxy.$setValidationProviderIsEnabled(this._sourceControlHandle, !!fn);
this.#proxy.$setValidationProviderIsEnabled(this._sourceControlHandle, !!fn);
}
private _visible: boolean = true;
@@ -261,17 +263,17 @@ export class ExtHostSCMInputBox implements vscode.SourceControlInputBox {
}
this._visible = visible;
this._proxy.$setInputBoxVisibility(this._sourceControlHandle, visible);
this.#proxy.$setInputBoxVisibility(this._sourceControlHandle, visible);
}
constructor(private _extension: IExtensionDescription, private _proxy: MainThreadSCMShape, private _sourceControlHandle: number) {
// noop
constructor(private _extension: IExtensionDescription, proxy: MainThreadSCMShape, private _sourceControlHandle: number) {
this.#proxy = proxy;
}
showValidationMessage(message: string | vscode.MarkdownString, type: vscode.SourceControlInputBoxValidationType) {
checkProposedApiEnabled(this._extension, 'scmValidation');
this._proxy.$showValidationMessage(this._sourceControlHandle, message, type as any);
this.#proxy.$showValidationMessage(this._sourceControlHandle, message, type as any);
}
$onInputBoxValueChange(value: string): void {
@@ -426,6 +428,9 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG
class ExtHostSourceControl implements vscode.SourceControl {
private static _handlePool: number = 0;
#proxy: MainThreadSCMShape;
private _groups: Map<GroupHandle, ExtHostSourceControlResourceGroup> = new Map<GroupHandle, ExtHostSourceControlResourceGroup>();
get id(): string {
@@ -455,7 +460,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
}
this._count = count;
this._proxy.$updateSourceControl(this.handle, { count });
this.#proxy.$updateSourceControl(this.handle, { count });
}
private _quickDiffProvider: vscode.QuickDiffProvider | undefined = undefined;
@@ -466,7 +471,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
set quickDiffProvider(quickDiffProvider: vscode.QuickDiffProvider | undefined) {
this._quickDiffProvider = quickDiffProvider;
this._proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider });
this.#proxy.$updateSourceControl(this.handle, { hasQuickDiffProvider: !!quickDiffProvider });
}
private _commitTemplate: string | undefined = undefined;
@@ -481,7 +486,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
}
this._commitTemplate = commitTemplate;
this._proxy.$updateSourceControl(this.handle, { commitTemplate });
this.#proxy.$updateSourceControl(this.handle, { commitTemplate });
}
private _acceptInputDisposables = new MutableDisposable<DisposableStore>();
@@ -497,7 +502,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
this._acceptInputCommand = acceptInputCommand;
const internal = this._commands.converter.toInternal(acceptInputCommand, this._acceptInputDisposables.value);
this._proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal });
this.#proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal });
}
private _actionButtonDisposables = new MutableDisposable<DisposableStore>();
@@ -513,7 +518,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
this._actionButton = actionButton;
const internal = actionButton !== undefined ? this._commands.converter.toInternal(this._actionButton, this._actionButtonDisposables.value) : undefined;
this._proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null });
this.#proxy.$updateSourceControl(this.handle, { actionButton: internal ?? null });
}
@@ -534,7 +539,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
this._statusBarCommands = statusBarCommands;
const internal = (statusBarCommands || []).map(c => this._commands.converter.toInternal(c, this._statusBarDisposables.value!)) as ICommandDto[];
this._proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
}
private _selected: boolean = false;
@@ -550,21 +555,23 @@ class ExtHostSourceControl implements vscode.SourceControl {
constructor(
private readonly _extension: IExtensionDescription,
private _proxy: MainThreadSCMShape,
proxy: MainThreadSCMShape,
private _commands: ExtHostCommands,
private _id: string,
private _label: string,
private _rootUri?: vscode.Uri
) {
this._inputBox = new ExtHostSCMInputBox(_extension, this._proxy, this.handle);
this._proxy.$registerSourceControl(this.handle, _id, _label, _rootUri);
this.#proxy = proxy;
this._inputBox = new ExtHostSCMInputBox(_extension, this.#proxy, this.handle);
this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri);
}
private createdResourceGroups = new Map<ExtHostSourceControlResourceGroup, IDisposable>();
private updatedResourceGroups = new Set<ExtHostSourceControlResourceGroup>();
createResourceGroup(id: string, label: string): ExtHostSourceControlResourceGroup {
const group = new ExtHostSourceControlResourceGroup(this._proxy, this._commands, this.handle, id, label);
const group = new ExtHostSourceControlResourceGroup(this.#proxy, this._commands, this.handle, id, label);
const disposable = Event.once(group.onDidDispose)(() => this.createdResourceGroups.delete(group));
this.createdResourceGroups.set(group, disposable);
this.eventuallyAddResourceGroups();
@@ -588,7 +595,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
this.updatedResourceGroups.delete(group);
updateListener.dispose();
this._groups.delete(group.handle);
this._proxy.$unregisterGroup(this.handle, group.handle);
this.#proxy.$unregisterGroup(this.handle, group.handle);
});
groups.push([group.handle, group.id, group.label, group.features]);
@@ -602,7 +609,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
this._groups.set(group.handle, group);
}
this._proxy.$registerGroups(this.handle, groups, splices);
this.#proxy.$registerGroups(this.handle, groups, splices);
this.createdResourceGroups.clear();
}
@@ -621,7 +628,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
});
if (splices.length > 0) {
this._proxy.$spliceResourceStates(this.handle, splices);
this.#proxy.$spliceResourceStates(this.handle, splices);
}
this.updatedResourceGroups.clear();
@@ -642,7 +649,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
this._statusBarDisposables.dispose();
this._groups.forEach(group => group.dispose());
this._proxy.$unregisterSourceControl(this.handle);
this.#proxy.$unregisterSourceControl(this.handle);
}
}