mirror of
https://github.com/danog/code-server.git
synced 2024-12-02 09:38:32 +01:00
7027ec7d60
* chore: upgrade Code to 1.66
* docs: update docs for Code upgrades
* fixup!: docs
* chore: update vscode submodule
* chore: update integration patch
* chore: update node-version patch
* chore: update github-auth patch
They completely changed how auth is handled for GitHub in
https://github.com/microsoft/vscode/pull/145424 so our patch may not
work. Will need to test and revisit.
* refactor: remove postinstall patch
It appears they renamed postinstall.js to postinstall.mjs and removed
the use of `rimraf` which means our patch is no longer needed! 🎉
b0e8554cce
* chore: refresh local-storage patch
* chore: refresh service-worker patch
* chore: bulk refresh patches
* fixup!: docs formatting
* refactor: remove unused last-opened patch
* fixup!: formatting docs
* fixup!: formatting docs
* refactor: remove rsync postinstall
* Revert "refactor: remove rsync postinstall"
This reverts commit 8d6b613e9d779ba18d0297710614516cde108bcf.
* refactor: update postinstall.js to .mjs
* feat(patches): add parent-origin bypass
* docs(patches): add notes for testing store-socket
* docs(patches): update testing info for node-version
* refactor(patches): delete github-auth.diff patch
* docs(patches): add notes for testing connection-type
* fixup!: delete github-auth patch
* fixup!: update connection type testing
* docs(patches): add notes to insecure-notification.diff
* docs(patches): add nots for update-check.diff
* fixup!: remove comma in integration patch
* fix(e2e): disable workspace trust
* refactor: add --no-default-rc for yarn install
* feat(patches): remove yarnrc in presinstall
* fixup!: silly mistake
* docs: add note about KEEP_MODULES=1
* docs(patches): add testing notes for node-version
* refactor(patches): remove node-version
It appears this is no longer needed due to the `remote/package.json` now which
targets node rather than electron.
* fixup!: add cd ../.. to code upgrade instructions
* fixup!: add note to yarn --production flag
* fixup!: make parent-origin easier to upstream
* Revert "refactor(patches): delete github-auth.diff patch"
This reverts commit 31a354a34345309fadc475491b392d7601e51a32.
* Revert "fixup!: delete github-auth patch"
This reverts commit bdeb5212e8c7be6cadd109941b486a4bcdae69fa.
* Merge webview origin patch into webview patch
* Remove unused post-install patch
* Prevent builtin extensions from updating
* Refresh sourcemaps patch
* Update Node to v16
This matches the version in ./lib/vscode/remote/.yarnrc.
I changed the engine to exactly 16 since if you use any different
version it will just not work since the modules will have been built for
16 (due to the .yarnrc).
* Replace fs.rmdir with fs.rm
Node is showing a deprecation warning about it.
* Update github-auth patch
The local credentials provider is no longer used when there is a remote
so this code moved into the backend web credential provider.
* Prevent fs.rm from erroring about non-existent files
We were using fs.rmdir which presumably did not have the same behavior
in v14 (in v16 fs.rmdir also errors).
* Install Python 3 in CentOS CI container
Co-authored-by: Asher <ash@coder.com>
105 lines
3.9 KiB
Diff
105 lines
3.9 KiB
Diff
Add the ability to provide a GitHub token
|
|
|
|
To test install the GitHub PR extension and start code-server with GITHUB_TOKEN
|
|
or set github-auth in the config file. The extension should be authenticated.
|
|
|
|
Index: code-server/lib/vscode/src/vs/platform/credentials/node/credentialsMainService.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/platform/credentials/node/credentialsMainService.ts
|
|
+++ code-server/lib/vscode/src/vs/platform/credentials/node/credentialsMainService.ts
|
|
@@ -5,18 +5,32 @@
|
|
|
|
import { InMemoryCredentialsProvider } from 'vs/platform/credentials/common/credentials';
|
|
import { ILogService } from 'vs/platform/log/common/log';
|
|
-import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
|
|
+import { IServerEnvironmentService } from 'vs/server/node/serverEnvironmentService';
|
|
import { IProductService } from 'vs/platform/product/common/productService';
|
|
import { BaseCredentialsMainService, KeytarModule } from 'vs/platform/credentials/common/credentialsMainService';
|
|
+import { generateUuid } from 'vs/base/common/uuid';
|
|
+import { equals as arrayEquals } from 'vs/base/common/arrays';
|
|
+
|
|
+interface IToken {
|
|
+ accessToken: string
|
|
+ account?: { label: string }
|
|
+ id: string
|
|
+ scopes: string[]
|
|
+}
|
|
|
|
export class CredentialsWebMainService extends BaseCredentialsMainService {
|
|
|
|
constructor(
|
|
@ILogService logService: ILogService,
|
|
- @INativeEnvironmentService private readonly environmentMainService: INativeEnvironmentService,
|
|
+ @IServerEnvironmentService private readonly environmentMainService: IServerEnvironmentService,
|
|
@IProductService private readonly productService: IProductService,
|
|
) {
|
|
super(logService);
|
|
+ if (this.environmentMainService.args["github-auth"]) {
|
|
+ this.storeGitHubToken(this.environmentMainService.args["github-auth"]).catch((error) => {
|
|
+ this.logService.error('Failed to store provided GitHub token', error)
|
|
+ })
|
|
+ }
|
|
}
|
|
|
|
// If the credentials service is running on the server, we add a suffix -server to differentiate from the location that the
|
|
@@ -45,4 +59,59 @@ export class CredentialsWebMainService e
|
|
}
|
|
return this._keytarCache;
|
|
}
|
|
+
|
|
+ private async storeGitHubToken(githubToken: string): Promise<void> {
|
|
+ const extensionId = 'vscode.github-authentication';
|
|
+ const service = `${await this.getSecretStoragePrefix()}${extensionId}`;
|
|
+ const account = 'github.auth';
|
|
+ const scopes = [['read:user', 'user:email', 'repo']]
|
|
+
|
|
+ // Oddly the scopes need to match exactly so we cannot just have one token
|
|
+ // with all the scopes, instead we have to duplicate the token for each
|
|
+ // expected set of scopes.
|
|
+ const tokens: IToken[] = scopes.map((scopes) => ({
|
|
+ id: generateUuid(),
|
|
+ scopes: scopes.sort(), // Sort for comparing later.
|
|
+ accessToken: githubToken,
|
|
+ }));
|
|
+
|
|
+ const raw = await this.getPassword(service, account)
|
|
+
|
|
+ let existing: {
|
|
+ content: IToken[]
|
|
+ } | undefined;
|
|
+
|
|
+ if (raw) {
|
|
+ try {
|
|
+ const json = JSON.parse(raw);
|
|
+ json.content = JSON.parse(json.content);
|
|
+ existing = json;
|
|
+ } catch (error) {
|
|
+ this.logService.error('Failed to parse existing GitHub credentials', error)
|
|
+ }
|
|
+ }
|
|
+
|
|
+ // Keep tokens for account and scope combinations we do not have in case
|
|
+ // there is an extension that uses scopes we have not accounted for (in
|
|
+ // these cases the user will need to manually authenticate the extension
|
|
+ // through the UI) or the user has tokens for other accounts.
|
|
+ if (existing?.content) {
|
|
+ existing.content = existing.content.filter((existingToken) => {
|
|
+ const scopes = existingToken.scopes.sort();
|
|
+ return !(tokens.find((token) => {
|
|
+ return arrayEquals(scopes, token.scopes)
|
|
+ && token.account?.label === existingToken.account?.label;
|
|
+ }))
|
|
+ })
|
|
+ }
|
|
+
|
|
+ return this.setPassword(service, account, JSON.stringify({
|
|
+ extensionId,
|
|
+ ...(existing || {}),
|
|
+ content: JSON.stringify([
|
|
+ ...tokens,
|
|
+ ...(existing?.content || []),
|
|
+ ])
|
|
+ }));
|
|
+ }
|
|
}
|