diff --git a/background.js b/background.js index 7982f47..e75ea6a 100644 --- a/background.js +++ b/background.js @@ -11,7 +11,7 @@ var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate"); var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface"); var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate"); var localpref = chrome.i18n.getMessage("localPreface"); -var localpref = chrome.i18n.getMessage("localPrefacePrivate"); +var localprefpriv = chrome.i18n.getMessage("localPrefacePrivate"); function onContextsGot(contexts) { var ids = []; diff --git a/proxy.js b/proxy.js index cea04a2..1a4fba1 100644 --- a/proxy.js +++ b/proxy.js @@ -46,14 +46,9 @@ var handleContextProxyRequest = async function(requestDetails) { host: getHost(), port: getPort() }; - console.log( - "(proxy)", - context.name, - "Using", - proxy.type, - "proxy ", - proxy.host + ":" + proxy.port - ); + console.log("(proxy)", context.name); + console.log("Using", proxy.type); + console.log("proxy ", proxy.host + ":" + proxy.port); return proxy; } else if (context.name == routerpref) { if (routerHost(requestDetails.url)) { @@ -70,14 +65,9 @@ var handleContextProxyRequest = async function(requestDetails) { host: getHost(), port: getPort() }; - console.log( - "(proxy)", - context.name, - "Using", - proxy.type, - "proxy ", - proxy.host + ":" + proxy.port - ); + console.log("(proxy)", context.name); + console.log("Using", proxy.type); + console.log("proxy ", proxy.host + ":" + proxy.port); return proxy; } else if (context.name == webpref) { if (localHost(requestDetails.url)) { @@ -89,14 +79,9 @@ var handleContextProxyRequest = async function(requestDetails) { }; } } - console.log( - "(proxy)", - context.name, - "Using", - proxy.type, - "proxy ", - proxy.host + ":" + proxy.port - ); + console.log("(proxy)", context.name); + console.log("Using", proxy.type); + console.log("proxy ", proxy.host + ":" + proxy.port); return proxy; } } @@ -127,7 +112,7 @@ var handleContextProxyRequest = async function(requestDetails) { context = await browser.contextualIdentities.get(tabInfo.cookieStoreId); return context; } catch (error) { - return "firefox-default"; + return; //"firefox-default"; } }; var tabGet = async function(tabId) { @@ -333,12 +318,6 @@ function getControlPort() { } function setupProxy() { - /* var controlHost = getControlHost(); - var controlPort = getControlPort(); - var Host = getHost(); - var Port = getPort(); - var Scheme = getScheme(); */ - /**/ console.log("Setting up Firefox WebExtension proxy"); browser.proxy.onRequest.addListener(handleContextProxyRequest, { diff --git a/scrub.js b/scrub.js index 3061db5..199f2cc 100644 --- a/scrub.js +++ b/scrub.js @@ -390,12 +390,12 @@ var contextSetup = async function(requestDetails) { return requestDetails; } if (i2pHost(requestDetails.url)) { - /*var setcookie = browser.cookies.set({ + var setcookie = browser.cookies.set({ firstPartyDomain: i2pHostName(requestDetails.url), url: requestDetails.url, secure: true }); - setcookie.then(onContextGotLog, onError);*/ + setcookie.then(onContextGotLog, onError); var tab = tabGet(requestDetails.tabId); var mtab = tab.then(i2pTabFind, onError); return requestDetails; @@ -431,16 +431,6 @@ var contextSetup = async function(requestDetails) { return requestDetails; } } - /*if (typeof requestDetails == "number") { - tab = tabGet(requestDetails); - var mtab = tab.then(anyTabFind); - } else if (typeof requestDetails != undefined) { - if (typeof requestDetails.tabId > 0) { - tab = tabGet(requestDetails.tabId); - var mtab = tab.then(anyTabFind); - } - } - return requestDetails;*/ } catch (error) { console.log("(isolate)Not an I2P request, blackholing", error); }