Show the grey icon for whitelisted sites with a port number (#19294)

* Update background.js * Update getNormalisedHostname to handle port numbers Co-authored-by: Chan Chak Shing <[email protected]>
EFForg · Nov 16, 2020 · acc5b60 · acc5b60
1 parent 0242bd1
commit acc5b60
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/chromium/background-scripts/background.js b/chromium/background-scripts/background.js
@@ -188,10 +188,11 @@ function updateState () {
       return;
     }
 
+    // tabUrl.host instead of hostname should be used to show the "disabled" status properly (#19293)
     const tabUrl = new URL(tabs[0].url);
-    const hostname = util.getNormalisedHostname(tabUrl.hostname);
+    const host = util.getNormalisedHostname(tabUrl.host);
 
-    if (isExtensionDisabledOnSite(hostname) || iconState == "disabled") {
+    if (isExtensionDisabledOnSite(host) || iconState == "disabled") {
       if ('setIcon' in chrome.browserAction) {
         chrome.browserAction.setIcon({
           path: {

diff --git a/chromium/background-scripts/util.js b/chromium/background-scripts/util.js
@@ -62,11 +62,16 @@ function loadExtensionFile(url, returnType) {
 
 /**
  * Remove tailing dots from hostname, e.g. "www.example.com."
+ * Preserve port numbers if they are used
  */
-function getNormalisedHostname(hostname) {
+function getNormalisedHostname(host) {
+  let [ hostname, port ] = host.split(":");
   while (hostname && hostname[hostname.length - 1] === '.' && hostname !== '.') {
     hostname = hostname.slice(0, -1);
   }
+  if (port) {
+    return `${hostname}:${port}`;
+  }
   return hostname;
 }
 

diff --git a/chromium/test/util_test.js b/chromium/test/util_test.js
@@ -49,9 +49,16 @@ describe('util.js', function() {
   });
 
   describe('getNormalisedHostname', function() {
-    it('removes tailing dots', function() {
+    it('preserve port numbers', function() {
+      assert.strictEqual(util.getNormalisedHostname('example.com'), 'example.com');
+      assert.strictEqual(util.getNormalisedHostname('example.com:8080'), 'example.com:8080');
+    });
+
+    it('removes tailing dots and preserve port numbers', function() {
       assert.strictEqual(util.getNormalisedHostname('example.com.'), 'example.com');
+      assert.strictEqual(util.getNormalisedHostname('example.com.:8080'), 'example.com:8080');
       assert.strictEqual(util.getNormalisedHostname('example.com..'), 'example.com');
+      assert.strictEqual(util.getNormalisedHostname('example.com..:8080'), 'example.com:8080');
     });
 
     it('preserves a single dot', function() {