From 08e1b41780c91924aedfdf276d568398999b70bc Mon Sep 17 00:00:00 2001 From: ilyaigpetrov Date: Wed, 26 Apr 2023 05:16:43 +0500 Subject: [PATCH] Add another source for AntiZapret. Add AZ proxy for twitter to block-informer. Replace some rebrand.ly links (blocked on TSPU) --- ...37-sync-pac-script-with-pac-provider-api.tmpl.js | 13 +++++++++---- .../extension-common/pages/troubleshoot/index.html | 12 ++++++------ .../src/extension-full/20-ip-to-host-api.js | 1 + 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js index 1e6adf2..0e98d46 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js @@ -138,7 +138,6 @@ if (err) { if (err.message === 'proxy.settings requires private browsing permission.') { - // window.utils.openAndFocus('https://rebrand.ly/ac-allow-private-windows'); clarifyThen( chrome.i18n.getMessage('AllowExtensionToRunInPrivateWindows'), cb, @@ -277,6 +276,8 @@ order: 0, pacUrls: [ 'https://antizapret.prostovpn.org:8443/proxy.pac', + 'https://antizapret.prostovpn.org:18443/proxy.pac', + 'https://antizapret.prostovpn.org/proxy.pac', 'https://rebrand.ly/ac-antizapret-pac', ], }, @@ -678,9 +679,13 @@ console.log('Updating from', oldAntiCensorRu.version, 'to', antiCensorRu.version); try { - if (window.apis.version.isLeq(oldAntiCensorRu.version, '0.0.1.56')) { - window.apis.antiCensorRu.pacProviders['Антизапрет'].pacUrls[0] = 'https://antizapret.prostovpn.org:8443/proxy.pac'; - console.log('Successfully updated to 0.0.1.57.'); + if (window.apis.version.isLeq(oldAntiCensorRu.version, '0.0.1.57')) { + const azWithPort = 'https://antizapret.prostovpn.org:8443/proxy.pac'; + const azWithPortAlt = 'https://antizapret.prostovpn.org:18443/proxy.pac'; + const urls = window.apis.antiCensorRu.pacProviders['Антизапрет'].pacUrls; + urls[0] = 'https://antizapret.prostovpn.org/proxy.pac'; + urls.unshift(azWithPort, azWithPortAlt); + console.log('Successfully updated to 0.0.1.58.'); } } catch (e) { // Log update error. diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/troubleshoot/index.html b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/troubleshoot/index.html index 23eada7..1c8be1d 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/troubleshoot/index.html +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/troubleshoot/index.html @@ -10,12 +10,12 @@
  1. Детали последних ошибок
  2. Сбросить настройки
    3. -
  3. Файл самопомощи
    4. -
  4. Напишите нам!
    5. +
  5. Файл самопомощи
    6. +
  6. Напишите нам!

Для продвинутых

    -
  1. Как прочитать логи?
    2. +
  2. Как прочитать логи?
  3. Отладка PAC-скрипта
@@ -23,12 +23,12 @@
  1. Details of last errors
  2. Reset settings
    3. -
  3. Troubleshoot guide (ru)
    4. -
  4. Write to us!
    5. +
  5. Troubleshoot guide (ru)
    6. +
  6. Write to us!

Advanced

    -
  1. How to read logs?
    2. +
  2. How to read logs?
  3. PAC-script debugging
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js index 5907709..a13c52f 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js @@ -75,6 +75,7 @@ 'proxy.antizapret.prostovpn.org', 'proxy-ssl.antizapret.prostovpn.org', 'proxy-nossl.antizapret.prostovpn.org', + 'proxy-fbtw-ssl.antizapret.prostovpn.org', ].reduce((acc, hostname) => Object.assign(acc, { [hostname]: { host: hostname }}), { // Defaults: localhost: { host: 'localhost' },