fix another way to activate origin trials
This commit is contained in:
Carmelo Messina
Yifeng Wu
parent
1390a0077b
commit
39853304cd
1 changed files with 50 additions and 56 deletions
|
|
@ -3,16 +3,16 @@ Date: Thu, 4 Nov 2021 09:19:24 +0100
|
|||
Subject: Disable third-party origin trials
|
||||
|
||||
---
|
||||
.../origin_trials/origin_trial_policy_impl.cc | 7 ++++---
|
||||
.../origin_trials/origin_trial_policy_impl.h | 2 +-
|
||||
.../browser/renderer_host/navigation_request.cc | 1 -
|
||||
content/renderer/render_frame_impl.cc | 17 +----------------
|
||||
.../shell/common/shell_origin_trial_policy.cc | 10 ++++------
|
||||
.../renderer/core/loader/document_loader.cc | 17 -----------------
|
||||
.../blink/renderer/core/loader/http_equiv.cc | 16 ----------------
|
||||
.../core/origin_trials/origin_trial_context.cc | 15 ++-------------
|
||||
.../platform/runtime_enabled_features.json5 | 4 ----
|
||||
9 files changed, 12 insertions(+), 77 deletions(-)
|
||||
.../origin_trials/origin_trial_policy_impl.cc | 7 ++++---
|
||||
.../origin_trials/origin_trial_policy_impl.h | 2 +-
|
||||
.../renderer_host/navigation_request.cc | 1 -
|
||||
content/renderer/render_frame_impl.cc | 17 +----------------
|
||||
.../shell/common/shell_origin_trial_policy.cc | 10 ++++------
|
||||
.../origin_trials/trial_token_validator.cc | 1 +
|
||||
.../renderer/core/loader/document_loader.cc | 17 -----------------
|
||||
.../blink/renderer/core/loader/http_equiv.cc | 19 -------------------
|
||||
.../origin_trials/origin_trial_context.cc | 9 ---------
|
||||
9 files changed, 11 insertions(+), 72 deletions(-)
|
||||
|
||||
diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc b/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
|
||||
--- a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
|
||||
|
|
@ -43,7 +43,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
|
|||
diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.h b/components/embedder_support/origin_trials/origin_trial_policy_impl.h
|
||||
--- a/components/embedder_support/origin_trials/origin_trial_policy_impl.h
|
||||
+++ b/components/embedder_support/origin_trials/origin_trial_policy_impl.h
|
||||
@@ -35,11 +35,11 @@ class OriginTrialPolicyImpl : public blink::OriginTrialPolicy {
|
||||
@@ -34,11 +34,11 @@ class OriginTrialPolicyImpl : public blink::OriginTrialPolicy {
|
||||
bool IsTokenDisabled(base::StringPiece token_signature) const override;
|
||||
bool IsOriginSecure(const GURL& url) const override;
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
|
|||
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
||||
--- a/content/browser/renderer_host/navigation_request.cc
|
||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||
@@ -6588,7 +6588,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
|
||||
@@ -6705,7 +6705,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
|
||||
void NavigationRequest::ForceEnableOriginTrials(
|
||||
const std::vector<std::string>& trials) {
|
||||
DCHECK(!HasCommitted());
|
||||
|
|
@ -70,7 +70,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
|
|||
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
||||
--- a/content/renderer/render_frame_impl.cc
|
||||
+++ b/content/renderer/render_frame_impl.cc
|
||||
@@ -470,10 +470,6 @@ void FillNavigationParamsRequest(
|
||||
@@ -480,10 +480,6 @@ void FillNavigationParamsRequest(
|
||||
common_params.initiator_origin.value();
|
||||
}
|
||||
|
||||
|
|
@ -81,7 +81,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
|
|||
navigation_params->was_discarded = commit_params.was_discarded;
|
||||
navigation_params->document_ukm_source_id =
|
||||
commit_params.document_ukm_source_id;
|
||||
@@ -506,12 +502,6 @@ void FillNavigationParamsRequest(
|
||||
@@ -516,12 +512,6 @@ void FillNavigationParamsRequest(
|
||||
navigation_params->web_bundle_claimed_url =
|
||||
commit_params.web_bundle_claimed_url;
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
|
|||
if (!commit_params.early_hints_preloaded_resources.empty()) {
|
||||
navigation_params->early_hints_preloaded_resources = WebVector<WebURL>();
|
||||
for (const auto& resource : commit_params.early_hints_preloaded_resources) {
|
||||
@@ -558,11 +548,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
|
||||
@@ -568,11 +558,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
|
||||
info->url_request.GetURLRequestExtraData().get());
|
||||
DCHECK(url_request_extra_data);
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
|
|||
blink::NavigationDownloadPolicy download_policy;
|
||||
download_policy.ApplyDownloadFramePolicy(
|
||||
info->is_opener_navigation, info->url_request.HasUserGesture(),
|
||||
@@ -581,7 +566,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
|
||||
@@ -591,7 +576,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
|
||||
info->url_request.HasUserGesture(),
|
||||
info->url_request.HasTextFragmentToken(),
|
||||
info->should_check_main_world_content_security_policy,
|
||||
|
|
@ -144,10 +144,21 @@ diff --git a/content/shell/common/shell_origin_trial_policy.cc b/content/shell/c
|
|||
}
|
||||
|
||||
const std::vector<blink::OriginTrialPublicKey>&
|
||||
diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/third_party/blink/common/origin_trials/trial_token_validator.cc
|
||||
--- a/third_party/blink/common/origin_trials/trial_token_validator.cc
|
||||
+++ b/third_party/blink/common/origin_trials/trial_token_validator.cc
|
||||
@@ -205,6 +205,7 @@ TrialTokenValidator::GetValidTokens(const url::Origin& origin,
|
||||
|
||||
// static
|
||||
bool TrialTokenValidator::IsTrialPossibleOnOrigin(const GURL& url) {
|
||||
+ if ((true)) return false;
|
||||
OriginTrialPolicy* policy = PolicyGetter().Run();
|
||||
return policy && policy->IsOriginTrialsSupported() &&
|
||||
policy->IsOriginSecure(url);
|
||||
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
|
||||
--- a/third_party/blink/renderer/core/loader/document_loader.cc
|
||||
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
|
||||
@@ -149,31 +149,18 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
|
||||
@@ -150,31 +150,18 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
|
||||
WebVector<int> CopyInitiatorOriginTrials(
|
||||
const Vector<OriginTrialFeature>& initiator_origin_trial_features) {
|
||||
WebVector<int> result;
|
||||
|
|
@ -179,7 +190,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
|
|||
return result;
|
||||
}
|
||||
|
||||
@@ -2450,10 +2437,6 @@ void DocumentLoader::CreateParserPostCommit() {
|
||||
@@ -2468,10 +2455,6 @@ void DocumentLoader::CreateParserPostCommit() {
|
||||
OriginTrialFeature::kTouchEventFeatureDetection);
|
||||
}
|
||||
|
||||
|
|
@ -193,53 +204,50 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
|
|||
diff --git a/third_party/blink/renderer/core/loader/http_equiv.cc b/third_party/blink/renderer/core/loader/http_equiv.cc
|
||||
--- a/third_party/blink/renderer/core/loader/http_equiv.cc
|
||||
+++ b/third_party/blink/renderer/core/loader/http_equiv.cc
|
||||
@@ -148,22 +148,6 @@ void HttpEquiv::ProcessHttpEquivOriginTrial(LocalDOMWindow* window,
|
||||
@@ -104,25 +104,6 @@ void HttpEquiv::ProcessHttpEquivDefaultStyle(Document& document,
|
||||
|
||||
void HttpEquiv::ProcessHttpEquivOriginTrial(LocalDOMWindow* window,
|
||||
const AtomicString& content) {
|
||||
if (!window)
|
||||
return;
|
||||
- if (!window)
|
||||
- return;
|
||||
- // For meta tags injected by script, process the token with the origin of the
|
||||
- // external script, if available.
|
||||
- // NOTE: The external script origin is not considered security-critical. See
|
||||
- // the comment thread in the design doc for details:
|
||||
- // https://docs.google.com/document/d/1xALH9W7rWmX0FpjudhDeS2TNTEOXuPn4Tlc9VmuPdHA/edit?disco=AAAAJyG8StI
|
||||
- if (RuntimeEnabledFeatures::ThirdPartyOriginTrialsEnabled()) {
|
||||
- KURL external_script_url(GetCurrentScriptUrl(/*max_stack_depth=*/1));
|
||||
- KURL external_script_url(GetCurrentScriptUrl(/*max_stack_depth=*/1));
|
||||
-
|
||||
- if (external_script_url.IsValid()) {
|
||||
- scoped_refptr<SecurityOrigin> external_origin =
|
||||
- SecurityOrigin::Create(external_script_url);
|
||||
- window->GetOriginTrialContext()->AddTokenFromExternalScript(
|
||||
- content, external_origin.get());
|
||||
- return;
|
||||
- }
|
||||
- if (external_script_url.IsValid()) {
|
||||
- scoped_refptr<SecurityOrigin> external_origin =
|
||||
- SecurityOrigin::Create(external_script_url);
|
||||
- window->GetOriginTrialContext()->AddTokenFromExternalScript(
|
||||
- content, external_origin.get());
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- // Process token as usual, without an external script origin.
|
||||
- window->GetOriginTrialContext()->AddToken(content);
|
||||
}
|
||||
|
||||
// Process token as usual, without an external script origin.
|
||||
window->GetOriginTrialContext()->AddToken(content);
|
||||
void HttpEquiv::ProcessHttpEquivRefresh(LocalDOMWindow* window,
|
||||
diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
|
||||
--- a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
|
||||
+++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
|
||||
@@ -278,17 +278,8 @@ void OriginTrialContext::AddToken(const String& token) {
|
||||
@@ -277,13 +277,6 @@ void OriginTrialContext::AddToken(const String& token) {
|
||||
void OriginTrialContext::AddTokenFromExternalScript(
|
||||
const String& token,
|
||||
const SecurityOrigin* origin) {
|
||||
- bool is_script_origin_secure = false;
|
||||
- if (origin &&
|
||||
- RuntimeEnabledFeatures::ThirdPartyOriginTrialsEnabled(context_)) {
|
||||
- DVLOG(1) << "AddTokenFromExternalScript: "
|
||||
- << (origin ? origin->ToString() : "null");
|
||||
- if (origin) {
|
||||
- DVLOG(1) << "AddTokenFromExternalScript: " << origin->ToString();
|
||||
- is_script_origin_secure = origin->IsPotentiallyTrustworthy();
|
||||
- } else {
|
||||
- origin = nullptr;
|
||||
- }
|
||||
- AddTokenInternal(token, GetSecurityOrigin(), IsSecureContext(), origin,
|
||||
- is_script_origin_secure);
|
||||
+ AddTokenInternal(token, GetSecurityOrigin(), IsSecureContext(), nullptr,
|
||||
+ false);
|
||||
}
|
||||
|
||||
void OriginTrialContext::AddTokenInternal(const String& token,
|
||||
@@ -400,8 +391,6 @@ bool OriginTrialContext::InstallSettingFeature(
|
||||
@@ -395,8 +388,6 @@ bool OriginTrialContext::InstallSettingFeature(
|
||||
}
|
||||
|
||||
void OriginTrialContext::AddFeature(OriginTrialFeature feature) {
|
||||
|
|
@ -248,19 +256,5 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.
|
|||
}
|
||||
|
||||
bool OriginTrialContext::IsFeatureEnabled(OriginTrialFeature feature) const {
|
||||
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2232,10 +2232,6 @@
|
||||
name: "TextFragmentTapOpensContextMenu",
|
||||
status: {"Android": "stable"},
|
||||
},
|
||||
- {
|
||||
- name: "ThirdPartyOriginTrials",
|
||||
- status: "stable",
|
||||
- },
|
||||
{
|
||||
name: "ThrottleDisplayNoneAndVisibilityHiddenCrossOriginIframes",
|
||||
status: "experimental",
|
||||
--
|
||||
2.25.1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue