idk/I2P_in_Private_Browsing_Mode_for_Firefox
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

work on format

Browse Source
This commit is contained in:
idk
2019-10-06 15:14:53 -04:00
parent b9d6171c8d
commit 1edd41900f
5 changed files with 1041 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -66,7 +66,7 @@ libpolyfill:
wget -O chromium/browser-polyfill.min.js https://unpkg.com/webextension-polyfill/dist/browser-polyfill.min.js
fmt:
find . -name '*.js' -exec jsfmt -w {} \;
find . -path ./node_modules -prune -o -name '*.js' -exec jsfmt -w {} \;
deborig:
rm -rfv ../i2psetproxy.js-$(VERSION)

33
background.js
View File

@@ -23,32 +23,9 @@ function onGot(contexts) {
function onError(e) {
console.error(e);
}
browser.contextualIdentities.query({}).then(onGot, onError);
function getChrome() {
if (browser.runtime.getBrowserInfo == undefined) {
return true
}
return false
}
function isDroid() {
if (!getChrome()) {
var gettingInfo = browser.runtime.getPlatformInfo();
gettingInfo.then((got) => {
if (got.os == "android") {
console.log("android detected")
return true
} else {
console.log("desktop detected")
return false
}
});
}
return false
}
if (!isDroid()) {
chrome.windows.onCreated.addListener(themeWindow);
}
@@ -154,10 +131,6 @@ function setTitle(window) {
querying.then(logTabs, onError);
}
function setTitleError(window) {
alert("plugin error setting title on", window.id)
}
chrome.windows.onCreated.addListener(() => {
//var gettingStoredSettings = chrome.storage.local.get();
//gettingStoredSettings.then(setupProxy, onError);
@@ -170,5 +143,5 @@ chrome.tabs.onCreated.addListener(() => {
var getting = browser.windows.getCurrent({
populate: true
});
getting.then(setTitle, setTitleError);
});
getting.then(setTitle, onError);
});

1779
chromium/browser-polyfill.min.js vendored
View File

File diff suppressed because it is too large Load Diff

2
manifest.json
View File

@@ -37,7 +37,7 @@
"page": "options/options.html"
},
"background": {
"scripts": ["chromium/browser-polyfill.min.js", "background.js", "proxy.js", "info.js", "privacy.js", "scrub.js" ]
"scripts": ["chromium/browser-polyfill.min.js", "platform.js", "background.js", "proxy.js", "info.js", "privacy.js", "scrub.js" ]
},
"protocol_handlers": [{
"protocol": "web+rc",

325
proxy.js
View File

@@ -1,118 +1,89 @@
function getChrome() {
if (browser.runtime.getBrowserInfo == undefined) {
return true
}
return false
}
function isDroid() {
if (!getChrome()) {
var gettingInfo = browser.runtime.getPlatformInfo();
gettingInfo.then((got) => {
if (got.os == "android") {
console.log("android detected")
return true
} else {
console.log("desktop detected")
return false
}
});
}
return false
}
if (!getChrome()) {
browser.privacy.network.peerConnectionEnabled.set({
value: false
});
browser.privacy.network.peerConnectionEnabled.set({
value: false
});
console.log("Preliminarily disabled WebRTC.")
}
chrome.privacy.network.networkPredictionEnabled.set({
value: false
value: false
});
chrome.privacy.network.webRTCIPHandlingPolicy.set({
value: "disable_non_proxied_udp"
value: "disable_non_proxied_udp"
});
console.log("Preliminarily disabled WebRTC.")
function shouldProxyRequest(requestInfo) {
return requestInfo.parentFrameId != -1;
}
var onError = function(e) {
console.error(e);
return requestInfo.parentFrameId != -1;
}
var handleContextProxyRequest = async function(requestDetails) {
console.log("(proxy)Searching for proxy by context");
try {
var handleProxyRequest = function(context) {
proxy = {
failoverTimeout: 0,
type: "direct",
proxyDns: false
}
if (context.name == "i2pbrowser") {
proxy = {
type: getScheme(),
host: getHost(),
port: getPort(),
}
console.log("(proxy)Using", proxy.type, "proxy ", proxy.host + ":" + proxy.port);
return proxy
}
return proxy
console.log("(proxy)Searching for proxy by context");
try {
var handleProxyRequest = function(context) {
proxy = {
failoverTimeout: 0,
type: "direct",
proxyDns: false
}
if (context.name == "i2pbrowser") {
proxy = {
type: getScheme(),
host: getHost(),
port: getPort(),
}
var contextGet = async function(tabInfo){
try {
console.log("(proxy)Tab info from Function", tabInfo)
context = await browser.contextualIdentities.get(tabInfo.cookieStoreId)
return context
} catch(error) {
console.log("(proxy)Conext Error", error)
}
}
var tabGet = async function(tabId) {
try {
console.log("(proxy)Tab ID from Request", tabId)
let tabInfo = await browser.tabs.get(tabId)
return tabInfo
}catch(error){
console.log("(proxy)Tab error", error)
}
}
if (requestDetails.tabId > 0) {
var tab = tabGet(requestDetails.tabId)
var context = tab.then(contextGet)
var proxy = await context.then(handleProxyRequest)
console.log("(proxy)Returning I2P Proxy", proxy)
return proxy
}
} catch (error) {
console.log("(proxy)Not using I2P Proxy.", error);
console.log("(proxy)Using", proxy.type, "proxy ", proxy.host + ":" + proxy.port);
return proxy
}
return proxy
}
var contextGet = async function(tabInfo) {
try {
console.log("(proxy)Tab info from Function", tabInfo)
context = await browser.contextualIdentities.get(tabInfo.cookieStoreId)
return context
} catch ( error ) {
console.log("(proxy)Conext Error", error)
}
}
var tabGet = async function(tabId) {
try {
console.log("(proxy)Tab ID from Request", tabId)
let tabInfo = await browser.tabs.get(tabId)
return tabInfo
} catch ( error ) {
console.log("(proxy)Tab error", error)
}
}
if (requestDetails.tabId > 0) {
var tab = tabGet(requestDetails.tabId)
var context = tab.then(contextGet)
var proxy = await context.then(handleProxyRequest)
console.log("(proxy)Returning I2P Proxy", proxy)
return proxy
}
} catch ( error ) {
console.log("(proxy)Not using I2P Proxy.", error);
}
}
var proxy_scheme = "HTTP"
function getScheme() {
if (proxy_scheme == undefined) {
proxy_scheme = "http"
}
if (proxy_scheme == "HTTP") {
proxy_scheme = "http"
}
if (proxy_scheme == "SOCKS") {
proxy_scheme = "socks"
}
if (proxy_scheme != "http" && proxy_scheme != "socks") {
proxy_scheme = "http"
}
//console.log("Got i2p proxy scheme:", proxy_scheme);
return proxy_scheme;
if (proxy_scheme == undefined) {
proxy_scheme = "http"
}
if (proxy_scheme == "HTTP") {
proxy_scheme = "http"
}
if (proxy_scheme == "SOCKS") {
proxy_scheme = "socks"
}
if (proxy_scheme != "http" && proxy_scheme != "socks") {
proxy_scheme = "http"
}
//console.log("Got i2p proxy scheme:", proxy_scheme);
return proxy_scheme;
}
var proxy_host = "127.0.0.1"
@@ -121,112 +92,112 @@ var control_host = "127.0.0.1"
var control_port = "4444"
function getHost() {
if (proxy_host == undefined) {
proxy_host = "127.0.0.1"
}
return proxy_host;
if (proxy_host == undefined) {
proxy_host = "127.0.0.1"
}
return proxy_host;
}
function getPort() {
if (proxy_port == undefined) {
var scheme = getScheme()
if (scheme == "socks") {
proxy_port = "4446"
} else {
proxy_port = "4444"
}
if (proxy_port == undefined) {
var scheme = getScheme()
if (scheme == "socks") {
proxy_port = "4446"
} else {
proxy_port = "4444"
}
return proxy_port;
}
return proxy_port;
}
function getControlHost() {
if (control_host == undefined) {
return "127.0.0.1"
}
return control_host;
if (control_host == undefined) {
return "127.0.0.1"
}
return control_host;
}
function getControlPort() {
if (control_port == undefined) {
return "4444"
}
return control_port;
if (control_port == undefined) {
return "4444"
}
return control_port;
}
function setupProxy() {
var controlHost = getControlHost()
var controlPort = getControlPort();
var Host = getHost()
var Port = getPort()
var Scheme = getScheme()
if (!getChrome()) {
/**/
console.log("Setting up Firefox WebExtension proxy")
browser.proxy.onRequest.addListener(handleContextProxyRequest, {
urls: ["<all_urls>"]
});
console.log("i2p settings created for WebExtension Proxy")
/**/
} else {
var config = {
mode: "fixed_servers",
rules: {
singleProxy: {
scheme: Scheme,
host: Host,
port: parseInt(Port),
},
}
};
chrome.proxy.settings.set({
value: config,
scope: 'regular'
}, function() {});
}
var controlHost = getControlHost()
var controlPort = getControlPort();
var Host = getHost()
var Port = getPort()
var Scheme = getScheme()
if (!getChrome()) {
/**/
console.log("Setting up Firefox WebExtension proxy")
browser.proxy.onRequest.addListener(handleContextProxyRequest, {
urls: ["<all_urls>"]
});
console.log("i2p settings created for WebExtension Proxy")
/**/
} else {
var config = {
mode: "fixed_servers",
rules: {
singleProxy: {
scheme: Scheme,
host: Host,
port: parseInt(Port),
},
}
};
chrome.proxy.settings.set({
value: config,
scope: 'regular'
}, function() {});
}
}
function checkStoredSettings(storedSettings) {
let defaultSettings = {};
if (!storedSettings.proxy_scheme) {
defaultSettings["proxy_scheme"] = "http"
}
if (!storedSettings.proxy_host) {
defaultSettings["proxy_host"] = "127.0.0.1"
}
if (!storedSettings.proxy_port) {
defaultSettings["proxy_port"] = 4444
}
if (!storedSettings.control_host) {
defaultSettings["control_host"] = "127.0.0.1"
}
if (!storedSettings.control_port) {
defaultSettings["control_port"] = 4444
}
chrome.storage.local.set(defaultSettings);
let defaultSettings = {};
if (!storedSettings.proxy_scheme) {
defaultSettings["proxy_scheme"] = "http"
}
if (!storedSettings.proxy_host) {
defaultSettings["proxy_host"] = "127.0.0.1"
}
if (!storedSettings.proxy_port) {
defaultSettings["proxy_port"] = 4444
}
if (!storedSettings.control_host) {
defaultSettings["control_host"] = "127.0.0.1"
}
if (!storedSettings.control_port) {
defaultSettings["control_port"] = 4444
}
chrome.storage.local.set(defaultSettings);
}
function update(restoredSettings) {
proxy_scheme = restoredSettings.proxy_scheme
console.log("restoring proxy scheme:", proxy_scheme)
proxy_host = restoredSettings.proxy_host
console.log("restoring proxy host:", proxy_host)
proxy_port = restoredSettings.proxy_port
console.log("restoring proxy port:", proxy_port)
control_host = restoredSettings.control_host
console.log("restoring control host:", control_host)
control_port = restoredSettings.control_port
console.log("restoring control port:", control_port)
proxy_scheme = restoredSettings.proxy_scheme
console.log("restoring proxy scheme:", proxy_scheme)
proxy_host = restoredSettings.proxy_host
console.log("restoring proxy host:", proxy_host)
proxy_port = restoredSettings.proxy_port
console.log("restoring proxy port:", proxy_port)
control_host = restoredSettings.control_host
console.log("restoring control host:", control_host)
control_port = restoredSettings.control_port
console.log("restoring control port:", control_port)
}
chrome.storage.local.get(function(got) {
checkStoredSettings(got)
update(got)
setupProxy()
checkStoredSettings(got)
update(got)
setupProxy()
});
// Theme all currently open windows
if (!getChrome()) {
if (!isDroid()) {
browser.windows.getAll().then(wins => wins.forEach(themeWindow));
}
if (!isDroid()) {
browser.windows.getAll().then(wins => wins.forEach(themeWindow));
}
}