fix: allow the extensions to authenticate

.rebase/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
 
+#### @vitaliy-guliy
+https://github.com/che-incubator/che-code/pull/339
+
+- code/src/vs/platform/product/common/product.ts
+---
+
 #### @vitaliy-guliy
 https://github.com/che-incubator/che-code/pull/331
 
@@ -27,7 +33,6 @@ https://github.com/che-incubator/che-code/pull/337/commits/875893566c2acd0bb7031
 - code/src/vs/base/common/network.ts
 ---
 
-
 #### @benoitf 
 https://github.com/che-incubator/che-code/commit/eed0a5213ba1b29b810d53f6365aaa2294165845#diff-2735bf66f14ee64b9ce6fdc30355a5e3085ae96a791cd01d65843a8dcef7c166
 

.rebase/replace/code/src/vs/platform/product/common/product.ts.json

@@ -0,0 +1,10 @@
+[
+    {
+        "from": "import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';",
+        "by": "import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';\\\nimport { loadFromFileSystem } from 'vs/platform/product/common/che/product';"
+    },
+    {
+        "from": "product = { /\\*BUILD->INSERT_PRODUCT_CONFIGURATION\\*/ } as IProductConfiguration;",
+        "by": "product = { /\\*BUILD->INSERT_PRODUCT_CONFIGURATION\\*/ } as IProductConfiguration;\\\n\\\tproduct = loadFromFileSystem();"
+    }
+]

code/extensions/che-api/src/impl/github-service-impl.ts

@@ -42,7 +42,7 @@ export class GithubServiceImpl implements GithubService {
     @inject(K8SServiceImpl) private readonly k8sService: K8SServiceImpl,
     @inject(Symbol.for('AxiosInstance')) private readonly axiosInstance: AxiosInstance
   ) {
-    this.iniitializeToken();
+    this.initializeToken();
   }
 
   private checkToken(): void {
@@ -117,10 +117,10 @@ export class GithubServiceImpl implements GithubService {
     }
 
     // another token should be used by the Github Service after removing the Device Authentication token
-    this.iniitializeToken();
+    this.initializeToken();
   }
 
