getlocalci · kienstra · May 15, 2022 · May 15, 2022 · May 15, 2022 · May 15, 2022
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,7 +4,6 @@
     {
       "name": "Run Extension",
       "type": "extensionHost",
-      "problemMatcher": "$tsc",
       "request": "launch",
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}"

diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ But the jobs still only run locally.
 
 Local CI has no server that runs jobs, so the site has no knowledge of the jobs or any data from them.
 
-If you have entered a license key, it only sends to the [Local CI site](https://getlocalci.com) a `GET` request with the license key and an `md5` hash of your VS Code [machineId](https://code.visualstudio.com/api/references/vscode-api#env).
+If you have entered a license key, it only sends to the [Local CI site](https://getlocalci.com) a `GET` request with the license key and a `SHA-256` hash of your VS Code [machineId](https://code.visualstudio.com/api/references/vscode-api#env).
 
 This is to verify that the license key is only used on 1 machine.
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -278,7 +278,6 @@
     "@cloudflare/binary-install": "^0.2.0",
     "@fluffy-spoon/substitute": "^1.208.0",
     "@types/glob": "^7.1.3",
-    "@types/js-md5": "0.4.3",
     "@types/js-yaml": "^4.0.1",
     "@types/mocha": "^9.1.0",
     "@types/node": "^17.0.23",
@@ -306,8 +305,8 @@
     "webpack-cli": "^4.9.2"
   },
   "dependencies": {
+    "@vscode/extension-telemetry": "^0.5.1",
     "axios": "^0.26.1",
-    "js-md5": "0.7.3",
-    "@vscode/extension-telemetry": "^0.5.1"
+    "cross-sha256": "^1.2.0"
   }
 }
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -6,11 +6,9 @@ interface SaveCache {
 // See https://circleci.com/docs/2.0/configuration-reference/
 interface FullStep {
   checkout?: Record<string, unknown> | string;
-  // eslint-disable-next-line @typescript-eslint/naming-convention
   attach_workspace?: {
     at: string;
   };
-  // eslint-disable-next-line @typescript-eslint/naming-convention
   persist_to_workspace?: {
     root: string;
     paths: Array<string>;
@@ -39,7 +37,6 @@ type Step = FullStep | string | 'checkout';
 interface Job {
   docker?: Array<Record<string, string>>;
   steps?: Step[];
-  // eslint-disable-next-line @typescript-eslint/naming-convention
   working_directory?: string;
   machine?: { image?: string };
 }

diff --git a/src/test/suite/utils/getAttachWorkspaceCommand.test.ts b/src/test/suite/utils/getAttachWorkspaceCommand.test.ts
@@ -10,7 +10,6 @@ suite('getAttachWorkspaceCommand', () => {
   test('With attach_workspace', () => {
     assert.strictEqual(
       normalize(
-        // eslint-disable-next-line @typescript-eslint/naming-convention
         getAttachWorkspaceCommand({ attach_workspace: { at: '/foo/baz' } })
       ),
       normalize(

diff --git a/src/test/suite/utils/getHash.test.ts b/src/test/suite/utils/getHash.test.ts
@@ -0,0 +1,29 @@
+import * as assert from 'assert';
+import getHash from '../../../utils/getHash';
+
+suite('getHash', () => {
+  test('empty string', () => {
+    assert.strictEqual(
+      getHash(''),
+      'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+    );
+  });
+
+  test('possible machineId 1', () => {
+    assert.strictEqual(
+      getHash(
+        'a923bcf3da6acff9c9bf4f129135ffd56adbfa294aeb8117c7264164c1a9382ca'
+      ),
+      'ea5320a945bfe117f3d9ee12268734180b697913fb7ff498549a5bb201255b09'
+    );
+  });
+
+  test('possible machineId 2', () => {
+    assert.strictEqual(
+      getHash(
+        '52ab60b09f4e8fae2bcb8ac38871cfa8613ee4a1d566dcec5659e320148dc366e'
+      ),
+      'f600f144c3c96701f3c34ddd9fb65089af27fb8264fcba12f40af8d6cbbddeeb'
+    );
+  });
+});
diff --git a/src/test/suite/utils/getImageFromJob.test.ts b/src/test/suite/utils/getImageFromJob.test.ts
@@ -4,21 +4,18 @@ import getImageFromJob from '../../../utils/getImageFromJob';
 suite('getImageFromJob', () => {
   test('No docker value', () => {
     assert.deepStrictEqual(
-      getImageFromJob({ working_directory: 'foo/baz' }), // eslint-disable-line @typescript-eslint/naming-convention
+      getImageFromJob({ working_directory: 'foo/baz' }),
       ''
     );
   });
 
   test('Empty docker array', () => {
-    assert.deepStrictEqual(
-      getImageFromJob({ docker: [] }), // eslint-disable-line @typescript-eslint/naming-convention
-      ''
-    );
+    assert.deepStrictEqual(getImageFromJob({ docker: [] }), '');
   });
 
   test('With docker image', () => {
     assert.deepStrictEqual(
-      getImageFromJob({ docker: [{ image: 'foo-image' }] }), // eslint-disable-line @typescript-eslint/naming-convention
+      getImageFromJob({ docker: [{ image: 'foo-image' }] }),
       'foo-image'
     );
   });

diff --git a/src/test/suite/utils/getPath.test.ts b/src/test/suite/utils/getPath.test.ts
@@ -11,19 +11,19 @@ mocha.afterEach(() => {
 suite('getPath', () => {
   test('On Linux', () => {
     sinon.mock(os).expects('type').once().returns('Linux');
-    sinon.stub(process, 'env').value({ PATH: '' }); // eslint-disable-line @typescript-eslint/naming-convention
+    sinon.stub(process, 'env').value({ PATH: '' });
     assert.strictEqual(getPath(), '');
   });
 
   test('On Mac without the bin path', () => {
     sinon.mock(os).expects('type').once().returns('Darwin');
-    sinon.stub(process, 'env').value({ PATH: 'Users/Foo/' }); // eslint-disable-line @typescript-eslint/naming-convention
+    sinon.stub(process, 'env').value({ PATH: 'Users/Foo/' });
     assert.strictEqual(getPath(), 'Users/Foo/:/usr/local/bin');
   });
 
   test('On Mac with the bin path', () => {
     sinon.mock(os).expects('type').once().returns('Darwin');
-    sinon.stub(process, 'env').value({ PATH: 'Users/Foo/:/usr/local/bin' }); // eslint-disable-line @typescript-eslint/naming-convention
+    sinon.stub(process, 'env').value({ PATH: 'Users/Foo/:/usr/local/bin' });
     assert.strictEqual(getPath(), 'Users/Foo/:/usr/local/bin');
   });
 });
diff --git a/src/test/suite/utils/getRestoreCacheCommand.test.ts b/src/test/suite/utils/getRestoreCacheCommand.test.ts
@@ -14,7 +14,6 @@ suite('getRestoreCacheCommand', () => {
       normalize(
         getRestoreCacheCommand(
           {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
             restore_cache: {
               key: 'v2-deps-{{ checksum "package-lock.json" }}',
             },
@@ -62,7 +61,6 @@ suite('getRestoreCacheCommand', () => {
       normalize(
         getRestoreCacheCommand(
           {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
             restore_cache: {
               keys: ['v2-deps-{{ checksum "package-lock.json" }}', 'v2-deps'],
             },

diff --git a/src/utils/getHash.ts b/src/utils/getHash.ts
@@ -0,0 +1,5 @@
+import { sha256 } from 'cross-sha256';
+
+export default function getHash(toHash: string): string {
+  return new sha256().update(toHash).digest('hex');
+}
diff --git a/src/utils/getLicenseErrorMessage.ts b/src/utils/getLicenseErrorMessage.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 const errors = {
   missing: 'License does not exist.',
   missing_url: 'URL not provided.',

diff --git a/src/utils/getSpawnOptions.ts b/src/utils/getSpawnOptions.ts
@@ -6,7 +6,7 @@ export default function getSpawnOptions(cwd?: string): SpawnOptions {
     cwd: cwd || getFirstWorkspaceRootPath(),
     env: {
       ...process.env,
-      PATH: getPath(), // eslint-disable-line @typescript-eslint/naming-convention
+      PATH: getPath(),
     },
   };
 }
diff --git a/src/utils/isLicenseValid.ts b/src/utils/isLicenseValid.ts
@@ -1,5 +1,4 @@
 import axios from 'axios';
-import * as md5 from 'js-md5';
 import * as vscode from 'vscode';
 import {
   LICENSE_ERROR,
@@ -8,6 +7,7 @@ import {
   LICENSE_VALIDITY,
   LICENSE_VALIDITY_CACHE_EXPIRATION,
 } from '../constants';
+import getHash from './getHash';
 
 const licenseValidationEndpoint = 'https://getlocalci.com';
 const fiveMinutesInMilliseconds = 300000;
@@ -41,12 +41,12 @@ export default async function isLicenseValid(
     response = await axios.get(licenseValidationEndpoint, {
       params: {
         headers: {
-          'Cache-Control': 'no-cache', // eslint-disable-line @typescript-eslint/naming-convention
+          'Cache-Control': 'no-cache',
         },
         license: encodeURI(String(trimmedLicenseKey)),
-        edd_action: 'activate_license', // eslint-disable-line @typescript-eslint/naming-convention
-        item_id: LICENSE_ITEM_ID, // eslint-disable-line @typescript-eslint/naming-convention
-        url: md5(vscode.env.machineId),
+        edd_action: 'activate_license',
+        item_id: LICENSE_ITEM_ID,
+        url: getHash(vscode.env.machineId),
       },
     });
   } catch (e) {