1 files changed, 234 insertions, 0 deletions

diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
new file mode 100644
index 0000000..8b68a77
--- /dev/null
+++ b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
@@ -0,0 +1,234 @@
+# Block all connection requests with 'qjz9zk' in the domain name or with a 'trk:' scheme.
+# This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
+
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig
++++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI
+   if (base::IsStringASCII(scheme) &&
+       (ProfileIOData::IsHandledProtocol(scheme) ||
+        base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
++       base::LowerCaseEqualsASCII(scheme, url::kTraceScheme) ||
+        base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) ||
+        base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) {
+     return metrics::OmniboxInputType::URL;
+--- chrome/browser/history/history_utils.cc.orig
++++ chrome/browser/history/history_utils.cc
+@@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url)
+       url.SchemeIs(content::kChromeDevToolsScheme) ||
+       url.SchemeIs(content::kChromeUIScheme) ||
+       url.SchemeIs(content::kViewSourceScheme) ||
++      url.SchemeIs(url::kTraceScheme) ||
+       url.SchemeIs(chrome::kChromeNativeScheme) ||
+       url.SchemeIs(chrome::kChromeSearchScheme) ||
+       url.SchemeIs(dom_distiller::kDomDistillerScheme))
+--- chrome/browser/ui/singleton_tabs.cc.orig
++++ chrome/browser/ui/singleton_tabs.cc
+@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows
+ 
+     // Skip view-source tabs. This is needed because RewriteURLIfNecessary
+     // removes the "view-source:" scheme which leads to incorrect matching.
+-    if (tab_url.SchemeIs(content::kViewSourceScheme))
++    if (tab_url.SchemeIs(content::kViewSourceScheme) ||
++        tab_url.SchemeIs(url::kTraceScheme))
+       continue;
+ 
+     GURL rewritten_tab_url = tab_url;
+--- components/omnibox/browser/autocomplete_input.cc.orig
++++ components/omnibox/browser/autocomplete_input.cc
+@@ -533,7 +533,8 @@ void AutocompleteInput::ParseForEmphasiz
+   // For the view-source and blob schemes, we should emphasize the host of the
+   // URL qualified by the view-source or blob prefix.
+   if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
+-       base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme)) &&
++       base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme) ||
++       base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) &&
+       (static_cast<int>(text.length()) > after_scheme_and_colon)) {
+     // Obtain the URL prefixed by view-source or blob and parse it.
+     std::u16string real_url(text.substr(after_scheme_and_colon));
+--- components/url_formatter/url_fixer.cc.orig
++++ components/url_formatter/url_fixer.cc
+@@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, c
+     }
+   }
+ 
++  if (scheme == url::kTraceScheme) {
++    return GURL();
++  }
++
+   // We handle the file scheme separately.
+   if (scheme == url::kFileScheme)
+     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
+--- content/browser/child_process_security_policy_impl.cc.orig
++++ content/browser/child_process_security_policy_impl.cc
+@@ -861,6 +861,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
+ #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
+   RegisterWebSafeScheme(url::kFtpScheme);
+   RegisterWebSafeScheme(url::kDataScheme);
++  RegisterWebSafeScheme(url::kTraceScheme);
+   RegisterWebSafeScheme("feed");
+ 
+   // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
+--- net/BUILD.gn.orig
++++ net/BUILD.gn
+@@ -1010,6 +1010,8 @@ component("net") {
+     "url_request/report_sender.h",
+     "url_request/static_http_user_agent_settings.cc",
+     "url_request/static_http_user_agent_settings.h",
++    "url_request/trk_protocol_handler.cc",
++    "url_request/trk_protocol_handler.h",
+     "url_request/url_fetcher.cc",
+     "url_request/url_fetcher.h",
+     "url_request/url_fetcher_core.cc",
+--- /dev/null
++++ net/url_request/trk_protocol_handler.cc
+@@ -0,0 +1,25 @@
++// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "net/url_request/trk_protocol_handler.h"
++
++#include "base/logging.h"
++#include "net/base/net_errors.h"
++#include "net/url_request/url_request_error_job.h"
++
++namespace net {
++
++TrkProtocolHandler::TrkProtocolHandler() = default;
++
++std::unique_ptr<URLRequestJob> TrkProtocolHandler::CreateJob(
++    URLRequest* request) const {
++  LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url();
++  return std::make_unique<URLRequestErrorJob>(request, ERR_BLOCKED_BY_CLIENT);
++}
++
++bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
++  return true;
++}
++
++}  // namespace net
+--- /dev/null
++++ net/url_request/trk_protocol_handler.h
+@@ -0,0 +1,32 @@
++// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
++#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "net/base/net_export.h"
++#include "net/url_request/url_request_job_factory.h"
++
++namespace net {
++
++class URLRequestJob;
++
++// Implements a ProtocolHandler for Trk jobs.
++class NET_EXPORT TrkProtocolHandler
++    : public URLRequestJobFactory::ProtocolHandler {
++ public:
++  TrkProtocolHandler();
++  std::unique_ptr<URLRequestJob> CreateJob(
++      URLRequest* request) const override;
++  bool IsSafeRedirectTarget(const GURL& location) const override;
++
++ private:
++  DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler);
++};
++
++}  // namespace net
++
++#endif  // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
+--- net/url_request/url_request.cc.orig
++++ net/url_request/url_request.cc
+@@ -12,6 +12,7 @@
+ #include "base/compiler_specific.h"
+ #include "base/metrics/histogram_macros.h"
+ #include "base/rand_util.h"
++#include "base/strings/string_util.h"
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/synchronization/lock.h"
+ #include "base/threading/thread_task_runner_handle.h"
+@@ -46,6 +47,7 @@
+ #include "net/url_request/url_request_redirect_job.h"
+ #include "url/gurl.h"
+ #include "url/origin.h"
++#include "url/url_constants.h"
+ 
+ using base::Time;
+ using std::string;
+@@ -595,6 +597,12 @@ URLRequest::URLRequest(const GURL& url,
+   // Sanity check out environment.
+   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
+ 
++  if (!url.SchemeIs(url::kTraceScheme) &&
++      base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) {
++    LOG(ERROR) << "Block URL in URLRequest: " << url;
++    url_chain_[0] = GURL(url::kTraceScheme + (":" + url.possibly_invalid_spec()));
++  }
++
+   context->url_requests()->insert(this);
+   net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] {
+     return NetLogURLRequestConstructorParams(url, priority_,
+--- net/url_request/url_request_context_builder.cc.orig
++++ net/url_request/url_request_context_builder.cc
+@@ -46,6 +46,7 @@
+ #include "net/quic/quic_stream_factory.h"
+ #include "net/ssl/ssl_config_service_defaults.h"
+ #include "net/url_request/static_http_user_agent_settings.h"
++#include "net/url_request/trk_protocol_handler.h"
+ #include "net/url_request/url_request_context.h"
+ #include "net/url_request/url_request_context_storage.h"
+ #include "net/url_request/url_request_job_factory.h"
+@@ -546,6 +547,9 @@ std::unique_ptr<URLRequestContext> URLRe
+   }
+   protocol_handlers_.clear();
+ 
++  job_factory->SetProtocolHandler(url::kTraceScheme,
++                                  std::make_unique<TrkProtocolHandler>());
++
+   storage->set_job_factory(std::move(job_factory));
+ 
+   return std::move(context);
+--- url/url_constants.cc.orig
++++ url/url_constants.cc
+@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto";
+ // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport
+ const char kQuicTransportScheme[] = "quic-transport";
+ const char kTelScheme[] = "tel";
++const char kTraceScheme[] = "trk";
+ const char kUrnScheme[] = "urn";
+ const char kWsScheme[] = "ws";
+ const char kWssScheme[] = "wss";
+--- url/url_constants.h.orig
++++ url/url_constants.h
+@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char
+ COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
+ COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
+ COMPONENT_EXPORT(URL) extern const char kTelScheme[];
++COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
+ COMPONENT_EXPORT(URL) extern const char kUrnScheme[];
+ COMPONENT_EXPORT(URL) extern const char kWsScheme[];
+ COMPONENT_EXPORT(URL) extern const char kWssScheme[];
+--- url/url_util.cc.orig
++++ url/url_util.cc
+@@ -63,7 +63,7 @@ struct SchemeRegistry {
+ 
+   // Schemes that do not trigger mixed content warning.
+   std::vector<std::string> secure_schemes = {
+-      kHttpsScheme, kAboutScheme, kDataScheme, kQuicTransportScheme, kWssScheme,
++      kHttpsScheme, kAboutScheme, kDataScheme, kTraceScheme, kQuicTransportScheme, kWssScheme,
+   };
+ 
+   // Schemes that normal pages cannot link to or access (i.e., with the same
+@@ -78,6 +78,7 @@ struct SchemeRegistry {
+       kAboutScheme,
+       kJavaScriptScheme,
+       kDataScheme,
++      kTraceScheme,
+   };
+ 
+   // Schemes that can be sent CORS requests.