Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a2a5234 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge tag 88.0.4324.149 from bromite 



0292b961 Release 88.0.4324.149
0fde359d Merge pull request #901 from uazo/fix-proxy-system-network
300460a3 Merge branch 'master' into fix-proxy-system-network
d9922db4 Merge pull request #898 from uazo/fix-884
126c1afb enable proxy config for the system network context
30b18d8e added reading of kProxyReverseBypass from config

Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parents ddfa38e2 0292b961

CHANGELOG.md

+6 −1
Original line number Diff line number Diff line 
# 88.0.4324.149

* fix proxy PAC URL option not working (fixes https://github.com/bromite/bromite/issues/908)

* store proxy configuration in LocalState instead of Profile (thanks to @uazo)

* fix toggle for reversing the meaning of bypass rules (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/884)

* ignore managed state and policies for secure DNS (fixes https://github.com/bromite/bromite/issues/832)



# 88.0.4324.141

* fix bookmarks not opening (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/891)

* fix proxy page not loading (fixes https://github.com/bromite/bromite/issues/890)

* ignore managed state for secure DNS (fixes https://github.com/bromite/bromite/issues/832)



# 88.0.4324.95

* fix broken recent tabs behaviour (fixes https://github.com/bromite/bromite/issues/886)

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
88.0.4324.141
 
88.0.4324.149

build/bromite_patches_list.txt

+2 −1
Original line number Diff line number Diff line
@@ -152,5 +152,6 @@ Enable-network-isolation-features.patch 
Disable-unified-autoplay-feature.patch

Revert-flags-remove-num-raster-threads.patch

webview-Hard-no-to-persistent-histograms.patch

Ignore-managed-state-for-secure-DNS.patch

Ignore-managed-state-and-policies-for-secure-DNS.patch

Do-not-permit-user-installed-certificates.patch

Automated-domain-substitution.patch

build/patches/Add-a-proxy-configuration-page.patch

+156 −25
Original line number Diff line number Diff line
@@ -6,28 +6,34 @@ Accessible from proxy settings and chrome://proxy 
Allows to use a PAC script URL, automatic configuration and explicit proxy

settings.

Offer auto-complete for the proxy page URL.

Store proxy settings in LocalState instead of Profile, so that proxy is used

for SimpleURLLoaders as well.

---

 chrome/android/java/res/values/values.xml     |   3 +

 .../java/res/xml/privacy_preferences.xml      |   4 +

 .../privacy/settings/PrivacySettings.java     |   5 +-

 .../chrome_autocomplete_provider_client.cc    |   2 +

 chrome/browser/browser_resources.grd          |   6 +

 chrome/browser/net/proxy_service_factory.cc   |  23 +-

 chrome/browser/net/proxy_service_factory.h    |   3 +

 chrome/browser/prefs/browser_prefs.cc         |   4 +

 .../prefs/chrome_command_line_pref_store.cc   |   2 +-

 chrome/browser/resources/proxy_config.css     |  61 +++

 chrome/browser/resources/proxy_config.html    |  80 ++++

 chrome/browser/resources/proxy_config.js      | 262 +++++++++++

 chrome/browser/resources/proxy_config.js      | 263 +++++++++++

 chrome/browser/ui/BUILD.gn                    |   2 +

 .../webui/chrome_web_ui_controller_factory.cc |   3 +

 chrome/browser/ui/webui/proxy_config_ui.cc    | 413 ++++++++++++++++++

 chrome/browser/ui/webui/proxy_config_ui.cc    | 417 ++++++++++++++++++

 chrome/browser/ui/webui/proxy_config_ui.h     |  33 ++

 chrome/common/webui_url_constants.cc          |   4 +

 chrome/common/webui_url_constants.h           |   2 +

 .../core/browser/proxy_policy_handler.cc      |   2 +-

 .../proxy_config/proxy_config_dictionary.cc   |  22 +-

 .../proxy_config/proxy_config_dictionary.h    |   6 +-

 .../pref_proxy_config_tracker_impl.cc         |   1 +

 .../proxy_config/proxy_config_dictionary.cc   |  30 +-

 .../proxy_config/proxy_config_dictionary.h    |   7 +-

 net/proxy_resolution/proxy_config.cc          |  52 ++-

 net/proxy_resolution/proxy_config.h           |   3 +

 20 files changed, 953 insertions(+), 14 deletions(-)

 24 files changed, 997 insertions(+), 15 deletions(-)

 create mode 100644 chrome/browser/resources/proxy_config.css

 create mode 100644 chrome/browser/resources/proxy_config.html

 create mode 100644 chrome/browser/resources/proxy_config.js
@@ -109,6 +115,92 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou 
       <if expr="not is_android">

         <!-- New Tab Page -->

         <part file="resources/local_ntp/icons.grdp" />

diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc

--- a/chrome/browser/net/proxy_service_factory.cc

+++ b/chrome/browser/net/proxy_service_factory.cc

@@ -14,6 +14,9 @@

 #include "content/public/browser/browser_thread.h"

 #include "net/proxy_resolution/configured_proxy_resolution_service.h"

 #include "net/proxy_resolution/proxy_config_service.h"

+#include "components/proxy_config/proxy_config_pref_names.h"

+#include "components/prefs/pref_service.h"

+#include "components/prefs/pref_registry_simple.h"

 

 #if defined(OS_CHROMEOS)

 #include "chromeos/network/proxy/proxy_config_service_impl.h"

@@ -58,7 +61,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(

   return std::make_unique<chromeos::ProxyConfigServiceImpl>(

       profile_prefs, local_state_prefs, nullptr);

 #else

-  return std::make_unique<PrefProxyConfigTrackerImpl>(profile_prefs, nullptr);

+  // Migrate from profile_prefs to local_state_prefs

+  if (local_state_prefs->GetBoolean("proxy_migrated") == false) {

+    const base::DictionaryValue* dict =

+        profile_prefs->GetDictionary(proxy_config::prefs::kProxy);

+

+    LOG(INFO) << "CreatePrefProxyConfigTrackerOfProfile: Migration from profile to local state";

+

+    const base::Value /*ProxyConfigDictionary*/ proxy_dict(dict->Clone());

+    local_state_prefs->Set(proxy_config::prefs::kProxy, proxy_dict);

+

+    local_state_prefs->SetBoolean("proxy_migrated", true);

+    local_state_prefs->CommitPendingWrite();

+  }

+  return std::make_unique<PrefProxyConfigTrackerImpl>(local_state_prefs, nullptr);

 #endif  // defined(OS_CHROMEOS)

 }

 

@@ -74,3 +90,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(

                                                       nullptr);

 #endif  // defined(OS_CHROMEOS)

 }

+

+// static

+void ProxyServiceFactory::RegisterPrefs(PrefRegistrySimple* registry) {

+  registry->RegisterBooleanPref("proxy_migrated", false);

+}

\ No newline at end of file

diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/proxy_service_factory.h

--- a/chrome/browser/net/proxy_service_factory.h

+++ b/chrome/browser/net/proxy_service_factory.h

@@ -8,6 +8,7 @@

 #include <memory>

 

 #include "base/macros.h"

+#include "components/prefs/pref_registry_simple.h"

 

 class PrefProxyConfigTracker;

 class PrefService;

@@ -37,6 +38,8 @@ class ProxyServiceFactory {

   static std::unique_ptr<PrefProxyConfigTracker>

   CreatePrefProxyConfigTrackerOfLocalState(PrefService* local_state_prefs);

 

+  static void RegisterPrefs(PrefRegistrySimple* registry);

+

  private:

   DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory);

 };

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -401,6 +401,8 @@

 #include "chrome/browser/media/kaleidoscope/kaleidoscope_prefs.h"

 #endif

 

+#include "chrome/browser/net/proxy_service_factory.h"

+

 namespace {

 

 // Deprecated 9/2019

@@ -642,6 +644,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

   PluginsResourceService::RegisterPrefs(registry);

 #endif

 

+  ProxyServiceFactory::RegisterPrefs(registry);

+

 #if defined(OS_ANDROID)

   ::android::RegisterPrefs(registry);

 

diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc

--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc

+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
@@ -276,7 +368,7 @@ diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources 
new file mode 100644

--- /dev/null

+++ b/chrome/browser/resources/proxy_config.js

@@ -0,0 +1,262 @@

@@ -0,0 +1,263 @@

+/*

+    This file is part of Bromite.

+
@@ -436,7 +528,8 @@ new file mode 100644 
+        return {

+          "auto_detect": false,

+          "pac_url": $(kIdPacURL).value.trim(),

+          "pac_mandatory": $(kIdPacMandatory).checked

+          "pac_mandatory": $(kIdPacMandatory).checked,

+          "rules": {}

+        };

+      } else if ($(kIdModeUseListPerScheme).checked || $(kIdModeUseSingleList).checked) {

+        var config = {
@@ -575,7 +668,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webu 
new file mode 100644

--- /dev/null

+++ b/chrome/browser/ui/webui/proxy_config_ui.cc

@@ -0,0 +1,413 @@

@@ -0,0 +1,417 @@

+/*

+    This file is part of Bromite.

+
@@ -676,7 +769,7 @@ new file mode 100644 
+

+ private:

+  // Not owned.

+  Profile *profile_;

+  PrefService *pref_service_;

+  std::unique_ptr<net::ProxyConfigService> proxy_config_service_;

+  // Monitors global and Profile prefs related to proxy configuration.

+  std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
@@ -696,7 +789,7 @@ new file mode 100644 
+      weak_ptr_factory_(this) {

+

+  // used to set new configuration preferences

+  profile_ = profile->GetOriginalProfile();

+  pref_service_ = g_browser_process->local_state();

+  // observer is explicitly added only later in enableNotifyUIWithState

+  is_observing_ = false;

+
@@ -760,12 +853,16 @@ new file mode 100644 
+

+  state.SetPath({"config", "auto_detect"}, base::Value(config.auto_detect()));

+

+  auto rules = config.proxy_rules();

+  if (config.has_pac_url()) {

+    state.SetPath({"config", "pac_url"}, base::Value(config.pac_url().spec()));

+    state.SetPath({"config", "pac_mandatory"}, base::Value(config.pac_mandatory()));

+    state.SetPath({"config", "rules", "type"}, base::Value("none"));

+    state.SetPath({"config", "rules", "bypass_rules"}, base::Value(rules.bypass_rules.ToString()));

+    state.SetPath({"config", "rules", "reverse_bypass"}, base::Value(rules.reverse_bypass));

+    return;

+  }

+

+  auto rules = config.proxy_rules();

+  const char *type;

+  switch (rules.type) {

+    case net::ProxyConfig::ProxyRules::Type::EMPTY:
@@ -834,7 +931,7 @@ new file mode 100644 
+  auto availability = proxy_config_service_->GetLatestProxyConfig(&config);

+

+  const base::DictionaryValue* dict =

+      profile_->GetPrefs()->GetDictionary(proxy_config::prefs::kProxy);

+      pref_service_->GetDictionary(proxy_config::prefs::kProxy);

+  ProxyConfigDictionary proxy_dict(dict->Clone());

+  ProxyPrefs::ProxyMode mode;

+  if (!proxy_dict.GetMode(&mode) || mode == ProxyPrefs::MODE_SYSTEM) {
@@ -848,8 +945,8 @@ new file mode 100644 
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);

+

+  const base::Value cfg = ProxyConfigDictionary::CreateSystem();

+  profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);

+  profile_->GetPrefs()->CommitPendingWrite();

+  pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+  pref_service_->CommitPendingWrite();

+  OnEnableNotifyUIWithState(nullptr);

+}

+
@@ -959,13 +1056,13 @@ new file mode 100644 
+void ProxyConfigMessageHandler::apply(const net::ProxyConfig& proxyConfig) {

+  if (proxyConfig.auto_detect()) {

+    const base::Value cfg = ProxyConfigDictionary::CreateAutoDetect();

+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);

+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+  } else if (proxyConfig.has_pac_url()) {

+    const base::Value cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());

+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);

+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+  } else if (proxyConfig.proxy_rules().type == net::ProxyConfig::ProxyRules::Type::EMPTY) {

+    const base::Value cfg = ProxyConfigDictionary::CreateDirect();

+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);

+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+  } else {

+    auto proxyRulesAsString = proxyConfig.proxy_rules().ToString();

+    auto bypassRulesAsString = proxyConfig.proxy_rules().bypass_rules.ToString();
@@ -973,9 +1070,9 @@ new file mode 100644 
+    // fixed servers

+    const base::Value cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,

+                            bypassRulesAsString, proxyConfig.proxy_rules().reverse_bypass);

+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);

+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);

+  }

+  profile_->GetPrefs()->CommitPendingWrite();

+  pref_service_->CommitPendingWrite();

+  OnEnableNotifyUIWithState(nullptr);

+}

+
@@ -1079,6 +1176,17 @@ diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components 
       }

       break;

     }

diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc

--- a/components/proxy_config/pref_proxy_config_tracker_impl.cc

+++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc

@@ -380,6 +380,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(

       if (proxy_dict.GetBypassList(&proxy_bypass)) {

         proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass);

       }

+      proxy_config.proxy_rules().reverse_bypass = proxy_dict.HasReverseBypass();

       *config = net::ProxyConfigWithAnnotation(

           proxy_config, kSettingsProxyConfigTrafficAnnotation);

       return true;

diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/proxy_config/proxy_config_dictionary.cc

--- a/components/proxy_config/proxy_config_dictionary.cc

+++ b/components/proxy_config/proxy_config_dictionary.cc
@@ -1091,7 +1199,22 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro 
 

 }  // namespace

 

@@ -79,29 +81,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const {

@@ -72,6 +74,14 @@ bool ProxyConfigDictionary::HasBypassList() const {

   return dict_.FindKey(kProxyBypassList);

 }

 

+bool ProxyConfigDictionary::HasReverseBypass() const {

+  const base::Value* value = dict_.FindKey(kProxyReverseBypass);

+  if (!value || !value->is_bool()) {

+    return false;

+  }

+  return value->GetBool();

+}

+

 const base::Value& ProxyConfigDictionary::GetDictionary() const {

   return dict_;

 }

@@ -79,29 +89,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const {

 // static

 base::Value ProxyConfigDictionary::CreateDirect() {

   return CreateDictionary(ProxyPrefs::MODE_DIRECT, std::string(), false,
@@ -1127,7 +1250,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro 
   } else {

     return CreateDirect();

   }

@@ -110,7 +113,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers(

@@ -110,7 +121,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers(

 // static

 base::Value ProxyConfigDictionary::CreateSystem() {

   return CreateDictionary(ProxyPrefs::MODE_SYSTEM, std::string(), false,
@@ -1136,7 +1259,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro 
 }

 

 // static

@@ -119,7 +122,8 @@ base::Value ProxyConfigDictionary::CreateDictionary(

@@ -119,7 +130,8 @@ base::Value ProxyConfigDictionary::CreateDictionary(

     const std::string& pac_url,

     bool pac_mandatory,

     const std::string& proxy_server,
@@ -1146,7 +1269,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro 
   base::Value dict(base::Value::Type::DICTIONARY);

   dict.SetKey(kProxyMode, base::Value(ProxyModeToString(mode)));

   if (!pac_url.empty()) {

@@ -128,8 +132,10 @@ base::Value ProxyConfigDictionary::CreateDictionary(

@@ -128,8 +140,10 @@ base::Value ProxyConfigDictionary::CreateDictionary(

   }

   if (!proxy_server.empty())

     dict.SetKey(kProxyServer, base::Value(proxy_server));
@@ -1161,7 +1284,15 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro 
diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/proxy_config/proxy_config_dictionary.h

--- a/components/proxy_config/proxy_config_dictionary.h

+++ b/components/proxy_config/proxy_config_dictionary.h

@@ -46,7 +46,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {

@@ -38,6 +38,7 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {

   bool GetProxyServer(std::string* out) const;

   bool GetBypassList(std::string* out) const;

   bool HasBypassList() const;

+  bool HasReverseBypass() const;

 

   const base::Value& GetDictionary() const;

 

@@ -46,7 +47,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {

   static base::Value CreatePacScript(const std::string& pac_url,

                                      bool pac_mandatory);

   static base::Value CreateFixedServers(const std::string& proxy_server,
@@ -1171,7 +1302,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox 
   static base::Value CreateSystem();

 

   // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>".

@@ -62,7 +63,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {

@@ -62,7 +64,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {

                                       const std::string& pac_url,

                                       bool pac_mandatory,

                                       const std::string& proxy_server,

build/patches/Add-history-support-in-incognito-mode.patch

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"

 #include "chrome/browser/android/explore_sites/history_statistics_reporter.h"

 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"

@@ -903,6 +905,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,

@@ -907,6 +909,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,

   variations::VariationsService::RegisterProfilePrefs(registry);

   video_tutorials::RegisterPrefs(registry);

   feed::prefs::RegisterFeedSharedProfilePrefs(registry);