From 3d9ec1fd3dba7d178f804242072efee018c03382 Mon Sep 17 00:00:00 2001 From: "Ilya Ig. Petrov" Date: Thu, 24 Mar 2016 21:11:36 +0500 Subject: [PATCH] Added context menus --- .../minimalistic-pac-setter/Support.md | 2 +- ...1-sync-pac-script-with-pac-provider.js.swp | Bin 0 -> 16384 bytes ...=> 1-sync-pac-script-with-pac-provider.js} | 77 +++--- .../extension/2-block-informer.js | 147 +++++++++++ .../extension/3-context-menus.js | 37 +++ .../extension/block-informer.js | 124 ---------- .../extension/manifest.json | 10 +- .../pages/choose-pac-provider/index.js | 232 +++++++++--------- .../extension/pages/is-ip-blocked/index.html | 7 + .../extension/pages/is-ip-blocked/index.js | 26 ++ .../extension/pages/other-unblocks/index.html | 10 + .../extension/pages/other-unblocks/index.js | 25 ++ pac-generator/dump.csv | 0 .../benchmark/Inputs/blocked-hosts.txt | 0 pac-performance-analyses/benchmark/Program.cs | 0 .../benchmark/project.json | 0 pac-performance-analyses/chart/README.md | 0 pac-performance-analyses/chart/src/data.tsv | 0 pac-performance-analyses/chart/src/index.html | 0 19 files changed, 417 insertions(+), 280 deletions(-) create mode 100755 extensions/chromium/minimalistic-pac-setter/extension/.1-sync-pac-script-with-pac-provider.js.swp rename extensions/chromium/minimalistic-pac-setter/extension/{sync-pac-script-with-pac-provider.js => 1-sync-pac-script-with-pac-provider.js} (80%) create mode 100755 extensions/chromium/minimalistic-pac-setter/extension/2-block-informer.js create mode 100755 extensions/chromium/minimalistic-pac-setter/extension/3-context-menus.js delete mode 100755 extensions/chromium/minimalistic-pac-setter/extension/block-informer.js create mode 100755 extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.html create mode 100755 extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.js create mode 100755 extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.html create mode 100755 extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.js mode change 100644 => 100755 pac-generator/dump.csv mode change 100644 => 100755 pac-performance-analyses/benchmark/Inputs/blocked-hosts.txt mode change 100644 => 100755 pac-performance-analyses/benchmark/Program.cs mode change 100644 => 100755 pac-performance-analyses/benchmark/project.json mode change 100644 => 100755 pac-performance-analyses/chart/README.md mode change 100644 => 100755 pac-performance-analyses/chart/src/data.tsv mode change 100644 => 100755 pac-performance-analyses/chart/src/index.html diff --git a/extensions/chromium/minimalistic-pac-setter/Support.md b/extensions/chromium/minimalistic-pac-setter/Support.md index c6f2909..cc0c600 100755 --- a/extensions/chromium/minimalistic-pac-setter/Support.md +++ b/extensions/chromium/minimalistic-pac-setter/Support.md @@ -19,7 +19,7 @@ Если пункт уже выбран, нажмите кнопку "[обновить]". 2. Если появилось сообщение об ошибке, с которой вы не можете справиться, то [сообщите о проблеме](#Как-сообщить-о-проблеме). 3. Если ошибок нет, пишет "PAC-скрипт установлен", но https://archive.org всё равно не открывается, то нужно разбираться: - * Зайдите в настройки chrome://settings, убедитесь, что параметр прокси контролируется этим расширением, а не другим. + * Зайдите в настройки chrome://settings/search#proxy и убедитесь, что параметр прокси контролируется этим расширением, а не другим. * Проверьте доступность прокси АнтиЗапрет и АнтиЦенз: `ping proxy.antizapret.prostovpn.org`, `ping gw2.anticenz.org` * Посмотрите логи фоновой страницы в chrome://extensions, если умеете. 4. Если ничего не помогло, то [сообщите о проблеме](#Как-сообщить-о-проблеме). diff --git a/extensions/chromium/minimalistic-pac-setter/extension/.1-sync-pac-script-with-pac-provider.js.swp b/extensions/chromium/minimalistic-pac-setter/extension/.1-sync-pac-script-with-pac-provider.js.swp new file mode 100755 index 0000000000000000000000000000000000000000..3e89a2def704fe92e1daa1677627a6352b7adb3d GIT binary patch literal 16384 zcmeHNUu+yl8DAi@v^1m?386fVLGqnj-=2L=Y2sp{ss(uBv6F}PpB;jQ9!`&o87(m&&44~ z2vwSuf4<$B`DVWPecyaDJ3EU*7bnlN2ka9TuDdPkweS7u;x~?4*7W-=E0i*#N+d(4&Wj5R>D|IYabAYYDsWt0bY+z%cjbwx%Jgi}@gq@i zxvylXmPAkpn@S0%$X6ny3F)h%yA;ZXXf}!s;fsdj2^9&qfZ7U*M-dONmn{w#RL4*A z+)xBjp)H~%T{Z}1OH_GiKdKJtfypuqyqy_1YK@eJho}c1`EVcmz&#h<&Ydy38wLym zh5^HXVZbn87%&VN1`GqY$UqbvvAzJAccyaL+wVKl=j``i>GkGHFz`QMz^PgmKJ{B~ z(Tg~~|7Y+2ZyvL(H-J9^-v{P_-@nhYt^!wp4d92sGH?>O6Zp+h%lb9&D)2Ml72wCf zkAQXHaXz>~lefCC%>uH9)_&jB7V z1RMeWaffC71$YB^9oPb{0zU9Ca2(iq5BdW<3p@i~-4V-r0eBkt z7BCM?0>^=SfTO@&!0XsN*#MpbihvE=0sIP^HrIe>fv*7)XaHlt2Z6uArexQ@_S|G) z-78uW%En=dGoBMRRDR$=tDD7io~S(}LKRK=DsnuJjj@{JDSn`s=cs7LaW4c_C*qaJ zX#^-bj(gjeZC&lIiWv)e)C_(6Jj&fD&%cys5g@fH2Jy|W%~v6(aF zLi`ePe@glB3-MK*xnbwl)>0Oz|9$)WHqcemU4(899cOt&*3X5q8RT;nJPE(f=uita z!Gi2ii*4rynY*Z~CYgDZ01w^XBMXe8^0kD$ObLbyz0^l+xE(fe7^lH)vhze3N|-|> zr+K=TBdt-HRuiH)pCdg8$a* z;`UzE;q!@mXKvf8kn3?L>^eBi&UUwwnSlIJ-**i}22WWBMbm8`J{9mV>Wp)xM;Q!6 zQiEio0lOUv-5Kh6)Cst(>0Djs0P7nYW4T(>cWE%?vJM|&W2$)|DMwzgTV*)R>RMvZ zVv&_)00#k^3~VGCU~rJ4f-5^2*L%EmritTbe%;2%(FP3gJSPtrc>z@jSruu}(-Cx* zI|{LY<>K!qLms32YP`MkmH0*6Z87}2qHj0jpTt|Z+fF0G&g1bl#Dr}`hINV>UyonJ z&361eLIeeit)2B8*&F?tnVp`SD9=rdlj;ZK?kF3gf_vlkXcD$5NEJ8VV{l>MY(%3c(X7j&{Qf zMno3v$zt}dJatK@xXm!c5yD+D>60|*5spw@8kBUwg`OpoI1Q03E=2J0wvOGCp2zEs zcP6Yi8)#u-#pMCHS3Wl-y8)8H$H+lPbN3ool6NNw7UJy%IM&7jTxt`pw+`pq*!eQN=Q^EhxTP!m zWh{5UJ$&k;cBwRE4-cQnp|*OvWYY;u9Kd|cmSH_-X%YO(4WB~k(uiFeI%SWXq{0|b zD;-_@F(*K*v5|mC)CznpnnkKi_Wl!SWyl_R;1*?EvQv5!*F+ZGS$DDx=W zx6VQsJ@5FU##NLbu+viHuK1%l;KJEQCd-!97C!t@8?3AkO3yZF^0TZo$~!G7s!V#- z>!F>NGiR~ns$=2kS7)$drQpq26HDHMO6)C}x9tH^0!yd>f(k3TgY7#ZXTFS>Ij;Po^Tl^c0ubOOw%;G=uXW!YMG7Ltl}>5Y7==ZLW*L; zte=&1Fz2AF!%naz*$g4cm=-D7n8}i%tFjgH3f2UArNU}hJYhwenOIw!B44r5Vdr!h zVB-`MP^L=ZUeBJwXXW$+x?Wpgg4FF1opjADagaJWqZn}lf~%N0*&*8Sm;d!+~nD6%ki2VTSa=8ZjHX` aWi`=m!=7&#l|(Y#(MdNHy459LHvSEqdXGZ@ literal 0 HcmV?d00001 diff --git a/extensions/chromium/minimalistic-pac-setter/extension/sync-pac-script-with-pac-provider.js b/extensions/chromium/minimalistic-pac-setter/extension/1-sync-pac-script-with-pac-provider.js similarity index 80% rename from extensions/chromium/minimalistic-pac-setter/extension/sync-pac-script-with-pac-provider.js rename to extensions/chromium/minimalistic-pac-setter/extension/1-sync-pac-script-with-pac-provider.js index 743a10c..8da3129 100755 --- a/extensions/chromium/minimalistic-pac-setter/extension/sync-pac-script-with-pac-provider.js +++ b/extensions/chromium/minimalistic-pac-setter/extension/1-sync-pac-script-with-pac-provider.js @@ -68,6 +68,7 @@ window.antiCensorRu = { _periodicUpdateAlarmReason: 'Периодичное обновление PAC-скрипта Антизапрет', pushToStorage(cb) { + console.log('Pushing...'); // Copy only settable properties. var onlySettable = {}; @@ -99,7 +100,7 @@ window.antiCensorRu = { syncWithPacProvider(cb) { var cb = asyncLogGroup('Syncing with PAC provider...', cb); if (!this.pacProvider) - return cb({clarification: 'Сперва выберите PAC-провайдера.'}); + return cb({clarification:{message:'Сперва выберите PAC-провайдера.'}}); var pacSetPromise = new Promise( (resolve, reject) => setPacScriptFromProvider( @@ -140,7 +141,7 @@ window.antiCensorRu = { var now = Date.now(); if (nextUpdateMoment < now) nextUpdateMoment = now; - + console.log( 'Next PAC update is scheduled on', new Date(nextUpdateMoment).toLocaleString('ru-RU') ); chrome.alarms.create( @@ -151,7 +152,7 @@ window.antiCensorRu = { } ); - return nextUpdateMoment === now; // ifAlarmTriggered. Return value may be changed. + return nextUpdateMoment === now; // ifAlarmTriggered. May be changed. }, installPac(key, cb) { @@ -191,6 +192,7 @@ chrome.storage.local.get(null, oldStorage => { // LAUNCH, RELOAD, UPDATE antiCensorRu._currentPacProviderKey = oldStorage._currentPacProviderKey; antiCensorRu.lastPacUpdateStamp = oldStorage.lastPacUpdateStamp || antiCensorRu.lastPacUpdateStamp; + console.log( 'Last PAC update was on', new Date(antiCensorRu.lastPacUpdateStamp).toLocaleString('ru-RU') ); } chrome.alarms.onAlarm.addListener( @@ -222,7 +224,7 @@ chrome.storage.local.get(null, oldStorage => { var ifAlarmTriggered = antiCensorRu.setAlarms(); if (antiCensorRu.version === oldStorage.version) { - // LAUNCH, RELOAD + // LAUNCH, RELOAD, ENABLE antiCensorRu.pacProviders = oldStorage.pacProviders; return console.log('Extension launched, reloaded or enabled.'); } @@ -232,7 +234,7 @@ chrome.storage.local.get(null, oldStorage => { if (!ifAlarmTriggered) updatePacProxyIps( antiCensorRu.pacProvider, - ipsError => ipsError ? console.log('Error updating IPs:', ipsError) : antiCensorRu.pushToStorage() + ipsError => ipsError ? console.error('Error updating IPs:', ipsError) : antiCensorRu.pushToStorage() ); /* @@ -253,8 +255,6 @@ chrome.storage.local.get(null, oldStorage => { **/ }); -// PRIVATE - function asyncLogGroup() { var args = [].slice.apply(arguments); var cb = args.pop(); @@ -267,25 +267,44 @@ function asyncLogGroup() { } } -function ifSuccessfulCode(status) { - return status >= 200 && status < 300 || status === 304; +function httpGet(url, cb) { + return fetch(url).then( + res => { + var textCb = err => cb && res.text().then( text => cb(err, text), cb ); + var status = res.status; + if ( !( status >= 200 && status < 300 || status === 304 ) ) { + res.clarification = {message: 'Получен ответ с неудачным HTTP-кодом '+status+'.'}; + return textCb(res); + } + console.log('GETed with success.'); + return textCb(); + }, + err => { + err.clarification = {message: 'Что-то не так с сетью, проверьте соединение.'}; + return cb && cb(err); + } + ); } -function httpGet(url, cb) { - var cb = cb || (() => {}); - var req = new XMLHttpRequest(); - var ifAsync = true; - req.open('GET', url, ifAsync); - req.onload = event => { - if ( !ifSuccessfulCode(req.status) ) { - req.clarification = {message: 'Получен ответ с неудачным HTTP-кодом '+req.status+ '.'}; - return cb(req); +function getIpsAndCnames(host, cb) { + httpGet( + 'http://www.dns-lg.com/google1/'+ host +'/a', + (err, res) => { + if (res) + try { + res = JSON.parse(res); + if (err) + err.clarification.message += ' Сервер: '+ res.message; + else + res = res.answer; + } catch(e) { + err = err || {clarification:{message:''}}; + err.clarification.message += ' Сервер: '+ res; + err.clarification.message.trim(); + } + return cb( err, res ); } - console.log('GETed with success.'); - return cb(null, req.responseText) - }; - req.onerror = event => { event.clarification = {message: 'Что-то не так с сетью, проверьте соединение.'}; return cb(event); }; - req.send(); + ); } function updatePacProxyIps(provider, cb) { @@ -296,14 +315,12 @@ function updatePacProxyIps(provider, cb) { }; var i = 0; provider.proxyHosts.map( - proxyHost => httpGet( - 'http://www.dns-lg.com/google1/'+ proxyHost +'/A', - (err, res) => { + proxyHost => getIpsAndCnames( + proxyHost, + (err, ans) => { if (!err) { provider.proxyIps = provider.proxyIps || {}; - JSON.parse(res).answer.map( - ans => provider.proxyIps[ ans.rdata ] = proxyHost - ) + ans.filter( ans => ans.type === 'A' ).map( ans => provider.proxyIps[ ans.rdata ] = proxyHost ); } else failure.errors[proxyHost] = err; @@ -324,7 +341,7 @@ function setPacScriptFromProvider(provider, cb) { (err, res) => { if (err) { err.clarification = { - message: 'Не удалось скачать PAC-скрипт с адреса: ' +provider.pacUrl+ '.', + message: 'Не удалось скачать PAC-скрипт с адреса: '+ provider.pacUrl +'.', prev: err.clarification }; return cb(err); diff --git a/extensions/chromium/minimalistic-pac-setter/extension/2-block-informer.js b/extensions/chromium/minimalistic-pac-setter/extension/2-block-informer.js new file mode 100755 index 0000000..bc4f96c --- /dev/null +++ b/extensions/chromium/minimalistic-pac-setter/extension/2-block-informer.js @@ -0,0 +1,147 @@ +'use strict'; + +// Shows user browserAction icon if any part of the current site is being blocked and proxied. + +/* + In what moment the title of the previous icon is cleared? + By my observations it usually takes place near tabs.onUpdate of tab status to "loading". + So if you set a title earlier it may be cleared by browser. + It pertains not only to page refesh but to newly opened pages too. + Also on loosing title see: + https://github.com/ilyaigpetrov/repository-for-chrome-bugs/blob/master/browserAction-title-lost-after-setting/background.js + Crazy parallel Chrome. +**/ + +window.tabWithError2ip = {}; // For errors only: Error? -> Check this IP! + +function getHostname(url) { + var a = document.createElement('a'); + a.href = url; + return a.hostname; +} + ++function() { + + var _tabCallbacks = {}; + + function afterTabUpdated(tabId, cb) { + if (_tabCallbacks[tabId]) + _tabCallbacks[tabId].push(cb); + else _tabCallbacks[tabId] = [cb]; + } + + function onTabUpdate(tabId) { + if (_tabCallbacks[tabId]) { + _tabCallbacks[tabId].map( f => f() ); + delete _tabCallbacks[tabId]; + } + } + + chrome.tabs.onUpdated.addListener( onTabUpdate ); + + function isInsideTabWithIp(requestDetails) { + return requestDetails.tabId !== -1 && requestDetails.ip + } + + chrome.webRequest.onErrorOccurred.addListener( + requestDetails => + isInsideTabWithIp(requestDetails) && + ( + isProxiedAndInformed(requestDetails) || requestDetails.type === 'main_frame' && ( window.tabWithError2ip[requestDetails.tabId] = requestDetails.ip ) + ), + { urls: [''] } + ); + + chrome.tabs.onRemoved.addListener( tabId => { onTabUpdate(tabId); delete window.tabWithError2ip[tabId] } ); + + var previousUpdateTitleFinished = Promise.resolve(); + + function isProxiedAndInformed(requestDetails) { + + if ( + !( window.antiCensorRu.pacProvider && window.antiCensorRu.pacProvider.proxyIps && window.antiCensorRu.pacProvider.proxyIps[ requestDetails.ip ] ) + ) return false; + + var ifMainFrame = requestDetails.type === 'main_frame'; + + previousUpdateTitleFinished = previousUpdateTitleFinished.then( + () => new Promise( + resolve => { + var cb = () => updateTitle( requestDetails, resolve ); + return ifMainFrame ? afterTabUpdated(requestDetails.tabId, cb) : cb(); + } + ) + ); + + return true; + + function updateTitle(requestDetails, cb) { + + chrome.browserAction.getTitle( + { tabId: requestDetails.tabId }, + title => { + var ifTitleSetAlready = /\n/.test(title); + var proxyHost = window.antiCensorRu.pacProvider.proxyIps[ requestDetails.ip ]; + + var hostname = getHostname( requestDetails.url ); + + var ifShouldUpdateTitle = false; + var indent = ' '; + var proxyTitle = 'Прокси:'; + + if (!ifTitleSetAlready) { + title = 'Разблокированы:\n'+ indent + hostname +'\n'+ proxyTitle +'\n'+ indent + proxyHost; + ifShouldUpdateTitle = true; + + chrome.browserAction.setBadgeText({ + tabId: requestDetails.tabId, + text: ifMainFrame ? '1' : '%1' + }); + + } else { + var hostsProxiesPair = title.split(proxyTitle); + + if (hostsProxiesPair[1].indexOf(proxyHost) === -1) { + title = title.replace(hostsProxiesPair[1], hostsProxiesPair[1] +'\n'+ indent + proxyHost); + ifShouldUpdateTitle = true; + } + + if (hostsProxiesPair[0].indexOf(hostname) === -1) { + title = title.replace(proxyTitle, indent + hostname +'\n'+ proxyTitle); + ifShouldUpdateTitle = true; + + var _cb = cb; + cb = () => chrome.browserAction.getBadgeText( + {tabId: requestDetails.tabId}, + result => { + chrome.browserAction.setBadgeText( + { + tabId: requestDetails.tabId, + text: ( isNaN( result.charAt(0) ) && result.charAt(0) || '' ) + (hostsProxiesPair[0].split('\n').length - 1) + } + ); + return _cb(); + } + ); + + } + } + + if (ifShouldUpdateTitle) + chrome.browserAction.setTitle({ + title: title, + tabId: requestDetails.tabId + }); + + return cb(); + } + ); + } + } + + chrome.webRequest.onResponseStarted.addListener( + requestDetails => isInsideTabWithIp(requestDetails) && isProxiedAndInformed(requestDetails), + { urls: [''] } + ); + +}(); \ No newline at end of file diff --git a/extensions/chromium/minimalistic-pac-setter/extension/3-context-menus.js b/extensions/chromium/minimalistic-pac-setter/extension/3-context-menus.js new file mode 100755 index 0000000..77368f2 --- /dev/null +++ b/extensions/chromium/minimalistic-pac-setter/extension/3-context-menus.js @@ -0,0 +1,37 @@ +'use strict'; + ++function() { + + var 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}) ) + }); + + createMenuLinkEntry( 'Сайт доступен из-за границы? ISUP.ME', tab => 'http://isup.me/'+ getHostname(tab.url) ); + + createMenuLinkEntry( 'Сайт доступен из-за границы?', tab => + `data:text/html;charset=utf8,Запрашиваю... +
+ +
+ ` + ); + + window.reestrUrl = 'http://reestr.rublacklist.net/search/?q='; + + createMenuLinkEntry('IP этого сайта в реестре блокировок?', tab => { + var hostname = getHostname( tab.url ); + var ip = window.tabWithError2ip[tab.id]; + if ( /^[.\d]+$/.test(hostname) || /^[:\dA-Fa-f]+$/.test(hostname) ) + ip = hostname; + return ip + ? reestrUrl + ip + : chrome.extension.getURL('./pages/is-ip-blocked/index.html') +'?'+ hostname + }); + + createMenuLinkEntry( 'Домен этого сайта в реестре блокировок?', tab => reestrUrl + getHostname(tab.url) ); + createMenuLinkEntry( 'Поиск этой страницы в архиве archive.org', tab => 'http://web.archive.org/web/*/'+ tab.url ); + createMenuLinkEntry( 'Разблокировать страницу по-другому', tab => chrome.extension.getURL('./pages/other-unblocks/index.html') +'?'+ tab.url ); + +}(); \ No newline at end of file diff --git a/extensions/chromium/minimalistic-pac-setter/extension/block-informer.js b/extensions/chromium/minimalistic-pac-setter/extension/block-informer.js deleted file mode 100755 index 2827809..0000000 --- a/extensions/chromium/minimalistic-pac-setter/extension/block-informer.js +++ /dev/null @@ -1,124 +0,0 @@ -'use strict'; - -// Shows user browserAction icon if any part of the current site is being blocked and proxied. - -/* - In what moment the title of the previous icon is cleared? - By my observations it usually takes place near tabs.onUpdate of tab status to "loading". - So if you set a title earlier it may be cleared by browser. - It pertains not only to page refesh but to newly opened pages too. - Also on loosing title see: - https://github.com/ilyaigpetrov/repository-for-chrome-bugs/blob/master/browserAction-title-lost-after-setting/background.js - Crazy parallel Chrome. -**/ -window._tabCallbacks = {}; - -function afterTabUpdated(tabId, cb) { - if (window._tabCallbacks[tabId]) - window._tabCallbacks[tabId].push(cb); - else window._tabCallbacks[tabId] = [cb]; -} - -function onTabUpdate(tabId) { - if (window._tabCallbacks[tabId]) { - window._tabCallbacks[tabId].map( f => f() ); - delete window._tabCallbacks[tabId]; - } -} - -chrome.tabs.onUpdated.addListener( onTabUpdate ); -chrome.tabs.onRemoved.addListener( onTabUpdate ); - -var previousUpdateTitleFinished = Promise.resolve(); - -function blockInform(requestDetails) { - - if ( - requestDetails.tabId === -1 || // Not inside tab. - !window.antiCensorRu.pacProvider || !window.antiCensorRu.pacProvider.proxyIps || !window.antiCensorRu.pacProvider.proxyIps[ requestDetails.ip ] - ) return; - - previousUpdateTitleFinished = previousUpdateTitleFinished.then( - () => new Promise( - resolve => { - var cb = () => updateTitle( requestDetails, resolve ); - return requestDetails.type === 'main_frame' ? afterTabUpdated(requestDetails.tabId, cb) : cb(); - } - ) - ); - - function updateTitle(requestDetails, cb) { - - chrome.browserAction.getTitle( - { tabId: requestDetails.tabId }, - title => { - var ifTitleSetAlready = /\n/.test(title); - var proxyHost = window.antiCensorRu.pacProvider.proxyIps[ requestDetails.ip ]; - - var a = document.createElement('a'); - a.href = requestDetails.url; - var hostname = a.hostname; - - var ifShouldUpdateTitle = false; - var indent = ' '; - var proxyTitle = 'Прокси:'; - - if (!ifTitleSetAlready) { - title = 'Разблокированы:\n'+ indent + hostname +'\n'+ proxyTitle +'\n'+ indent + proxyHost; - ifShouldUpdateTitle = true; - - chrome.browserAction.setBadgeText({ - tabId: requestDetails.tabId, - text: requestDetails.type === 'main_frame' ? '1' : '%1' - }); - - } else { - var hostsProxiesPair = title.split(proxyTitle); - - if (hostsProxiesPair[1].indexOf(proxyHost) === -1) { - title = title.replace(hostsProxiesPair[1], hostsProxiesPair[1] +'\n'+ indent + proxyHost); - ifShouldUpdateTitle = true; - } - - if (hostsProxiesPair[0].indexOf(hostname) === -1) { - title = title.replace(proxyTitle, indent + hostname +'\n'+ proxyTitle); - ifShouldUpdateTitle = true; - - var _cb = cb; - cb = () => chrome.browserAction.getBadgeText( - {tabId: requestDetails.tabId}, - result => { - chrome.browserAction.setBadgeText( - { - tabId: requestDetails.tabId, - text: ( isNaN( result.charAt(0) ) && result.charAt(0) || '' ) + (hostsProxiesPair[0].split('\n').length - 1) - } - ); - return _cb(); - } - ); - - } - } - - if (ifShouldUpdateTitle) - chrome.browserAction.setTitle({ - title: title, - tabId: requestDetails.tabId - }); - - return cb(); - } - ); - } -} - -chrome.webRequest.onResponseStarted.addListener( - blockInform, - { urls: [''] } -); - -chrome.webRequest.onErrorOccurred.addListener( - blockInform, - { urls: [''] } -); \ No newline at end of file diff --git a/extensions/chromium/minimalistic-pac-setter/extension/manifest.json b/extensions/chromium/minimalistic-pac-setter/extension/manifest.json index 63d56c6..7a963d0 100755 --- a/extensions/chromium/minimalistic-pac-setter/extension/manifest.json +++ b/extensions/chromium/minimalistic-pac-setter/extension/manifest.json @@ -1,9 +1,9 @@ { "manifest_version": 2, - "name": "Обход блокировок Рунета", + "name": "Обход блокировок Рунета NEW", "description": "Аргументы против цензуры: https://git.io/vEkI9", - "version": "0.0.0.12", + "version": "0.0.0.14", "icons": { "128": "/icons/ribbon128.png" }, @@ -16,12 +16,14 @@ "alarms", "storage", "", - "tabs" + "tabs", + "contextMenus" ], "background": { - "scripts": ["sync-pac-script-with-pac-provider.js", "block-informer.js"] + "scripts": ["1-sync-pac-script-with-pac-provider.js", "2-block-informer.js", "3-context-menus.js"] }, "browser_action": { + "default_title": "Этот сайт благословлён РКН", "default_popup": "/pages/choose-pac-provider/index.html" }, "options_ui": { diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/choose-pac-provider/index.js b/extensions/chromium/minimalistic-pac-setter/extension/pages/choose-pac-provider/index.js index da0d498..d8ca1c7 100755 --- a/extensions/chromium/minimalistic-pac-setter/extension/pages/choose-pac-provider/index.js +++ b/extensions/chromium/minimalistic-pac-setter/extension/pages/choose-pac-provider/index.js @@ -1,9 +1,6 @@ 'use strict'; -renderPage(); - -function renderPage() { - console.log('Rendering started.'); +chrome.runtime.getBackgroundPage( backgroundPage => { function getStatus() { return document.querySelector('#status'); @@ -16,134 +13,127 @@ function renderPage() { status.innerHTML = msg; } else status.classList.add('off'); + } + + var antiCensorRu = backgroundPage.antiCensorRu; + + // SET DATE + + function setDate() { + var dateForUser = 'никогда'; + if( antiCensorRu.lastPacUpdateStamp ) { + var diff = Date.now() - antiCensorRu.lastPacUpdateStamp; + var units = ' мс'; + var gauges = [ + [1000, ' с'], + [60, ' мин'], + [60, ' ч'], + [24, ' дн'], + [7, ' недель'], + [4, ' месяцев'], + [12, ' г'] + ]; + for(var g of gauges) { + var diffy = Math.floor(diff / g[0]); + if (!diffy) + break; + diff = diffy; + var units = g[1]; + } + dateForUser = diff + units + ' назад'; + } + + var dateElement = document.querySelector('.update-date'); + dateElement.innerText = dateForUser; + dateElement.title = new Date(antiCensorRu.lastPacUpdateStamp).toLocaleString('ru-RU'); } - chrome.runtime.getBackgroundPage( backgroundPage => { + setDate(); + chrome.storage.onChanged.addListener( changes => changes.lastPacUpdateStamp.newValue && setDate() ); - var antiCensorRu = backgroundPage.antiCensorRu; + // CLOSE BUTTON - // SET DATE + document.querySelector('.close-button').onclick = () => window.close(); - function setDate() { - var dateForUser = 'никогда'; - if( antiCensorRu.lastPacUpdateStamp ) { - var diff = Date.now() - antiCensorRu.lastPacUpdateStamp; - var units = ' мс'; - var gauges = [ - [1000, ' с'], - [60, ' мин'], - [60, ' ч'], - [24, ' дн'], - [7, ' недель'], - [4, ' месяцев'], - [12, ' г'] - ]; - for(var g of gauges) { - var diffy = Math.floor(diff / g[0]); - if (!diffy) - break; - diff = diffy; - var units = g[1]; - } - dateForUser = diff + units + ' назад'; + // RADIOS + + var currentRadio = () => { + var id = antiCensorRu.currentPacProviderKey || 'none'; + return document.querySelector('#'+id); + } + var checkChosenProvider = () => { + var radio = currentRadio(); + radio.checked = true; + } + var triggerChosenProvider = () => { + var event = document.createEvent('HTMLEvents'); + event.initEvent('change', false, true); + currentRadio().dispatchEvent(event); + } + + var ul = document.querySelector('#list-of-providers'); + var _firstChild = ul.firstChild; + for( var providerKey of Object.keys(antiCensorRu.pacProviders) ) { + var li = document.createElement('li'); + li.innerHTML = ' [обновить]'; + li.querySelector('.link-button').onclick = () => {triggerChosenProvider(); return false;}; + ul.insertBefore( li, _firstChild ); + } + + var radios = [].slice.apply( document.querySelectorAll('[name=pacProvider]') ); + for(var radio of radios) { + radio.onchange = function(event) { + var pacKey = event.target.id; + if (pacKey === 'none') + return antiCensorRu.clearPac(); + + function enableDisableInputs() { + var inputs = document.querySelectorAll('input'); + for (var i = 0; i < inputs.length; i++) + inputs[i].disabled = !inputs[i].disabled; } - var dateElement = document.querySelector('.update-date'); - dateElement.innerText = dateForUser; - dateElement.title = new Date(antiCensorRu.lastPacUpdateStamp).toLocaleString('ru-RU'); - } + enableDisableInputs(); + setStatusTo('Установка...'); + antiCensorRu.installPac(pacKey, err => { + if (err) { + var ifNotCritical = err.clarification && err.clarification.ifNotCritical; - setDate(); - chrome.storage.onChanged.addListener( setDate ); - - // CLOSE BUTTON - - document.querySelector('.close-button').onclick = () => window.close(); - - // RADIOS - - var currentRadio = () => { - var id = antiCensorRu.currentPacProviderKey || 'none'; - return document.querySelector('#'+id); - } - var checkChosenProvider = () => { - var radio = currentRadio(); - radio.checked = true; - } - var triggerChosenProvider = () => { - var event = document.createEvent('HTMLEvents'); - event.initEvent('change', false, true); - currentRadio().dispatchEvent(event); - } - - var ul = document.querySelector('#list-of-providers'); - var _firstChild = ul.firstChild; - for( var providerKey of Object.keys(antiCensorRu.pacProviders) ) { - var li = document.createElement('li'); - li.innerHTML = ' [обновить]'; - li.querySelector('.link-button').onclick = () => {triggerChosenProvider(); return false;}; - ul.insertBefore( li, _firstChild ); - } - - var radios = [].slice.apply( document.querySelectorAll('[name=pacProvider]') ); - for(var radio of radios) { - radio.onchange = function(event) { - var pacKey = event.target.id; - if (pacKey === 'none') - return antiCensorRu.clearPac(); - - function enableDisableInputs() { - var inputs = document.querySelectorAll('input'); - console.log(inputs.length); - for (var i = 0; i < inputs.length; i++) - inputs[i].disabled = !inputs[i].disabled; - } - - enableDisableInputs(); - setStatusTo('Установка...'); - antiCensorRu.installPac(pacKey, err => { - if (err) { - var ifNotCritical = err.clarification && err.clarification.ifNotCritical; - - var message = ''; - var clarification = err.clarification; - do { - message = message +' '+ (clarification && clarification.message || err.message || ''); - clarification = clarification.prev; - } while( clarification && clarification.prev ); - message = message.trim(); - - message = ''+ message +''; - var label = ifNotCritical ? 'Некритичная ошибка.' : 'Ошибка!'; - label = ''+ label +''; - setStatusTo( - label +'
'+ message +' [Ещё подробнее]' - ); - var btn = getStatus().querySelector('.link-button'); - btn.onclick = function() { - var div = document.createElement('div'); - div.innerHTML = '\ + var message = ''; + var clarification = err.clarification; + do { + message = message +' '+ (clarification && clarification.message || err.message || ''); + clarification = clarification.prev; + } while( clarification ); + message = message.trim(); + setStatusTo( +`${ifNotCritical ? 'Некритичная ошибка.' : 'Ошибка!'} +
+${message} +[Ещё подробнее]` + ); + getStatus().querySelector('.link-button').onclick = function() { + var div = document.createElement('div'); + div.innerHTML = '\ Более подробную информацию можно узнать из логов фоновой страницы:
\ chrome://extensions › Это расширение › Отладка страниц: фоновая страница › Console (DevTools)'; - getStatus().replaceChild(div, this); - div.querySelector('.ext').onclick = () => { - chrome.tabs.create({ url: 'chrome://extensions?id='+ chrome.runtime.id }); - return false; - } + getStatus().replaceChild(div, this); + div.querySelector('.ext').onclick = () => { + chrome.tabs.create({ url: 'chrome://extensions?id='+ chrome.runtime.id }); return false; - }; - } else - setStatusTo('PAC-скрипт установлен.'); - enableDisableInputs(); - }); - } + } + return false; + }; + } else + setStatusTo('PAC-скрипт установлен.'); + enableDisableInputs(); + }); } + } - setStatusTo(''); - checkChosenProvider(); - if (antiCensorRu.ifFirstInstall) - triggerChosenProvider(); + setStatusTo(''); + checkChosenProvider(); + if (antiCensorRu.ifFirstInstall) + triggerChosenProvider(); - }); - -} +}); \ No newline at end of file diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.html b/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.html new file mode 100755 index 0000000..bd80a42 --- /dev/null +++ b/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.html @@ -0,0 +1,7 @@ + + + + Ищу IP... + + + diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.js b/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.js new file mode 100755 index 0000000..e74ffad --- /dev/null +++ b/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.js @@ -0,0 +1,26 @@ +'use strict'; +chrome.runtime.getBackgroundPage( backgroundPage => { + + var hostname = window.location.search.substring(1); + + backgroundPage.getIpsAndCnames( hostname, (err, records) => + err + ? document.write( + `IP уже нет + Не могу получить IP для домена "${hostname}". Домена уже нет?
+ Ошибка:
+ ${err.clarification && err.clarification.message || err.message}` + ) + : records.length === 1 && records[0].type === 'A' + ? window.location.replace( backgroundPage.reestrUrl + records[0].rdata ) + : document.write( + 'Выбор IP' + + '

У домена несколько IP / синонимов:

' + + records + .sort( (a,b) => a.rdata.localeCompare(b.rdata) ) + .map( ans => ans.rdata.link( ans.type === 'A' ? backgroundPage.reestrUrl + ans.rdata : window.location.pathname +'?'+ ans.rdata ) ) + .join('
') + ) + ) + +}) \ No newline at end of file diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.html b/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.html new file mode 100755 index 0000000..e7a964b --- /dev/null +++ b/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.html @@ -0,0 +1,10 @@ + + + + По-другому + + + + + + diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.js b/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.js new file mode 100755 index 0000000..3654bca --- /dev/null +++ b/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.js @@ -0,0 +1,25 @@ +'use strict'; + +var url = decodeURIComponent(window.location.search.substring(1)); +document.body.innerHTML = ` + + +

Веб-прокси

+ vpnbook [COPY]
+ webproxy.com
+ buka.link [AVAST]
+ hide.me [COPY]
+ Hide my ass [COPY]
+ Другие +

Из кеша поисковиков

+ Google
+ viewcached.com
+ cachedview.com [COPY] +

Из архивов Интернета

+ web.archive.org
+ archive.is
+ Momento Time Travel [COPY] +`; +var _ = document.querySelector('input'); +_.onfocus = function() { this.select() }; +document.querySelector('button').onclick = () => {_.focus(); document.execCommand('copy')}; \ No newline at end of file diff --git a/pac-generator/dump.csv b/pac-generator/dump.csv old mode 100644 new mode 100755 diff --git a/pac-performance-analyses/benchmark/Inputs/blocked-hosts.txt b/pac-performance-analyses/benchmark/Inputs/blocked-hosts.txt old mode 100644 new mode 100755 diff --git a/pac-performance-analyses/benchmark/Program.cs b/pac-performance-analyses/benchmark/Program.cs old mode 100644 new mode 100755 diff --git a/pac-performance-analyses/benchmark/project.json b/pac-performance-analyses/benchmark/project.json old mode 100644 new mode 100755 diff --git a/pac-performance-analyses/chart/README.md b/pac-performance-analyses/chart/README.md old mode 100644 new mode 100755 diff --git a/pac-performance-analyses/chart/src/data.tsv b/pac-performance-analyses/chart/src/data.tsv old mode 100644 new mode 100755 diff --git a/pac-performance-analyses/chart/src/index.html b/pac-performance-analyses/chart/src/index.html old mode 100644 new mode 100755