From 19a305a26d9e739929485ad824fd57195ef11d88 Mon Sep 17 00:00:00 2001 From: "Ilya Ig. Petrov" Date: Thu, 9 Feb 2017 11:45:23 +0000 Subject: [PATCH] Craft light version manually --- .../extension/00-init-apis.js | 33 -- .../extension/00-set-pac.js | 313 ++++++++++++++++++ .../extension/12-set-pac-url.js | 91 ----- .../extension/40-context-menus.js | 39 ++- .../extension/_locales/en/messages.json | 2 +- .../extension/icons/ext-error-128.png | Bin 0 -> 9478 bytes .../extension/manifest.json | 8 +- .../extension/pages/show-state/index.html | 108 ++++-- .../extension/pages/show-state/index.js | 56 +++- .../pages/show-state/keep-links-clickable.js | 37 +++ 10 files changed, 516 insertions(+), 171 deletions(-) delete mode 100644 extensions/chromium/runet-censorship-bypass-light/extension/00-init-apis.js create mode 100644 extensions/chromium/runet-censorship-bypass-light/extension/00-set-pac.js delete mode 100644 extensions/chromium/runet-censorship-bypass-light/extension/12-set-pac-url.js create mode 100644 extensions/chromium/runet-censorship-bypass-light/extension/icons/ext-error-128.png create mode 100644 extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/keep-links-clickable.js diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/00-init-apis.js b/extensions/chromium/runet-censorship-bypass-light/extension/00-init-apis.js deleted file mode 100644 index deeea8e..0000000 --- a/extensions/chromium/runet-censorship-bypass-light/extension/00-init-apis.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; - -window.utils = { - - areSettingsNotControlledFor(details) { - - return ['controlled_by_other', 'not_controllable'] - .some( (prefix) => details.levelOfControl.startsWith(prefix) ); - - }, - - messages: { - - searchSettingsForUrl(niddle) { - - return 'chrome://settings/search#' + (chrome.i18n.getMessage(niddle) || niddle); - - }, - - whichExtensionHtml() { - - return chrome.i18n.getMessage('noControl') + - ` - ${ chrome.i18n.getMessage('which') } - `; - - }, - - }, - -}; - -window.apis = {}; diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/00-set-pac.js b/extensions/chromium/runet-censorship-bypass-light/extension/00-set-pac.js new file mode 100644 index 0000000..7329e6e --- /dev/null +++ b/extensions/chromium/runet-censorship-bypass-light/extension/00-set-pac.js @@ -0,0 +1,313 @@ +'use strict'; + +console.log('Started.'); + +window.state = { + lastError: null, + ifNotControllable: false, +}; + +window.whichExtensionHtml = ` + + ${chrome.i18n.getMessage('noControl')} + + ${chrome.i18n.getMessage('which')} + `; + +const resetBadge = function resetBadge() { + + okBadge('M'); + chrome.browserAction.setTitle({title: ''}); + +}; + +window.timeouted = (cb) => (...args) => window.setTimeout(() => cb(...args), 0); + +const errorJsonReplacer = function errorJsonReplacer(key, value) { + + // fooWindow.ErrorEvent !== barWindow.ErrorEvent + if (!( value && value.constructor + && ['Error', 'Event'].some( + (suff) => value.constructor.name.endsWith(suff) + ) + )) { + return value; + } + const alt = {}; + + Object.getOwnPropertyNames(value).forEach(function(key) { + + alt[key] = value[key]; + + }, value); + + for(const prop in value) { + if (/^[A-Z]/.test(prop)) { + // MOUSEMOVE, CLICK, KEYUP, NONE, etc. + continue; + } + alt[prop] = value[prop]; + } + + if (value.constructor.name === 'ErrorEvent') { + for(const circularProp of + [ // First line are circular props. + 'target', 'srcElement', 'path', 'currentTarget', + 'bubbles', 'cancelBubble', 'cancelable', 'composed', + 'defaultPrevented', 'eventPhase', 'isTrusted', 'returnValue', + 'timeStamp']) { + delete alt[circularProp]; + } + } + + if (value.name) { + alt.name = value.name; + } + + return alt; + +} + +const extName = chrome.runtime.getManifest().name; + +chrome.notifications.onClicked.addListener( timeouted( (notId) => { + + chrome.notifications.clear(notId); + const err = window.state.lastError; + err.extName = extName; + const type = 'ext-error'; + const json = JSON.stringify(err, errorJsonReplacer, 0); + const url = 'http://rebrand.ly/ac-error/?json=' + encodeURIComponent(json) + + (type ? '&type=' + encodeURIComponent(type) : '') + + '&version=' + chrome.runtime.getManifest().version; + chrome.tabs.create( + {url: url} + ); + +})); + + +const mayNotify = function mayNotify( + id, title, errOrMessage, + { + icon = 'default-128.png', + ifSticky = true, + } = {} +) { + + const message = errOrMessage.message || errOrMessage.toString(); + chrome.notifications.create( + id, + { + title: title, + message: message, + contextMessage: + extName + ' ' + chrome.runtime.getManifest().version.replace(/\d+\.\d+\./g, ''), + requireInteraction: ifSticky, + type: 'basic', + iconUrl: './icons/' + icon, + isClickable: true, + } + ); + +} + +window.installListenersOn = function installListenersOn(win, name, cb) { + + win.addEventListener('error', (errEvent) => { + + window.state.lastError = errEvent; + console.warn(name + ':GLOBAL ERROR', errEvent); + mayNotify('ext-error', 'Ошибка расширения!', errEvent, {icon: 'ext-error-128.png'}); + + }); + + win.addEventListener('unhandledrejection', (event) => { + + console.warn(name + ': Unhandled rejection. Throwing error.'); + event.preventDefault(); + console.log('ev', event); + throw event.reason; + + }); + + if (cb) { + // In most cases getBackgroundPage( (bg) => installListenersOn + // Without setTimeout errors are swallowed, bug #357568 + timeouted(cb)(); + } + +}; + +window.installListenersOn(window, 'BG'); + +const redBadge = function redBadge(msg) { + + chrome.browserAction.setBadgeBackgroundColor({ + color: '#db4b2f', + }); + chrome.browserAction.setBadgeText({ + text: msg, + }); + +}; + +const defaultColorPromise = new Promise( function (resolve) { + + chrome.browserAction.getBadgeBackgroundColor({}, resolve); + +}); + +const okBadge = function okBadge(msg) { + + defaultColorPromise.then( function (defaultColor) { + chrome.browserAction.setBadgeBackgroundColor({ + color: defaultColor, + }); + chrome.browserAction.setBadgeText({ + text: msg, + }); + }); + +} + +const mandatory = (err) => { + + throw new TypeError('This arg is required!'); + +}; + +const throwIfError = (err) => { + + if (err) { + throw new Error('Got error in cb!'); + } + +}; + +const areSettingsNotControllableFor = function areSettingsNotControllable(details = mandatory()) { + + state.ifNotControllable = ['controlled_by_other', 'not_controllable'] + .some( (pref) => details.levelOfControl.startsWith(pref) ); + + if (state.ifNotControllable) { + console.warn('Failed, other extension is in control.'); + state.ifNotControlled = true; + redBadge('xCTRL'); + chrome.browserAction.setTitle({title: 'Другое расширение контролирует прокси'}); + } else { + console.log('Settings are under our control.'); + state.ifNotControlled = !details.levelOfControl.startsWith('controlled_by_this'); + resetBadge(); + } + +}; + +chrome.proxy.settings.onChange.addListener( (details) => { + + console.log('CHANGED prx'); + areSettingsNotControllableFor(details); + +}); + +const updateControlState = function updateControlState(cb = mandatory()) { + + chrome.proxy.settings.get({}, timeouted( (details) => { + + areSettingsNotControllableFor(details); + cb(); + + })); + +}; + +const mayUpdatePac = function mayUpdatePac(cb = mandatory()) { + + if (Date.now() < (localStorage.lastPacUpdateStamp || 0) + 12*60*60*1000 ) { + console.log('Too early for an update.' ); + return cb(); + } + + fetch('https://rebrand.ly/ac-light-pac').then( + (res) => { + + const status = res.status; + if ( !( status >= 200 && status < 300 || status === 304 ) ) { + return cb(new Error('Не удалось скачать скрипт, ошибка ' + status)); + } + return res.text(); + + }, + cb + ).then( (pacData) => { + + console.log('Updating PAC...'); + chrome.proxy.settings.set( + { + value: { + mode: 'pac_script', + pacScript: { + // Use only with extension! + data: pacData + }, + }, + }, + timeouted(() => { + + const err = chrome.runtime.lastError || chrome.extension.lastError; + if(err) { + console.log('Updated with error:', err); + state.lastError = err; + redBadge('ERR'); + chrome.browserAction.setTitle({title: 'Произошла ошибка'}); + setTimeout(resetBadge, 10000); + return cb(err); + } + console.log('Updated, no errors.'); + localStorage.lastPacUpdateStamp = Date.now(); + updateControlState( () => { + + if(state.ifNotControlled) { + cb(new Error(window.whichExtensionHtml)); + } else { + cb(); + } + + }); + + }) + ); + + }, + cb +); + +}; + +window.switchPac = function switchPac(onOff, cb = mandatory()) { + + if(onOff !== 'off') { + localStorage.onOff = 'on'; + chrome.browserAction.setIcon( {path: './icons/default-128.png'} ); + return mayUpdatePac(cb); + } + + chrome.proxy.settings.clear({}, timeouted(() => { + + localStorage.lastPacUpdateStamp = 0; + localStorage.onOff = 'off'; + chrome.browserAction.setIcon({ + path: './icons/default-grayscale-128.png', + }); + cb(); + + })); + +}; + +resetBadge(); +switchPac( localStorage.onOff, (err) => { + + updateControlState(() => throwIfError(err)); + +}); diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/12-set-pac-url.js b/extensions/chromium/runet-censorship-bypass-light/extension/12-set-pac-url.js deleted file mode 100644 index 42bb04b..0000000 --- a/extensions/chromium/runet-censorship-bypass-light/extension/12-set-pac-url.js +++ /dev/null @@ -1,91 +0,0 @@ -'use strict'; - -window.state = { - lastError: null, - ifNotControlled: false -}; - -function redBadge(msg) { - - window.chrome.browserAction.setBadgeBackgroundColor({ - color: '#db4b2f', - }); - chrome.browserAction.setBadgeText({ - text: msg, - }); - -} - -let defaultColorPromise = new Promise( function (resolve) { - - chrome.browserAction.getBadgeBackgroundColor({}, resolve); - -}); - -function okBadge(msg) { - - defaultColorPromise.then( function (defaultColor) { - window.chrome.browserAction.setBadgeBackgroundColor({ - color: defaultColor, - }); - chrome.browserAction.setBadgeText({ - text: msg, - }); - }); - -} - -function checkControlFor(details) { - - state.ifNotControlled = utils.areSettingsNotControlledFor(details); - if (state.ifNotControlled) { - console.warn('Failed, other extension is in control.'); - redBadge('xCTRL'); - } else { - console.log('Successfuly set PAC in proxy settings..'); - okBadge('ok'); - } - -} - -chrome.proxy.settings.onChange.addListener( checkControlFor ); - -chrome.proxy.onProxyError.addListener((details) => { - - console.error(details); - //if (window.state.ifNotControlled) { - // return; - //} -}); - -chrome.proxy.settings.set( - { - value: { - mode: 'pac_script', - pacScript: { - /* - Don't use in system configs! Because Win does poor caching. - Url is encoded to counter abuse. - Source: CloudFlare - */ - //url: 'https://anticensorship-russia.tk/generated-pac-scripts/on-switches-0.17.pac', - //url: 'https://antizapret.prostovpn.org/proxy.pac', - url: 'http://localhost:8080/on-switches-0.17.pac', - mandatory: true - //url: '\x68\x74\x74\x70\x73\x3a\x2f\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x73\x68\x69\x70\x2d\x72\x75\x73\x73\x69\x61\x2e\x74\x6b\x2f\x67\x65\x6e\x65\x72\x61\x74\x65\x64\x2d\x70\x61\x63\x2d\x73\x63\x72\x69\x70\x74\x73\x2f\x6f\x6e\x2d\x73\x77\x69\x74\x63\x68\x65\x73\x2d\x30\x2e\x31\x37\x2e\x70\x61\x63', - }, - }, - }, - function() { - - const err = chrome.runtime.lastError || chrome.extension.lastError; - if(err) { - alert(333) - redBadge('ERR'); - } else { - alert(11); - chrome.proxy.settings.get({}, checkControlFor); - } - - } -); diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/40-context-menus.js b/extensions/chromium/runet-censorship-bypass-light/extension/40-context-menus.js index 2db6a12..038bf43 100644 --- a/extensions/chromium/runet-censorship-bypass-light/extension/40-context-menus.js +++ b/extensions/chromium/runet-censorship-bypass-light/extension/40-context-menus.js @@ -2,13 +2,38 @@ { - const createMenuLinkEntry = (title, tab2url) => chrome.contextMenus.create({ - title: title, - contexts: ['browser_action'], - onclick: - (menuInfo, tab) => Promise.resolve( tab2url( tab ) ) - .then( (url) => chrome.tabs.create({url: url}) ), - }); + let seqId = 0; + + const createMenuLinkEntry = (title, tab2url) => { + + const id = (++seqId).toString(); + + chrome.runtime.onInstalled.addListener( + () => chrome.contextMenus.create({ + id: id, + title: title, + contexts: ['browser_action'] + }, timeouted(() => { + + const err = chrome.runtime.lastError; + if(err) { + console.warn('CTX MENU ERR', err); + throw err; + } + + })) + ); + + chrome.contextMenus.onClicked.addListener((info, tab) => { + + if(info.menuItemId === id) { + Promise.resolve( tab2url( tab ) ) + .then( (url) => chrome.tabs.create({url: url}) ); + } + + }); + + }; createMenuLinkEntry( 'Сайт доступен из-за границы? Is up?', diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/_locales/en/messages.json b/extensions/chromium/runet-censorship-bypass-light/extension/_locales/en/messages.json index ea37145..e221d4e 100644 --- a/extensions/chromium/runet-censorship-bypass-light/extension/_locales/en/messages.json +++ b/extensions/chromium/runet-censorship-bypass-light/extension/_locales/en/messages.json @@ -1,6 +1,6 @@ { "extName": { - "message": "Light Runet Censorship Bypass" + "message": "Runet Censorship Bypass MICRO" }, "extDesc": { "message": "Circumvent Russian Internet Censorship: https://rebrand.ly/ac-wiki" diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/icons/ext-error-128.png b/extensions/chromium/runet-censorship-bypass-light/extension/icons/ext-error-128.png new file mode 100644 index 0000000000000000000000000000000000000000..4317d1f4023de874bc187020d58db730d8ed178c GIT binary patch literal 9478 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 YKixb~DrKxXrT_o{07*qoM6N<$g56OJEC2ui literal 0 HcmV?d00001 diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/manifest.json b/extensions/chromium/runet-censorship-bypass-light/extension/manifest.json index cdf7578..8c90cd7 100644 --- a/extensions/chromium/runet-censorship-bypass-light/extension/manifest.json +++ b/extensions/chromium/runet-censorship-bypass-light/extension/manifest.json @@ -13,8 +13,6 @@ "permissions": [ "proxy", - "alarms", - "storage", "", "tabs", "contextMenus", @@ -22,10 +20,10 @@ ], "background": { - "persistent": true, + "persistent": false, "scripts": [ - "00-init-apis.js", - "12-set-pac-url.js" + "00-set-pac.js", + "40-context-menus.js" ] }, "browser_action": { diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/index.html b/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/index.html index 45fb4c2..42d1342 100644 --- a/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/index.html +++ b/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/index.html @@ -1,43 +1,111 @@  - + - Выбор провайдера PAC -
- Обход блокировок Рунета облегчённый +
+
+

Обход блокировок Рунета МИКРО

- - -
- - - -
- -
+
+
+
    +
    2. +
    3. +
+
+
+ diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/index.js b/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/index.js index 0d55e8e..5389fba 100644 --- a/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/index.js +++ b/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/index.js @@ -4,30 +4,58 @@ chrome.runtime.getBackgroundPage( (backgroundPage) => { const state = backgroundPage.state; - if( state.ifNotControlled ) { - document.getElementById('which-extension').innerHTML - = backgroundPage.utils.messages.whichExtensionHtml(); - document.querySelectorAll('.if-not-controlled').forEach( (node) => { - - node.style.display = 'block'; - - }); + if( state.ifNotControllable ) { + document.getElementById('which-extension').innerHTML = backgroundPage.whichExtensionHtml; + document.documentElement.classList.add('if-not-controlled'); } - if (state.lastError) { + if ( state.lastError) { - document.querySelectorAll('.if-error').forEach( (node) => { + const err = ['message', 'stack', 'name'].reduce((acc, prop) => { - node.style.display = 'block'; + acc[prop] = state.lastError[prop]; + return acc; + + }, {}); + document.getElementById('last-error').innerHTML = JSON.stringify(err); + document.documentElement.classList.add('if-error'); - }); - document.getElementById('last-error').innerHTML = state.lastError; } - document.documentElement.style.display = ''; + const setStatusTo = (msg) => { + document.getElementById('status').innerHTML = msg; + }; + + if(localStorage.onOff === 'on') { + document.getElementById('pac-on').checked = true; + } else { + document.getElementById('pac-off').checked = true; + } + document.getElementById('pac-switch').onclick = function(event) { + + if(event.target.tagName !== 'INPUT') { + return true; + } + setStatusTo('Ждите...'); + const cb = () => { + + event.target.checked = true; + setStatusTo('Готово!'); + + }; + if (event.target.id === 'pac-on') { + backgroundPage.switchPac('on', cb); + } else { + backgroundPage.switchPac('off', cb); + } + return false; + + }; // CLOSE BUTTON document.querySelector('.close-button').onclick = () => window.close(); + document.documentElement.style.display = ''; + }); diff --git a/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/keep-links-clickable.js b/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/keep-links-clickable.js new file mode 100644 index 0000000..8d139cf --- /dev/null +++ b/extensions/chromium/runet-censorship-bypass-light/extension/pages/show-state/keep-links-clickable.js @@ -0,0 +1,37 @@ +'use strict'; +/* +In popup links are not clickable at all, fix it. +On other pages "chrome://" links are not clickable, fix it. +Use only if really required because of performance penalty. +*/ +{ + + const target = document.documentElement; + + const updateLinks = () => { + + const links = document.querySelectorAll('a:not([href=""])'); + for (let i = 0; i < links.length; i++) { + const ln = links[i]; + const location = ln.href; + ln.onclick = function() { + + chrome.tabs.create({active: !this.dataset.inBg, url: location}); + return false; + + }; + } + + }; + + new MutationObserver( updateLinks ) + .observe(target, { + attributes: true, + subtree: true, + childList: true, + characterData: false, + }); + + document.addEventListener('DOMContentLoaded', updateLinks); + +}