-
Notifications
You must be signed in to change notification settings - Fork 6k
feat: add option for disabling file downloads #5055
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
f7417d1
feat(cli): add disable-file-downloads to cli
jsjoeio dd9a2c3
feat(e2e): add download test
jsjoeio 05e789b
feat(e2e): add downloads disabled test
jsjoeio cd3f248
refactor(e2e): explain how to debug unexpected close
jsjoeio 8e61aff
feat(patches): add disable file downloads
jsjoeio 36e7191
wip: update diff
jsjoeio 4909569
Update src/node/cli.ts
jsjoeio 491d43a
fixup! add missing common/contextkeys file to patch
jsjoeio fd581d7
fixup!: update patch
jsjoeio df8fff6
fixup!: default disable-file-downloads undefined
jsjoeio 384c924
fixup!: combine e2e tests
jsjoeio b7c164c
fixup!: use different test names
jsjoeio 4ce0ad8
Merge branch 'main' into jsjoeio/issue-2426
jsjoeio fcc8086
feat: add CS_DISABLE_FILE_DOWNLOADS
jsjoeio d98a6dd
fixup!: make explicit and cleanup test
jsjoeio 7a3b266
fixup!: use beforeEach
jsjoeio f20ab8b
Merge branch 'main' into jsjoeio/issue-2426
jsjoeio 5ba6882
Merge branch 'main' into jsjoeio/issue-2426
jsjoeio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,183 @@ | ||
Add option to disable file downloads via CLI | ||
|
||
This patch adds support for a new CLI flag called `--disable-file-downloads` | ||
which allows a user to remove the "Download..." option that shows up when you | ||
right-click files in Code. The default value for this is `false`. | ||
|
||
To test this, start code-server with `--disable-file-downloads`, open editor, | ||
right-click on a file (not a folder) and you should **not** see the | ||
"Download..." option. | ||
|
||
Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts | ||
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts | ||
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts | ||
@@ -210,6 +210,11 @@ export interface IWorkbenchConstructionO | ||
*/ | ||
readonly userDataPath?: string | ||
|
||
+ /** | ||
+ * Whether the "Download..." option is enabled for files. | ||
+ */ | ||
+ readonly isEnabledFileDownloads?: boolean | ||
+ | ||
//#endregion | ||
|
||
|
||
Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts | ||
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts | ||
+++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts | ||
@@ -30,6 +30,11 @@ export interface IBrowserWorkbenchEnviro | ||
* Options used to configure the workbench. | ||
*/ | ||
readonly options?: IWorkbenchConstructionOptions; | ||
+ | ||
+ /** | ||
+ * Enable downloading files via menu actions. | ||
+ */ | ||
+ readonly isEnabledFileDownloads?: boolean; | ||
} | ||
|
||
export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvironmentService { | ||
@@ -61,6 +66,13 @@ export class BrowserWorkbenchEnvironment | ||
return this.options.userDataPath; | ||
} | ||
|
||
+ get isEnabledFileDownloads(): boolean { | ||
+ if (typeof this.options.isEnabledFileDownloads === "undefined") { | ||
+ throw new Error('isEnabledFileDownloads was not provided to the browser'); | ||
+ } | ||
+ return this.options.isEnabledFileDownloads; | ||
+ } | ||
+ | ||
@memoize | ||
get settingsResource(): URI { return joinPath(this.userRoamingDataHome, 'settings.json'); } | ||
|
||
Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts | ||
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts | ||
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts | ||
@@ -15,6 +15,7 @@ export const serverOptions: OptionDescri | ||
'disable-update-check': { type: 'boolean' }, | ||
'auth': { type: 'string' }, | ||
'locale': { type: 'string' }, | ||
+ 'disable-file-downloads': { type: 'boolean' }, | ||
|
||
/* ----- server setup ----- */ | ||
|
||
@@ -92,6 +93,7 @@ export interface ServerParsedArgs { | ||
'disable-update-check'?: boolean; | ||
'auth'?: string | ||
'locale'?: string | ||
+ 'disable-file-downloads'?: boolean; | ||
|
||
/* ----- server setup ----- */ | ||
|
||
Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts | ||
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts | ||
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts | ||
@@ -290,6 +290,7 @@ export class WebClientServer { | ||
logLevel: this._logService.getLevel(), | ||
}, | ||
userDataPath: this._environmentService.userDataPath, | ||
+ isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'], | ||
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined, | ||
productConfiguration: <Partial<IProductConfiguration>>{ | ||
rootEndpoint: base, | ||
Index: code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts | ||
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/workbench/browser/contextkeys.ts | ||
+++ code-server/lib/vscode/src/vs/workbench/browser/contextkeys.ts | ||
@@ -7,12 +7,11 @@ import { Event } from 'vs/base/common/ev | ||
import { Disposable } from 'vs/base/common/lifecycle'; | ||
import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; | ||
import { InputFocusedContext, IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsDevelopmentContext, IsIOSContext } from 'vs/platform/contextkey/common/contextkeys'; | ||
-import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, EditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext } from 'vs/workbench/common/contextkeys'; | ||
+import { SplitEditorsVertically, InEditorZenModeContext, ActiveEditorCanRevertContext, ActiveEditorGroupLockedContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, AuxiliaryBarVisibleContext, SideBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelVisibleContext, ActiveEditorContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, EditorTabsVisibleContext, IsCenteredLayoutContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorReadonlyContext, EditorAreaVisibleContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, IsFullscreenContext, OpenFolderWorkspaceSupportContext, RemoteNameContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, PanelPositionContext, IsEnabledFileDownloads } from 'vs/workbench/common/contextkeys'; | ||
import { TEXT_DIFF_EDITOR_ID, EditorInputCapabilities, SIDE_BY_SIDE_EDITOR_ID, DEFAULT_EDITOR_ASSOCIATION } from 'vs/workbench/common/editor'; | ||
import { trackFocus, addDisposableListener, EventType } from 'vs/base/browser/dom'; | ||
import { preferredSideBySideGroupDirection, GroupDirection, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; | ||
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; | ||
-import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; | ||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; | ||
import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; | ||
import { IWorkbenchLayoutService, Parts, positionToString } from 'vs/workbench/services/layout/browser/layoutService'; | ||
@@ -24,6 +23,7 @@ import { IEditorResolverService } from ' | ||
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite'; | ||
import { Schemas } from 'vs/base/common/network'; | ||
import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess'; | ||
+import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService'; | ||
|
||
export class WorkbenchContextKeysHandler extends Disposable { | ||
private inputFocusedContext: IContextKey<boolean>; | ||
@@ -75,7 +75,7 @@ export class WorkbenchContextKeysHandler | ||
@IContextKeyService private readonly contextKeyService: IContextKeyService, | ||
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService, | ||
@IConfigurationService private readonly configurationService: IConfigurationService, | ||
- @IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService, | ||
+ @IBrowserWorkbenchEnvironmentService private readonly environmentService: IBrowserWorkbenchEnvironmentService, | ||
@IEditorService private readonly editorService: IEditorService, | ||
@IEditorResolverService private readonly editorResolverService: IEditorResolverService, | ||
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService, | ||
@@ -194,6 +194,9 @@ export class WorkbenchContextKeysHandler | ||
this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService); | ||
this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART)); | ||
|
||
+ // code-server | ||
+ IsEnabledFileDownloads.bindTo(this.contextKeyService).set(this.environmentService.isEnabledFileDownloads ?? true) | ||
jsjoeio marked this conversation as resolved.
Show resolved
Hide resolved
|
||
+ | ||
this.registerListeners(); | ||
} | ||
|
||
Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts | ||
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts | ||
+++ code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts | ||
@@ -21,7 +21,7 @@ import { CLOSE_SAVED_EDITORS_COMMAND_ID, | ||
import { AutoSaveAfterShortDelayContext } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService'; | ||
import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService'; | ||
import { Schemas } from 'vs/base/common/network'; | ||
-import { DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey } from 'vs/workbench/common/contextkeys'; | ||
+import { DirtyWorkingCopiesContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, IsEnabledFileDownloads } from 'vs/workbench/common/contextkeys'; | ||
import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys'; | ||
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; | ||
import { ThemeIcon } from 'vs/platform/theme/common/themeService'; | ||
@@ -475,13 +475,16 @@ MenuRegistry.appendMenuItem(MenuId.Explo | ||
id: DOWNLOAD_COMMAND_ID, | ||
title: DOWNLOAD_LABEL | ||
}, | ||
- when: ContextKeyExpr.or( | ||
- // native: for any remote resource | ||
- ContextKeyExpr.and(IsWebContext.toNegated(), ResourceContextKey.Scheme.notEqualsTo(Schemas.file)), | ||
- // web: for any files | ||
- ContextKeyExpr.and(IsWebContext, ExplorerFolderContext.toNegated(), ExplorerRootContext.toNegated()), | ||
- // web: for any folders if file system API support is provided | ||
- ContextKeyExpr.and(IsWebContext, HasWebFileSystemAccess) | ||
+ when: ContextKeyExpr.and( | ||
+ IsEnabledFileDownloads, | ||
+ ContextKeyExpr.or( | ||
+ // native: for any remote resource | ||
+ ContextKeyExpr.and(IsWebContext.toNegated(), ResourceContextKey.Scheme.notEqualsTo(Schemas.file)), | ||
+ // web: for any files | ||
+ ContextKeyExpr.and(IsWebContext, ExplorerFolderContext.toNegated(), ExplorerRootContext.toNegated()), | ||
+ // web: for any folders if file system API support is provided | ||
+ ContextKeyExpr.and(IsWebContext, HasWebFileSystemAccess) | ||
+ ) | ||
) | ||
})); | ||
|
||
Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts | ||
=================================================================== | ||
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts | ||
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts | ||
@@ -30,6 +30,8 @@ export const IsFullscreenContext = new R | ||
|
||
export const HasWebFileSystemAccess = new RawContextKey<boolean>('hasWebFileSystemAccess', false, true); // Support for FileSystemAccess web APIs (https://wicg.github.io/file-system-access) | ||
|
||
+export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true); | ||
+ | ||
//#endregion | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,3 +18,4 @@ local-storage.diff | |
service-worker.diff | ||
connection-type.diff | ||
sourcemaps.diff | ||
disable-downloads.diff |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
import * as path from "path" | ||
import { promises as fs } from "fs" | ||
import { clean } from "../utils/helpers" | ||
import { describe, test, expect } from "./baseFixture" | ||
|
||
describe("Downloads (enabled)", true, [], {}, async () => { | ||
const testName = "downloads-enabled" | ||
test.beforeAll(async () => { | ||
await clean(testName) | ||
}) | ||
|
||
test("should see the 'Download...' option", async ({ codeServerPage }) => { | ||
// Setup | ||
const workspaceDir = await codeServerPage.workspaceDir | ||
const tmpFilePath = path.join(workspaceDir, "unique-file.txt") | ||
await fs.writeFile(tmpFilePath, "hello world") | ||
|
||
// Action | ||
const fileInExplorer = await codeServerPage.page.waitForSelector("text=unique-file.txt") | ||
await fileInExplorer.click({ | ||
button: "right", | ||
}) | ||
|
||
expect(await codeServerPage.page.isVisible("text=Download...")).toBe(true) | ||
}) | ||
}) | ||
|
||
describe("Downloads (disabled)", true, ["--disable-file-downloads"], {}, async () => { | ||
const testName = "downloads-disabled" | ||
test.beforeAll(async () => { | ||
await clean(testName) | ||
}) | ||
|
||
test("should not see the 'Download...' option", async ({ codeServerPage }) => { | ||
// Setup | ||
const workspaceDir = await codeServerPage.workspaceDir | ||
const tmpFilePath = path.join(workspaceDir, "unique-file.txt") | ||
await fs.writeFile(tmpFilePath, "hello world") | ||
|
||
// Action | ||
const fileInExplorer = await codeServerPage.page.waitForSelector("text=unique-file.txt") | ||
await fileInExplorer.click({ | ||
button: "right", | ||
}) | ||
|
||
expect(await codeServerPage.page.isVisible("text=Download...")).toBe(false) | ||
}) | ||
}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.