Fix #2682: Make getBaseDomain use LRU cache

brave · Jul 24, 2016 · d6ce718 · d6ce718
1 parent f8ef2c4
commit d6ce718
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/app/filtering.js b/app/filtering.js
@@ -196,7 +196,7 @@ function registerForBeforeSendHeaders (session) {
           requestHeaders['Cookie'] = undefined
         }
         if (requestHeaders['Referer'] &&
-            !refererExceptions.includes(parsedUrl.hostname)) {
+            !refererExceptions.includes(parsedUrl.hostname) && !refererExceptions.includes(getBaseDomain(parsedUrl.hostname))) {
           requestHeaders['Referer'] = undefined
         }
       }

diff --git a/js/lib/baseDomain.js b/js/lib/baseDomain.js
@@ -5,16 +5,26 @@
 const punycode = require('punycode')
 const publicSuffixes = require('./psl')
 
+const LRUCache = require('lru_cache/core').LRUCache
+
+let cachedBaseDomain = new LRUCache(50)
+
 /**
  * Returns base domain for specified host based on Public Suffix List.
  * @param {string} hostname The name of the host to get the base domain for
  */
+
 module.exports.getBaseDomain = function (hostname) {
   // decode punycode if exists
   if (hostname.indexOf('xn--') >= 0) {
     hostname = punycode.toUnicode(hostname)
   }
 
+  let baseDomain = cachedBaseDomain.get(hostname)
+  if (baseDomain) {
+    return baseDomain
+  }
+
   // search through PSL
   var prevDomains = []
   var curDomain = hostname
@@ -44,5 +54,8 @@ module.exports.getBaseDomain = function (hostname) {
     tld--
   }
 
-  return curDomain
+  baseDomain = curDomain
+  cachedBaseDomain.put(baseDomain)
+
+  return baseDomain
 }