From f6538f0acbc299014c5128a29c5def62aee153a5 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Tue, 10 Jul 2018 15:47:27 -0700 Subject: [PATCH] Ignore AdBlock entries that contain `$csp=script-src`. https://redmine.stoutner.com/issues/306 --- .idea/dictionaries/soren.xml | 1 + app/src/main/assets/de/about_changelog_dark.html | 2 +- app/src/main/assets/de/about_changelog_light.html | 2 +- app/src/main/assets/en/about_changelog_dark.html | 2 +- app/src/main/assets/en/about_changelog_light.html | 2 +- app/src/main/assets/es/about_changelog_dark.html | 2 +- app/src/main/assets/es/about_changelog_light.html | 2 +- app/src/main/assets/it/about_changelog_dark.html | 2 +- app/src/main/assets/it/about_changelog_light.html | 2 +- app/src/main/assets/ru/about_changelog_dark.html | 2 +- app/src/main/assets/ru/about_changelog_light.html | 2 +- .../stoutner/privacybrowser/helpers/BlockListHelper.java | 9 +++++++-- 12 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml index 50e8c8b0..91869fde 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -7,6 +7,7 @@ adview amiunique amoled + androidcentral androidversion anonymized apng diff --git a/app/src/main/assets/de/about_changelog_dark.html b/app/src/main/assets/de/about_changelog_dark.html index 3b8d9285..b346807b 100644 --- a/app/src/main/assets/de/about_changelog_dark.html +++ b/app/src/main/assets/de/about_changelog_dark.html @@ -29,7 +29,7 @@

2.11 (version code 34)

10. Juli 2018 - Mindest-API 19, Ziel-API 27

Add a Requests activity that shows how many resource requests have been blocked.
Fix a problem with proxying through Orbot on recent versions of WebView.

2.11 (version code 34)

10. Juli 2018 - Mindest-API 19, Ziel-API 27

Add a Requests activity that shows how many resource requests have been blocked.
Fix a problem with proxying through Orbot on recent versions of WebView.

2.11 (version code 34)

10 July 2018 - minimum API 19, target API 27

Add a Requests activity that shows how many resource requests have been blocked.
Fix a problem with proxying through Orbot on recent versions of WebView.

2.11 (version code 34)

10 July 2018 - minimum API 19, target API 27

Add a Requests activity that shows how many resource requests have been blocked.
Fix a problem with proxying through Orbot on recent versions of WebView.

2.11 (cÃ³digo de versiÃ³n 34)

10 de julio de 2018 - API mÃnimo 19, API dirigido 27

AÃ±adir una Actividad de peticiones que muestre cuantas peticiones de recursos se han bloqueado.
Solucionar un problema con el proxy a travÃ©s de Orbot en versiones recientes de WebView.

2.11 (cÃ³digo de versiÃ³n 34)

10 de julio de 2018 - API mÃnimo 19, API dirigido 27

AÃ±adir una Actividad de peticiones que muestre cuantas peticiones de recursos se han bloqueado.
Solucionar un problema con el proxy a travÃ©s de Orbot en versiones recientes de WebView.

2.11 (versione codice 34)

10 Luglio 2018 - minima API 19, target API 27

Aggiunta di una scheda delle richieste che mostra quante richieste di risorse sono state bloccate.
Correzione di un problema con il proxy attraverso Orbot per le versioni piÃ¹ recenti di WebView.

2.11 (versione codice 34)

10 Luglio 2018 - minima API 19, target API 27

Aggiunta di una scheda delle richieste che mostra quante richieste di risorse sono state bloccate.
Correzione di un problema con il proxy attraverso Orbot per le versioni piÃ¹ recenti di WebView.

2.11 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 34)

10 Ð¸ÑÐ»Ñ 2018 Ð³Ð¾Ð´Ð° - minimum API 19, target API 27

ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ Ð·Ð°Ð¿ÑÐ¾ÑÑ Ð°ÐºÑÐ¸Ð²Ð½Ð¾ÑÑÐ¸ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð¾Ðº.
ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð° Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ñ Ð¿ÑÐ¾ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸ÐµÐ¼ ÑÐµÑÐµÐ· Orbot Ð² Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð²ÐµÑÑÐ¸ÑÑ WebView.

2.11 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 34)

10 Ð¸ÑÐ»Ñ 2018 Ð³Ð¾Ð´Ð° - minimum API 19, target API 27

ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ Ð·Ð°Ð¿ÑÐ¾ÑÑ Ð°ÐºÑÐ¸Ð²Ð½Ð¾ÑÑÐ¸ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð¾Ðº.
ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð° Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ñ Ð¿ÑÐ¾ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸ÐµÐ¼ ÑÐµÑÐµÐ· Orbot Ð² Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð²ÐµÑÑÐ¸ÑÑ WebView.

headers = new ArrayList<>(); // 0. - // Initialize the white lists. + // Initialize the whitelists. List mainWhiteList = new ArrayList<>(); // 1. List finalWhiteList = new ArrayList<>(); // 2. List domainWhiteList = new ArrayList<>(); // 3. @@ -46,7 +46,7 @@ public class BlockListHelper { List thirdPartyDomainWhiteList = new ArrayList<>(); // 7. List thirdPartyDomainInitialWhiteList = new ArrayList<>(); // 8. - // Initialize the black lists + // Initialize the blacklists List mainBlackList = new ArrayList<>(); // 9. List initialBlackList = new ArrayList<>(); // 10. List finalBlackList = new ArrayList<>(); // 11. @@ -85,6 +85,11 @@ public class BlockListHelper { // Do nothing. Privacy Browser does not currently use these entries. //Log.i("BlockLists", "Not added: " + blockListEntry); + } else //noinspection StatementWithEmptyBody + if (blockListEntry.contains("$csp=script-src")) { // Ignore entries that contain `$csp=script-src`. + // Do nothing. It is uncertain what this directive is even supposed to mean, and it is blocking entire websites like androidcentral.com. https://redmine.stoutner.com/issues/306. + + //Log.i("BlockLists", headers.get(1)[0] + " not added: " + originalBlockListEntry); } else if (blockListEntry.startsWith("!")) { // Comment entries. if (blockListEntry.startsWith("! Version:")) { // Get the list version number. -- 2.45.2

2.11 (version code 34)

2.11 (version code 34)

2.11 (version code 34)

2.11 (version code 34)

2.11 (cÃ³digo de versiÃ³n 34)

2.11 (cÃ³digo de versiÃ³n 34)

2.11 (versione codice 34)

2.11 (versione codice 34)

2.11 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 34)

2.11 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 34)

2.11 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 34)

2.11 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 34)