From 5c0e9208c0afa302c3901b67f7cb551854a310d5 Mon Sep 17 00:00:00 2001 From: Thomas Crosby Date: Wed, 1 Mar 2017 17:05:51 -0600 Subject: [PATCH] Fixed correlationHeaderExcludedDomains only cares about first value --- Library/Util.ts | 4 +++- Tests/Library/Util.tests.ts | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Library/Util.ts b/Library/Util.ts index 4d02f304d..64083f42c 100644 --- a/Library/Util.ts +++ b/Library/Util.ts @@ -169,7 +169,9 @@ class Util { for (let i = 0; i < excludedDomains.length; i++) { let regex = new RegExp(excludedDomains[i].replace(/\./g,"\.").replace(/\*/g,".*")); - return !regex.test(url.parse(requestUrl).hostname); + if (regex.test(url.parse(requestUrl).hostname)) { + return false; + } } return true; diff --git a/Tests/Library/Util.tests.ts b/Tests/Library/Util.tests.ts index f00378f68..ce019a73f 100644 --- a/Tests/Library/Util.tests.ts +++ b/Tests/Library/Util.tests.ts @@ -179,7 +179,7 @@ describe("Library/Util", () => { }); it("should return false if domain is on the excluded list", () => { - let client = { config: { correlationHeaderExcludedDomains: ["bing.com"] } }; + let client = { config: { correlationHeaderExcludedDomains: ["bing.com", "bing.net"] } }; let url = "http://bing.com/search?q=node"; assert.equal(Util.canIncludeCorrelationHeader(client, url), false); @@ -187,6 +187,10 @@ describe("Library/Util", () => { let urlSecure = "https://bing.com/search?q=node"; assert.equal(Util.canIncludeCorrelationHeader(client, urlSecure), false); + + let secondDomainUrl = "http://bing.net/search?q=node"; + + assert.equal(Util.canIncludeCorrelationHeader(client, secondDomainUrl), false); }); it("can take wildcards in the excluded domain list", () => {