@aikidosec/safe-chain 1.1.1 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aikidosec/safe-chain",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "scripts": {
     "test": "node --test --experimental-test-module-mocks 'src/**/*.spec.js'",
     "test:watch": "node --test --watch --experimental-test-module-mocks 'src/**/*.spec.js'",

package/src/packagemanager/yarn/runYarnCommand.js

@@ -23,7 +23,9 @@ export async function runYarnCommand(args) {
 }
 
 async function fixYarnProxyEnvironmentVariables(env) {
-  // Yarn ignores standard proxy environment variables HTTPS_PROXY and NODE_EXTRA_CA_CERTS
+  // Yarn ignores standard proxy environment variable HTTPS_PROXY
+  // It does respect NODE_EXTRA_CA_CERTS for custom CA certificates though.
+  // Don't use YARN_HTTPS_CA_FILE_PATH though, as it causes to ignore all system CAs
 
   // Yarn v2/v3 and v4+ use different environment variables for proxy and CA certs
   // When setting all variables, yarn returns an error about conflicting variables
@@ -35,10 +37,8 @@ async function fixYarnProxyEnvironmentVariables(env) {
 
   if (majorVersion >= 4) {
     env.YARN_HTTPS_PROXY = env.HTTPS_PROXY;
-    env.YARN_HTTPS_CA_FILE_PATH = env.NODE_EXTRA_CA_CERTS;
   } else if (majorVersion === 2 || majorVersion === 3) {
     env.YARN_HTTPS_PROXY = env.HTTPS_PROXY;
-    env.YARN_CA_FILE_PATH = env.NODE_EXTRA_CA_CERTS;
   }
 }
 

package/src/registryProxy/tunnelRequestHandler.js

@@ -35,7 +35,9 @@ function tunnelRequestToDestination(req, clientSocket, head) {
     ui.writeError(
       `Safe-chain: error connecting to ${hostname}:${port} - ${err.message}`
     );
-    clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n");
+    if (clientSocket.writable) {
+      clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n");
+    }
   });
 }
 
@@ -76,8 +78,12 @@ function tunnelRequestViaProxy(req, clientSocket, head, proxyUrl) {
       ui.writeError(
         `Safe-chain: proxy CONNECT failed: ${response.split("\r\n")[0]}`
       );
-      clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n");
-      proxySocket.end();
+      if (clientSocket.writable) {
+        clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n");
+      }
+      if (proxySocket.writable) {
+        proxySocket.end();
+      }
     }
   });
 
@@ -88,11 +94,15 @@ function tunnelRequestViaProxy(req, clientSocket, head, proxyUrl) {
           proxy.port || 8080
         } - ${err.message}`
       );
-      clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n");
+      if (clientSocket.writable) {
+        clientSocket.end("HTTP/1.1 502 Bad Gateway\r\n\r\n");
+      }
     }
   });
 
   clientSocket.on("error", () => {
-    proxySocket.end();
+    if (proxySocket.writable) {
+      proxySocket.end();
+    }
   });
 }