Added new release to changelog

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 63.0.3239.27
+
+# 63.0.3239.24
+* convert AMP search results to regular search results
+
 # 63.0.3239.15
 * remove URL tracking from Google search results
 * disable webRTC by default (https://github.com/bromite/bromite/issues/9, still not working proper)

README.md

@@ -1,6 +1,8 @@
 # Bromite - Take back your browser
 
-<img src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />
+[![GitHub release][version-image]][version-url] [![license][license-image]][license-url]
+
+<img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />
 
 Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad blocking and enhanced privacy.
 
@@ -23,7 +25,7 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
 # Features
 
 * adblocking (currently baked-in, no configuration options available)
-* remove click-tracking from Google search results
+* remove click-tracking and AMP from Google search results
 * [StartPage](https://startpage.com/) search engine (select it from search engines under settings)
 * [DuckDuckGo](https://duckduckgo.com/) search engine (select it from search engines under settings)
 * privacy enhancement patches from Inox patchset, ungoogled-chromium and Iridium projects
@@ -54,3 +56,8 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 # License
 
 The patches published as part of the Bromite project are released under [GNU GPL v3](./LICENSE).
+
+[version-image]: https://img.shields.io/github/release/bromite/bromite.svg?style=flat-square
+[version-url]: https://github.com/bromite/bromite/releases/latest
+[license-image]: https://img.shields.io/github/license/bromite/bromite.svg
+[license-url]: https://github.com/bromite/bromite/blob/master/LICENSE

patches/privacy/customize-google-search-results.patch

@@ -0,0 +1,68 @@
+commit 39ee52cbd24fe20205f146873dddb4063b80f546
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sat Oct 28 10:09:41 2017 +0200
+
+    Do not track google search results clicks, remove AMP
+
+diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
+index b636bb4..d2e30a1 100644
+--- a/third_party/WebKit/Source/core/dom/BUILD.gn
++++ b/third_party/WebKit/Source/core/dom/BUILD.gn
+@@ -344,6 +344,7 @@ blink_core_sources("dom") {
+     "events/TreeScopeEventContext.h",
+     "events/WindowEventContext.cpp",
+     "events/WindowEventContext.h",
++    "extensions/dont-track-me.h",
+     "ng/flat_tree_traversal_ng.cc",
+     "ng/flat_tree_traversal_ng.h",
+     "trustedtypes/TrustedHTML.cpp",
+diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
+index b53451c..ecfa473 100644
+--- a/third_party/WebKit/Source/core/dom/Document.cpp
++++ b/third_party/WebKit/Source/core/dom/Document.cpp
+@@ -218,6 +218,7 @@
+ #include "core/xml/parser/XMLDocumentParser.h"
+ #include "core/xml_names.h"
+ #include "core/xmlns_names.h"
++#include "extensions/dont-track-me.h"
+ #include "platform/CrossThreadFunctional.h"
+ #include "platform/DateComponents.h"
+ #include "platform/EventDispatchForbiddenScope.h"
+@@ -5826,8 +5827,24 @@ void Document::FinishedParsing() {
+     fetcher_->ClearResourcesFromPreviousFetcher();
+   }
+ 
+-  if (IsPrefetchOnly())
++  if (IsPrefetchOnly()) {
+     WebPrerenderingSupport::Current()->PrefetchFinished();
++    return;
++  }
++
++  // determine whether this is a Google search results page
++  SecurityOrigin *origin = GetSecurityOrigin();
++  if (origin) {
++    WTF::String domain = origin->Domain();
++    size_t pos = domain.Find(".google.");
++    auto* bodyElement = body();
++    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
++      LOG(INFO) << "BRM: injecting dont-track-me Javascript payload";
++      HTMLScriptElement* e = HTMLScriptElement::Create(*this, false);
++      e->setText(DONT_TRACK_ME_JS);
++      bodyElement->AppendChild(e);
++    }
++  }
+ }
+ 
+ void Document::ElementDataCacheClearTimerFired(TimerBase*) {
+diff --git a/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
+new file mode 100644
+index 0000000..d6be4c1
+--- /dev/null
++++ b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
+@@ -0,0 +1,6 @@
++#ifndef dont_track_me_h
++#define dont_track_me_h
++
++#define DONT_TRACK_ME_JS "// Bromite click-tracking and AMP removal\nfunction recreateHyperlink(a) {\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return;\n            }\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname === 'www.google.com') &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAllHyperlinks() {\n    // scan all hyperlinks\n    var hyperlinks = document.getElementsByTagName('a');\n    for (var i = 0; i < hyperlinks.length; i++) {\n        recreateHyperlink(hyperlinks[i]);\n    }\n}\n\nsanitizeAllHyperlinks();\n"
++
++#endif  // dont_track_me_h

patches/privacy/remove-google-click-tracking.patch

@@ -1,68 +0,0 @@
-commit 9032b89c5a4c28d43c5a13f8bc151c71acad874b
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Oct 28 10:09:41 2017 +0200
-
-    Do not track google search results clicks
-
-diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
-index 93f080f..2df8d30 100644
---- a/third_party/WebKit/Source/core/dom/BUILD.gn
-+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -344,6 +344,7 @@ blink_core_sources("dom") {
-     "events/TreeScopeEventContext.h",
-     "events/WindowEventContext.cpp",
-     "events/WindowEventContext.h",
-+    "extensions/dont-track-me.h",
-     "trustedtypes/TrustedHTML.cpp",
-     "trustedtypes/TrustedHTML.h",
-     "trustedtypes/TrustedScriptURL.cpp",
-diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
-index b7c5748..4978c84 100644
---- a/third_party/WebKit/Source/core/dom/Document.cpp
-+++ b/third_party/WebKit/Source/core/dom/Document.cpp
-@@ -218,6 +218,7 @@
- #include "core/xml/parser/XMLDocumentParser.h"
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
-+#include "extensions/dont-track-me.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5825,8 +5826,24 @@ void Document::FinishedParsing() {
-     fetcher_->ClearResourcesFromPreviousFetcher();
-   }
- 
--  if (IsPrefetchOnly())
-+  if (IsPrefetchOnly()) {
-     WebPrerenderingSupport::Current()->PrefetchFinished();
-+    return;
-+  }
-+
-+  // determine whether this is a Google search results page
-+  SecurityOrigin *origin = GetSecurityOrigin();
-+  if (origin) {
-+    WTF::String domain = origin->Domain();
-+    size_t pos = domain.Find(".google.");
-+    auto* bodyElement = body();
-+    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+      LOG(INFO) << "BRM: injecting dont-track-me Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, false);
-+      e->setText(DONT_TRACK_ME_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  }
- }
- 
- void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
-new file mode 100644
-index 0000000..57a7670
---- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
-@@ -0,0 +1,6 @@
-+#ifndef dont_track_me_h
-+#define dont_track_me_h
-+
-+#define DONT_TRACK_ME_JS "/* click-tracking removal - from https://github.com/Rob--W/dont-track-me-google */\n\nfunction sanitizeHyperlink(a) {\n    var inlineMousedown = a.getAttribute('onmousedown');\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    if (inlineMousedown && /\\ba?rwt\\(/.test(inlineMousedown)) {\n        a.removeAttribute('onmousedown');\n    }\n    var realLink = getRealLinkFromGoogleUrl(a);\n    if (realLink) {\n        a.href = realLink;\n    }\n    a.referrerPolicy = 'origin';\n\n    var ping = a.getAttribute('ping');\n    if (ping && /\\/url\\?/.test(ping)) {\n        a.removeAttribute('oncontextmenu');\n        a.removeAttribute('ping');\n    }\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname === 'www.google.com') &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAllHyperlinks() {\n\t// scan all hyperlinks\n\tvar hyperlinks = document.getElementsByTagName('a');\n\tfor(var i = 0; i < hyperlinks.length; i++) {\n\t\tvar a = hyperlinks[i];\n\t\tif (a.href)\n\t\t\tsanitizeHyperlink(a);\n\t}\n}\n\nsanitizeAllHyperlinks();\n"
-+
-+#endif  // dont_track_me_h