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 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- components/embedder_support/user_agent_utils.cc | 4 +--- content/browser/client_hints/client_hints.cc | 3 ++- content/browser/loader/navigation_url_loader_impl.cc | 5 +++++ 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 | 4 ++-- 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, 19 insertions(+), 18 deletions(-) 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 @@ -265,9 +265,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList( bool parse_result = base::StringToInt(major_version, &major_version_number); DCHECK(parse_result); 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 @@ -435,7 +435,8 @@ void AddPrefersColorSchemeHeader(net::HttpRequestHeaders* headers, is_dark_mode ? "dark" : "light"); } -bool IsValidURLForClientHints(const url::Origin& origin) { +bool IsValidURLForClientHints(const url::Origin& origin) { // disabled in Bromite + if ((true)) return false; return network::IsOriginPotentiallyTrustworthy(origin); } diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc --- a/content/browser/loader/navigation_url_loader_impl.cc +++ b/content/browser/loader/navigation_url_loader_impl.cc @@ -1030,6 +1030,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( return; } + if (!base::FeatureList::IsEnabled(network::features::kAcceptCHFrame)) { + std::move(callback).Run(net::OK); + return; + } + LogAcceptCHFrameStatus(AcceptCHFrameRestart::kFramePresent); // Given that this is happening in the middle of navigation, there should 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 @@ -323,14 +323,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 @@ -233,7 +233,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}; // Enable debugging the issue crbug.com/1201355 const base::Feature kDebugHistoryInterventionNoUserActivation{ 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 @@ -179,8 +179,8 @@ const base::Feature kWebSocketReassembleShortMessages{ // Enable support for ACCEPT_CH H2/3 frame as part of Client Hint Reliability. // 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}; +const base::Feature kAcceptCHFrame{"AcceptCHFrame", // disabled by default + base::FEATURE_DISABLED_BY_DEFAULT}; // in Bromite 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 @@ -111,6 +111,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount = std::size(kWebEffectiveConnectionTypeMapping); bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { + if ((true)) return false; switch (type) { case network::mojom::WebClientHintsType::kSaveData: case network::mojom::WebClientHintsType::kUA: 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 @@ -21,6 +21,7 @@ namespace { using ::network::mojom::WebClientHintsType; bool IsDisabledByFeature(const WebClientHintsType type) { + if ((true)) return true; switch (type) { case WebClientHintsType::kUA: case WebClientHintsType::kUAArch: @@ -127,7 +128,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, @@ -156,6 +157,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 @@ -222,7 +222,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent", // Enables User-Agent Client Hints const base::Feature kUserAgentClientHint{"UserAgentClientHint", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; // Handle prefers-color-scheme user preference media feature via client hints. const base::Feature kPrefersColorSchemeClientHintHeader{ @@ -606,7 +606,7 @@ const base::Feature kAudioWorkletThreadRealtimePriority{ const base::Feature kLightweightNoStatePrefetch { "LightweightNoStatePrefetch", #if BUILDFLAG(IS_ANDROID) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT #endif -- 2.25.1