sandbox - remove native-is-elevated from renderer

Benjamin Pasero · Benjamin Pasero · commit aecd9ca10c66 · 2020-07-07T10:16:42.000+02:00
diff --git a/src/vs/platform/electron/common/electron.ts b/src/vs/platform/electron/common/electron.ts
@@ -63,6 +63,7 @@ export interface ICommonElectronService {
 	openExternal(url: string): Promise<boolean>;
 	updateTouchBar(items: ISerializableCommandAction[][]): Promise<void>;
 	moveItemToTrash(fullPath: string, deleteOnFail?: boolean): Promise<boolean>;
+	isAdmin(): Promise<boolean>;
 
 	// clipboard
 	readClipboardText(type?: 'selection' | 'clipboard'): Promise<string>;
diff --git a/src/vs/platform/electron/electron-main/electronMainService.ts b/src/vs/platform/electron/electron-main/electronMainService.ts
@@ -10,7 +10,7 @@ import { OpenContext } from 'vs/platform/windows/node/window';
 import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
 import { IOpenedWindow, IOpenWindowOptions, IWindowOpenable, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
 import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { isMacintosh } from 'vs/base/common/platform';
+import { isMacintosh, isWindows, isRootUser } from 'vs/base/common/platform';
 import { ICommonElectronService } from 'vs/platform/electron/common/electron';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -302,6 +302,17 @@ export class ElectronMainService implements IElectronMainService {
 		return shell.moveItemToTrash(fullPath);
 	}
 
+	async isAdmin(): Promise<boolean> {
+		let isAdmin: boolean;
+		if (isWindows) {
+			isAdmin = (await import('native-is-elevated'))();
+		} else {
+			isAdmin = isRootUser();
+		}
+
+		return isAdmin;
+	}
+
 	//#endregion
 
 
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
@@ -34,7 +34,7 @@ import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { LifecyclePhase, ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkspaceFolderCreationData, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity';
-import { isRootUser, isWindows, isMacintosh, isLinux } from 'vs/base/common/platform';
+import { isWindows, isMacintosh, isLinux } from 'vs/base/common/platform';
 import { IProductService, IAppCenterConfiguration } from 'vs/platform/product/common/productService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -404,12 +404,7 @@ export class NativeWindow extends Disposable {
 
 		// Root warning
 		this.lifecycleService.when(LifecyclePhase.Restored).then(async () => {
-			let isAdmin: boolean;
-			if (isWindows) {
-				isAdmin = (await import('native-is-elevated'))();
-			} else {
-				isAdmin = isRootUser();
-			}
+			const isAdmin = await this.electronService.isAdmin();
 
 			// Update title
 			this.titleService.updateProperties({ isAdmin });
diff --git a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
@@ -205,6 +205,7 @@ export class TestElectronService implements IElectronService {
 	async pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Promise<void> { }
 	async showItemInFolder(path: string): Promise<void> { }
 	async setRepresentedFilename(path: string): Promise<void> { }
+	async isAdmin(): Promise<boolean> { return false; }
 	async setDocumentEdited(edited: boolean): Promise<void> { }
 	async openExternal(url: string): Promise<boolean> { return false; }
 	async updateTouchBar(): Promise<void> { }
