Revert Fix processing of proxybypass variables from environment #286

lib/Util.ts

@@ -6,7 +6,6 @@ import * as url from 'url';
 import * as path from 'path';
 import zlib = require('zlib');
 import { IRequestQueryParams, IHttpClientResponse } from './Interfaces';
-import { searchRegExpToReplaceSpecialChars } from './Constants';
 
 /**
  * creates an url from a request url and optional base url (http://server:8080)
@@ -108,15 +107,17 @@ export async function decompressGzippedContent(buffer: Buffer, charset?: string)
  * @return {RegExp}
  */
 export function buildProxyBypassRegexFromEnv(bypass : string) : RegExp {
-    // check if expression starts with asterisk and replace it with .*
-    if (bypass && bypass.startsWith("*")) {
-        bypass = bypass.replace("*", ".*");
+    try {
+        // We need to keep this around for back-compat purposes
+        return new RegExp(bypass, 'i')    
+    }
+    catch(err) {
+        if (err instanceof SyntaxError && (bypass || "").startsWith("*")) {            
+            let wildcardEscaped = bypass.replace('*', '(.*)');
+            return new RegExp(wildcardEscaped, 'i');
+        }
+        throw err;
     }
-
-    // replace all . symbols in string by \. because point is a special character
-    const safeRegex = (bypass || "").replace(searchRegExpToReplaceSpecialChars, '\\$1');
-
-    return new RegExp(safeRegex, 'i');
 }
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typed-rest-client",
-  "version": "1.8.5",
+  "version": "1.8.4",
   "description": "Node Rest and Http Clients for use with TypeScript",
   "main": "./RestClient.js",
   "scripts": {

test/units/utiltests.ts

@@ -41,28 +41,6 @@ describe('Util Tests', function () {
             assert.equal(bypassed, true);
         });       
 
-        it('not bypasses if domain pattern starts with .', () => {
-            let regExp = util.buildProxyBypassRegexFromEnv('.intranet');
-            assert(regExp, 'regExp should not be null');
-            let parsedUrl = url.parse("https://keyvault.vault.azure.net/secrets/test-secret1-intranet");
-            let bypassed = regExp.test(parsedUrl.href);
-            assert.equal(bypassed, false);
-        });
-
-        it('bypasses if domain pattern starts with .', () => {
-            let regExp = util.buildProxyBypassRegexFromEnv('.net');
-            assert(regExp, 'regExp should not be null');
-            let parsedUrl = url.parse("https://keyvault.vault.azure.net/secrets/test-secret1-intranet");
-            let bypassed = regExp.test(parsedUrl.href);
-            assert.equal(bypassed, true);
-        });
-
-        it('bypasses if domain pattern starts with . and contains complex domain', () => {
-            let regExp = util.buildProxyBypassRegexFromEnv('.azure.net');
-            assert(regExp, 'regExp should not be null');
-            let parsedUrl = url.parse("https://keyvault.vault.azure.net/secrets/test-secret1-intranet");
-            let bypassed = regExp.test(parsedUrl.href);
-            assert.equal(bypassed, true);
-        });
     });
-});
+
+});