Merge branch 'master' into SNOW-1789666-azure-core-http-deprecated

snowflakedb · Dec 13, 2024 · e4d514a · e4d514a
2 parents e60fd01 + 4f7708d
commit e4d514a
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 8 deletions.
diff --git a/.github/workflows/jira_issue.yml b/.github/workflows/jira_issue.yml
@@ -37,7 +37,7 @@ jobs:
           summary: '${{ github.event.issue.title }}'
           description: |
             ${{ github.event.issue.body }} \\ \\ _Created from GitHub Action_ for ${{ github.event.issue.html_url }}
-          fields: '{ "customfield_11401": {"id": "14723"}, "assignee": {"id": "712020:3c0352b5-63f7-4e26-9afe-38f6f9f0f4c5"}, "components":[{"id":"19290"}] }'
+          fields: '{ "customfield_11401": {"id": "14723"}, "assignee": {"id": "712020:e1f41916-da57-4fe8-b317-116d5229aa51"}, "components":[{"id":"19290"}], "labels": ["oss"], "priority": {"id": "10001"} }'
 
       - name: Update GitHub Issue
         uses: ./jira/gajira-issue-update

diff --git a/lib/proxy_util.js b/lib/proxy_util.js
@@ -129,6 +129,14 @@ exports.validateEmptyString = function (value) {
 };
 
 exports.getProxyFromEnv = function (isHttps = true) {
+  const getDefaultPortIfNotSet = (proxyFromEnv) => {
+    const isProxyProtocolHttps = proxyFromEnv.protocol === 'https:';
+    if (!proxyFromEnv.port) {
+      return isProxyProtocolHttps ? 443 : 80;
+    } else {
+      return proxyFromEnv.port;
+    }
+  };
   const protocol = isHttps ? 'https' : 'http';
   let proxyFromEnv = Util.getEnvVar(`${protocol}_proxy`);
   if (!proxyFromEnv){
@@ -141,9 +149,10 @@ exports.getProxyFromEnv = function (isHttps = true) {
     proxyFromEnv = 'http' + '://' + proxyFromEnv;
   }
   proxyFromEnv = new URL(proxyFromEnv);
+  const port = getDefaultPortIfNotSet(proxyFromEnv);
   const proxy = {
     host: Util.validateEmptyString(proxyFromEnv.hostname),
-    port: Number(Util.validateEmptyString(proxyFromEnv.port)),
+    port: Number(port),
     user: Util.validateEmptyString(proxyFromEnv.username),
     password: Util.validateEmptyString(proxyFromEnv.password),
     protocol: Util.validateEmptyString(proxyFromEnv.protocol),

diff --git a/test/unit/proxy_util_test.js b/test/unit/proxy_util_test.js
@@ -150,7 +150,7 @@ describe('getProxyEnv function test ', function () {
     {
       name: 'HTTP PROXY with authentication',
       isHttps: false,
-      httpProxy: 'http://hello:[email protected]:8080',
+      httpProxy: 'http://hello:[email protected]:8080', //# pragma: allowlist secret
       httpsProxy: undefined,
       noProxy: '*.amazonaws.com,*.my_company.com',
       result: {
@@ -165,7 +165,7 @@ describe('getProxyEnv function test ', function () {
     {
       name: 'HTTPS PROXY with authentication without NO proxy',
       isHttps: true,
-      httpsProxy: 'https://user:[email protected]:1234',
+      httpsProxy: 'https://user:[email protected]:1234', //# pragma: allowlist secret
       result: {
         host: 'myproxy.server.com',
         user: 'user',
@@ -187,6 +187,42 @@ describe('getProxyEnv function test ', function () {
         noProxy: '*.amazonaws.com|*.my_company.com|*.test.com',
       },
     },
+    {
+      name: 'HTTPS PROXY with authentication without port and protocol',
+      isHttps: true,
+      noProxy: '*.amazonaws.com,*.my_company.com,*.test.com',
+      httpsProxy: 'myproxy.server.com',
+      result: {
+        host: 'myproxy.server.com',
+        port: 80,
+        protocol: 'http:',
+        noProxy: '*.amazonaws.com|*.my_company.com|*.test.com',
+      },
+    },
+    {
+      name: 'HTTP PROXY with authentication without port and protocol',
+      isHttps: false,
+      noProxy: '*.amazonaws.com,*.my_company.com,*.test.com',
+      httpProxy: 'myproxy.server.com',
+      result: {
+        host: 'myproxy.server.com',
+        port: 80,
+        protocol: 'http:',
+        noProxy: '*.amazonaws.com|*.my_company.com|*.test.com',
+      },
+    },
+    {
+      name: 'HTTPS PROXY with authentication without port',
+      isHttps: true,
+      noProxy: '*.amazonaws.com,*.my_company.com,*.test.com',
+      httpsProxy: 'https://myproxy.server.com',
+      result: {
+        host: 'myproxy.server.com',
+        port: 443,
+        protocol: 'https:',
+        noProxy: '*.amazonaws.com|*.my_company.com|*.test.com',
+      }
+    }
   ];
 
   testCases.forEach(({ name, isHttps, httpsProxy, httpProxy, noProxy, result }) => {
@@ -265,11 +301,11 @@ describe('Proxy Util for Azure', function () {
   it('test hide and restore environment proxy', function () {
     const testCases = 
     {
-      httpProxy: 'https://user:[email protected]:1234',
-      httpsProxy: 'https://user:[email protected]:1234',
+      httpProxy: 'https://user:[email protected]:1234', //# pragma: allowlist secret
+      httpsProxy: 'https://user:[email protected]:1234', //# pragma: allowlist secret
       noProxy: '*.amazonaws.com,*.my_company.com',
-      HttpProxy: 'https://user:[email protected]:1234',
-      HttpsProxy: 'https://user:[email protected]:1234',
+      HttpProxy: 'https://user:[email protected]:1234', //# pragma: allowlist secret
+      HttpsProxy: 'https://user:[email protected]:1234', //# pragma: allowlist secret
       NoProxy: '*.amazonaws2.com,*.my_company2.com',
     };