From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Thu, 22 Jul 2021 23:10:52 +0200 Subject: Client hints overrides Disable critical client hints Hard-code model to SAMSUNG SM-G960U use Google Chrome branding for client hints --- chrome/browser/prefs/browser_prefs.cc | 2 +- components/embedder_support/user_agent_utils.cc | 4 +--- content/browser/client_hints/client_hints.cc | 1 + content/common/user_agent.cc | 9 +-------- content/public/common/content_features.cc | 2 +- services/network/public/cpp/client_hints.cc | 1 + services/network/public/cpp/features.cc | 2 +- third_party/blink/common/client_hints/client_hints.cc | 1 + .../blink/common/client_hints/enabled_client_hints.cc | 4 +++- third_party/blink/common/features.cc | 4 ++-- 10 files changed, 13 insertions(+), 17 deletions(-) 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 @@ -744,7 +744,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) { registry->RegisterListPref(prefs::kUsedPolicyCertificates); #endif // BUILDFLAG(IS_CHROMEOS_ASH) - registry->RegisterBooleanPref(kUserAgentClientHintsEnabled, true); + registry->RegisterBooleanPref(kUserAgentClientHintsEnabled, false); registry->RegisterBooleanPref(kCloudPolicyOverridesPlatformPolicy, false); diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc @@ -214,9 +214,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( int major_version_number = 0; DCHECK(base::StringToInt(major_version, &major_version_number)); absl::optional brand; -#if !BUILDFLAG(CHROMIUM_BRANDING) - brand = version_info::GetProductName(); -#endif + brand = "Google Chrome"; absl::optional maybe_brand_override = base::GetFieldTrialParamValueByFeature(features::kGreaseUACH, "brand_override"); diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc @@ -422,6 +422,7 @@ void AddPrefersColorSchemeHeader(net::HttpRequestHeaders* headers, } bool IsValidURLForClientHints(const GURL& url) { + if ((true)) return false; if (!url.is_valid() || !url.SchemeIsHTTPOrHTTPS() || (url.SchemeIs(url::kHttpScheme) && !net::IsLocalhost(url))) return false; diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc @@ -285,14 +285,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) { } std::string BuildModelInfo() { - std::string model; -#if BUILDFLAG(IS_ANDROID) - // Only send the model information if on the release build of Android, - // matching user agent behaviour. - if (base::SysInfo::GetAndroidBuildCodename() == "REL") - model = base::SysInfo::HardwareModelName(); -#endif - return model; + return "SAMSUNG SM-G960U"; } #if BUILDFLAG(IS_ANDROID) diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc @@ -232,7 +232,7 @@ const base::Feature kCrashReporting{"CrashReporting", // Enables support for the `Critical-CH` response header. // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch const base::Feature kCriticalClientHint{"CriticalClientHint", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; // Puts save-data header in the holdback mode. This disables sending of // save-data header to origins, and to the renderer processes within Chrome. diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc --- a/services/network/public/cpp/client_hints.cc +++ b/services/network/public/cpp/client_hints.cc @@ -97,6 +97,7 @@ const DecodeMap& GetDecodeMap() { absl::optional> ParseClientHintsHeader(const std::string& header) { + if ((true)) return absl::nullopt; // Accept-CH is an sh-list of tokens; see: // https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-header-structure-19#section-3.1 absl::optional maybe_list = diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc @@ -192,7 +192,7 @@ const base::Feature kWebSocketReassembleShortMessages{ // See: // https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3 const base::Feature kAcceptCHFrame{"AcceptCHFrame", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kSCTAuditingRetryReports{"SCTAuditingRetryReports", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc @@ -117,6 +117,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount = base::size(kWebEffectiveConnectionTypeMapping); bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { + if ((true)) return false; switch (type) { case network::mojom::WebClientHintsType::kUA: case network::mojom::WebClientHintsType::kUAMobile: diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/third_party/blink/common/client_hints/enabled_client_hints.cc --- a/third_party/blink/common/client_hints/enabled_client_hints.cc +++ b/third_party/blink/common/client_hints/enabled_client_hints.cc @@ -22,6 +22,7 @@ namespace { using ::network::mojom::WebClientHintsType; bool IsDisabledByFeature(const WebClientHintsType type) { + if ((true)) return true; switch (type) { case WebClientHintsType::kUA: case WebClientHintsType::kUAArch: @@ -132,7 +133,7 @@ bool IsOriginTrialEnabled(const GURL& url, } // namespace bool EnabledClientHints::IsEnabled(const WebClientHintsType type) const { - return enabled_types_[static_cast(type)]; + return false; } void EnabledClientHints::SetIsEnabled(const WebClientHintsType type, @@ -165,6 +166,7 @@ void EnabledClientHints::SetIsEnabled( std::vector EnabledClientHints::GetEnabledHints() const { std::vector hints; + if ((true)) return hints; for (const auto& elem : network::GetClientHintToNameMap()) { const auto& type = elem.first; if (IsEnabled(type)) diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc @@ -147,7 +147,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent", // An experimental replacement for the `User-Agent` header, defined in // https://tools.ietf.org/html/draft-west-ua-client-hints. const base::Feature kUserAgentClientHint{"UserAgentClientHint", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; // Enable `sec-ch-ua-full-version-list` client hint. const base::Feature kUserAgentClientHintFullVersionList{ @@ -750,7 +750,7 @@ const base::Feature kResamplingScrollEvents{"ResamplingScrollEvents", const base::Feature kAllowClientHintsToThirdParty { "AllowClientHintsToThirdParty", #if BUILDFLAG(IS_ANDROID) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT #endif -- 2.25.1