Merge pull request #362 from fwal/fwal/fix-gpg

Remove unused keyservers

Author: fwal

__tests__/gpg.test.ts

@@ -16,21 +16,39 @@ describe("gpg", () => {
     expect(mockExec).toBeCalledTimes(1);
   });
 
-  it("uses the next keyserver in the pool if the previous fails", async () => {
-    const failingServers = 3;
-    let testedServers = 0;
+  // NOTE: Currently disabled as the pool only contains one server
+  // it("uses the next keyserver in the pool if the previous fails", async () => {
+  //   const failingServers = 3;
+  //   let testedServers = 0;
+
+  //   mockExec.mockImplementation(() => {
+  //     testedServers++;
+  //     if (testedServers >= failingServers) {
+  //       return Promise.resolve(0);
+  //     } else {
+  //       return Promise.resolve(1);
+  //     }
+  //   });
+
+  //   await refreshKeys();
+  //   expect(mockExec).toBeCalledTimes(3);
+  // });
+
+  it("makes a second attempt if the keyserver fails", async () => {
+    const attempts = 2;
+    let tests = 0;
 
     mockExec.mockImplementation(() => {
-      testedServers++;
-      if (testedServers >= failingServers) {
+      tests++;
+      if (tests >= attempts) {
         return Promise.resolve(0);
       } else {
         return Promise.resolve(1);
       }
     });
 
     await refreshKeys();
-    expect(mockExec).toBeCalledTimes(3);
+    expect(mockExec).toBeCalledTimes(2);
   });
 
   it("throws an error if all servers in the pool fails", async () => {

src/gpg.ts

@@ -21,18 +21,19 @@ export async function verify(signaturePath: string, packagePath: string) {
 }
 
 export async function refreshKeys() {
-  const pool = [
-    "hkp://pool.sks-keyservers.net",
-    "ha.pool.sks-keyservers.net",
-    "keyserver.ubuntu.com",
-    "hkp://keyserver.ubuntu.com",
-    "pgp.mit.edu",
-  ];
+  const pool = ["hkp://keyserver.ubuntu.com"];
 
   for (const server of pool) {
     core.debug(`Refreshing keys from ${server}`);
+    // 1st try...
     if (await refreshKeysFromServer(server)) {
-      core.debug(`Refresh successful`);
+      core.debug(`Refresh successful on first attempt`);
+      return;
+    }
+
+    // 2nd try...
+    if (await refreshKeysFromServer(server)) {
+      core.debug(`Refresh successful on second attempt`);
       return;
     }
     core.debug(`Refresh failed`);