-  private async iniitializeToken(): Promise<void> {
+  private async initializeToken(): Promise<void> {
     this.logger.info('Github Service: extracting token...');
 
     const deviceAuthToken = await this.getDeviceAuthToken();

code/src/vs/platform/product/common/che/product.ts

@@ -0,0 +1,32 @@
+/**********************************************************************
+ * Copyright (c) 2024 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+/* eslint-disable header/header */
+
+import { IProductConfiguration } from 'vs/base/common/product';
+
+export function loadFromFileSystem(): IProductConfiguration {
+	const href = `./oss-dev/static/product.json`;
+
+	try {
+		var xmlhttp = new XMLHttpRequest();
+		xmlhttp.open("GET", href, false);
+		xmlhttp.send();
+
+		if (xmlhttp.status == 200 && xmlhttp.readyState == 4) {
+			return JSON.parse(xmlhttp.responseText);
+		}
+
+		console.log(`Request failed with status: ${xmlhttp.status}, readyState: ${xmlhttp.readyState}`);
+	} catch (err) {
+		console.error(err);
+	}
+
+	throw new Error(`Unable to load product.json from ${href}.`);
+}

code/src/vs/platform/product/common/product.ts

@@ -6,6 +6,7 @@
 import { env } from 'vs/base/common/process';
 import { IProductConfiguration } from 'vs/base/common/product';
 import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
+import { loadFromFileSystem } from 'vs/platform/product/common/che/product';
 
 /**
  * @deprecated You MUST use `IProductService` if possible.
@@ -54,6 +55,7 @@ else {
 
 	// Built time configuration (do NOT modify)
 	product = { /*BUILD->INSERT_PRODUCT_CONFIGURATION*/ } as IProductConfiguration;
+	product = loadFromFileSystem();
 
 	// Running out of sources
 	if (Object.keys(product).length === 0) {

launcher/src/main.ts

@@ -12,6 +12,7 @@ import { CodeWorkspace } from './code-workspace';
 import { DevWorkspaceId } from './devworkspace-id';
 import { NodeExtraCertificate } from './node-extra-certificate';
 import { OpenVSIXRegistry } from './openvsix-registry';
+import { TrustedExtensions } from './trusted-extensions';
 import { VSCodeLauncher } from './vscode-launcher';
 import { WebviewResources } from './webview-resources';
 
@@ -27,6 +28,7 @@ export class Main {
     await new OpenVSIXRegistry().configure();
     await new WebviewResources().configure();
     await new NodeExtraCertificate().configure();
+    await new TrustedExtensions().configure();
 
     const workspaceFile = await new CodeWorkspace().generate();
 

launcher/src/product-json.ts

@@ -12,6 +12,10 @@ import * as fs from './fs-extra';
 
 const PRODUCT_JSON = 'product.json';
 
+export interface Record {
+  [key: string]: string[];
+}
+
 export class ProductJSON {
   private json: any;
 
@@ -89,4 +93,12 @@ export class ProductJSON {
 
     gallery.itemUrl = url;
   }
+
+  getTrustedExtensionAuthAccess(): string[] | Record | undefined {
+    return this.json.trustedExtensionAuthAccess;
+  }
+
+  setTrustedExtensionAuthAccess(trustedExtensionAuthAccess: string[] | Record | undefined) {
+    this.json.trustedExtensionAuthAccess = trustedExtensionAuthAccess;
+  }
 }

launcher/src/trusted-extensions.ts

@@ -0,0 +1,64 @@
+/**********************************************************************
+ * Copyright (c) 2024 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+import { env } from 'process';
+import { ProductJSON } from './product-json';
+
+export class TrustedExtensions {
+  async configure(): Promise<void> {
+    console.log('# Configuring Trusted Extensions...');
+
+    if (!env.VSCODE_TRUSTED_EXTENSIONS) {
+      console.log('  > env.VSCODE_TRUSTED_EXTENSIONS is not defined, skip this step');
+      return;
+    }
+
+    try {
+      const extensions: string[] = [];
+
+      for (const extension of env.VSCODE_TRUSTED_EXTENSIONS.split(',')) {
+        if (extension) {
+          extensions.push(extension);
+          console.log(`  > add ${extension}`);
+        }
+      }
+
+      if (!extensions.length) {
+        console.log('  > env.VSCODE_TRUSTED_EXTENSIONS does not specify any extension');
+        return;
+      }
+
+      const productJSON = await new ProductJSON().load();
+      let productJSONChanged = false;
+
+      let access = productJSON.getTrustedExtensionAuthAccess();
+      if (access === undefined) {
+        productJSON.setTrustedExtensionAuthAccess([...extensions]);
+        productJSONChanged = true;
+      } else if (Array.isArray(access)) {
+        for (const extension of extensions) {
+          if (!access.includes(extension)) {
+            access.push(extension);
+            productJSONChanged = true;
+          }
+        }
+      } else {
+        console.log('  > Unexpected type of trustedExtensionAuthAccess in product.json. Skip this step');
+        return;
+      }
+
+      if (productJSONChanged) {
+        await productJSON.save();
+      }
+    } catch (err) {
+      console.error(`${err.message} Failure to configure trusted extensions in product.json.`);
+    }
+  }
+}

launcher/tests/main.spec.ts

@@ -38,6 +38,13 @@ jest.mock('../src/node-extra-certificate', () => ({
   },
 }));
 
+const configureTustedExtensions = jest.fn();
+jest.mock('../src/trusted-extensions', () => ({
+  TrustedExtensions: function () {
+    return { configure: configureTustedExtensions };
+  },
+}));
+
 const generateCodeWorkspace = jest.fn();
 jest.mock('../src/code-workspace', () => ({
   CodeWorkspace: function () {
@@ -60,6 +67,7 @@ describe('Test main flow:', () => {
     expect(configureOpenVSIXRegistryMock).toBeCalled();
     expect(configureWebviewResourcesMock).toBeCalled();
     expect(configureNodeExtraCertificate).toBeCalled();
+    expect(configureTustedExtensions).toBeCalled();
 
     expect(generateCodeWorkspace).toBeCalled();