Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(384)

Side by Side Diff: content/common/origin_trials/trial_token_validator.cc

Issue 2049783002: Refactor OriginTrialPolicy to be an abstract interface in content/public/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-add-revoked-feature-list
Patch Set: Remove (c) from copyright headers on new files Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/origin_trials/trial_token_validator.h" 5 #include "content/common/origin_trials/trial_token_validator.h"
6 6
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "content/common/origin_trials/trial_token.h" 8 #include "content/common/origin_trials/trial_token.h"
9 #include "content/public/common/content_client.h" 9 #include "content/public/common/content_client.h"
10 #include "content/public/common/origin_trial_policy.h"
10 #include "third_party/WebKit/public/platform/WebOriginTrialTokenStatus.h" 11 #include "third_party/WebKit/public/platform/WebOriginTrialTokenStatus.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 blink::WebOriginTrialTokenStatus TrialTokenValidator::ValidateToken( 15 blink::WebOriginTrialTokenStatus TrialTokenValidator::ValidateToken(
15 const std::string& token, 16 const std::string& token,
16 const url::Origin& origin, 17 const url::Origin& origin,
17 base::StringPiece feature_name) { 18 base::StringPiece feature_name) {
18 const ContentClient* content_client = GetContentClient(); 19 const ContentClient* content_client = GetContentClient();
19 if (content_client->IsOriginTrialFeatureDisabled(feature_name)) 20 const OriginTrialPolicy* origin_trial_policy =
21 content_client->GetOriginTrialPolicy();
22 if (!origin_trial_policy)
23 return blink::WebOriginTrialTokenStatus::NotSupported;
24
25 if (origin_trial_policy->IsFeatureDisabled(feature_name))
20 return blink::WebOriginTrialTokenStatus::FeatureDisabled; 26 return blink::WebOriginTrialTokenStatus::FeatureDisabled;
21 27
22 // TODO(iclelland): Allow for multiple signing keys, and iterate over all 28 // TODO(iclelland): Allow for multiple signing keys, and iterate over all
23 // active keys here. https://crbug.com/543220 29 // active keys here. https://crbug.com/543220
24 base::StringPiece public_key = content_client->GetOriginTrialPublicKey(); 30 base::StringPiece public_key = origin_trial_policy->GetPublicKey();
25 if (public_key.empty()) { 31 if (public_key.empty()) {
26 return blink::WebOriginTrialTokenStatus::NotSupported; 32 return blink::WebOriginTrialTokenStatus::NotSupported;
27 } 33 }
28 34
29 blink::WebOriginTrialTokenStatus status; 35 blink::WebOriginTrialTokenStatus status;
30 std::unique_ptr<TrialToken> trial_token = 36 std::unique_ptr<TrialToken> trial_token =
31 TrialToken::From(token, public_key, &status); 37 TrialToken::From(token, public_key, &status);
32 if (status != blink::WebOriginTrialTokenStatus::Success) { 38 if (status != blink::WebOriginTrialTokenStatus::Success) {
33 return status; 39 return status;
34 } 40 }
35 41
36 return trial_token->IsValidForFeature(origin, feature_name, 42 return trial_token->IsValidForFeature(origin, feature_name,
37 base::Time::Now()); 43 base::Time::Now());
38 } 44 }
39 45
40 } // namespace content 46 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698