From 999c18cd9776dc8eeb0a7419c50842ec723c15f2 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 27 Jan 2020 18:05:01 -0500 Subject: [PATCH 1/3] Handle localhost port number when trusting localhost --- app/panel/reducers/summary.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/panel/reducers/summary.js b/app/panel/reducers/summary.js index a604fb06b..b45c6ad80 100644 --- a/app/panel/reducers/summary.js +++ b/app/panel/reducers/summary.js @@ -111,9 +111,17 @@ const _updateSitePolicy = (state, action) => { // Handles extension pages. Adds the extension ID to the white/black list const pageUrlTokens = pageUrl.split('/'); host = pageUrlTokens.length > 2 ? pageUrlTokens[2] : pageHost.replace(/^www\./, ''); + } else if (pageHost === 'localhost') { + // Handle localhost port number + if (pageUrl.includes(':')) { + const port = pageUrl.split(':'); + host = `localhost:${port[port.length - 1]}`; + host = host.substring(0, host.length - 1); + } } else { host = pageHost.replace(/^www\./, ''); } + let updated_site_policy; let updated_blacklist = site_blacklist.slice(0); let updated_whitelist = site_whitelist.slice(0); From 24d0b6a277d9cb553cf50cfd0db3d23a035ed73b Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 28 Jan 2020 12:21:03 -0500 Subject: [PATCH 2/3] Upgrade to node 12.11.0 --- app/panel/reducers/summary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/panel/reducers/summary.js b/app/panel/reducers/summary.js index b45c6ad80..5392ee51e 100644 --- a/app/panel/reducers/summary.js +++ b/app/panel/reducers/summary.js @@ -112,7 +112,7 @@ const _updateSitePolicy = (state, action) => { const pageUrlTokens = pageUrl.split('/'); host = pageUrlTokens.length > 2 ? pageUrlTokens[2] : pageHost.replace(/^www\./, ''); } else if (pageHost === 'localhost') { - // Handle localhost port number + // Handle localhost port number. if (pageUrl.includes(':')) { const port = pageUrl.split(':'); host = `localhost:${port[port.length - 1]}`; From 1a22336418bc965e0017331feaddf1163af6d88e Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 3 Feb 2020 11:53:31 -0500 Subject: [PATCH 3/3] Use cliqz-url-parser to handle trusting localhost --- app/panel/reducers/summary.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/panel/reducers/summary.js b/app/panel/reducers/summary.js index 5392ee51e..aba1dc6f0 100644 --- a/app/panel/reducers/summary.js +++ b/app/panel/reducers/summary.js @@ -13,6 +13,7 @@ /* eslint no-use-before-define: 0 */ +import { URL } from '@cliqz/url-parser'; import { UPDATE_SUMMARY_DATA, UPDATE_CLIQZ_MODULE_DATA, @@ -112,12 +113,8 @@ const _updateSitePolicy = (state, action) => { const pageUrlTokens = pageUrl.split('/'); host = pageUrlTokens.length > 2 ? pageUrlTokens[2] : pageHost.replace(/^www\./, ''); } else if (pageHost === 'localhost') { - // Handle localhost port number. - if (pageUrl.includes(':')) { - const port = pageUrl.split(':'); - host = `localhost:${port[port.length - 1]}`; - host = host.substring(0, host.length - 1); - } + const url = new URL(pageUrl); + host = url.host; } else { host = pageHost.replace(/^www\./, ''); }