Merge pull request #236 from salesforce/fix/235_domain_matching

fix: domain match routine
salesforce · Apr 21, 2022 · 9b10131 · 9b10131
2 parents 30246e6 + 35b7a13
commit 9b10131
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/cookie.js b/lib/cookie.js
@@ -368,7 +368,7 @@ function domainMatch(str, domStr, canonicalize) {
   /* " o All of the following [three] conditions hold:" */
 
   /* "* The domain string is a suffix of the string" */
-  const idx = str.indexOf(domStr);
+  const idx = str.lastIndexOf(domStr);
   if (idx <= 0) {
     return false; // it's a non-match (-1) or prefix (0)
   }

diff --git a/test/domain_and_path_test.js b/test/domain_and_path_test.js
@@ -33,7 +33,6 @@
 const vows = require("vows");
 const assert = require("assert");
 const tough = require("../lib/cookie");
-const Cookie = tough.Cookie;
 
 function matchVows(func, table) {
   const theVows = {};
@@ -105,6 +104,9 @@ vows
       ["www.aaaa.com", "aaa.com", false],
       ["www.aaa.com", "aaa.com", true],
       ["www.aexample.com", "example.com", false], // has to match on "." boundary
+      ["computer.com", "com", true], // suffix string found at start of domain
+      ["becoming.com", "com", true], // suffix string found in middle of domain
+      ["sitcom.com", "com", true], // suffix string found just before the '.' boundary
 
       // S5.1.3 "The string is a host name (i.e., not an IP address)"
       ["192.168.0.1", "168.0.1", false], // because str is an IP (v4)