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

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

Issue 1741783002: Add disabled origin trial feature list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-finch
Patch Set: Rebase Created 4 years, 5 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 "content/public/common/origin_trial_policy.h"
11 #include "third_party/WebKit/public/platform/WebOriginTrialTokenStatus.h" 11 #include "third_party/WebKit/public/platform/WebOriginTrialTokenStatus.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 blink::WebOriginTrialTokenStatus TrialTokenValidator::ValidateToken( 15 blink::WebOriginTrialTokenStatus TrialTokenValidator::ValidateToken(
16 const std::string& token, 16 const std::string& token,
17 const url::Origin& origin, 17 const url::Origin& origin,
18 base::StringPiece feature_name) { 18 base::StringPiece feature_name) {
19 ContentClient* content_client = GetContentClient(); 19 ContentClient* content_client = GetContentClient();
20 const OriginTrialPolicy* origin_trial_policy = 20 const OriginTrialPolicy* origin_trial_policy =
21 content_client->GetOriginTrialPolicy(); 21 content_client->GetOriginTrialPolicy();
22 if (!origin_trial_policy) 22 if (!origin_trial_policy)
23 return blink::WebOriginTrialTokenStatus::NotSupported; 23 return blink::WebOriginTrialTokenStatus::NotSupported;
24 24
25 if (origin_trial_policy->IsFeatureDisabled(feature_name))
26 return blink::WebOriginTrialTokenStatus::FeatureDisabled;
27
25 // TODO(iclelland): Allow for multiple signing keys, and iterate over all 28 // TODO(iclelland): Allow for multiple signing keys, and iterate over all
26 // active keys here. https://crbug.com/543220 29 // active keys here. https://crbug.com/543220
27 base::StringPiece public_key = origin_trial_policy->GetPublicKey(); 30 base::StringPiece public_key = origin_trial_policy->GetPublicKey();
28 if (public_key.empty()) { 31 if (public_key.empty()) {
29 return blink::WebOriginTrialTokenStatus::NotSupported; 32 return blink::WebOriginTrialTokenStatus::NotSupported;
30 } 33 }
31 34
32 blink::WebOriginTrialTokenStatus status; 35 blink::WebOriginTrialTokenStatus status;
33 std::unique_ptr<TrialToken> trial_token = 36 std::unique_ptr<TrialToken> trial_token =
34 TrialToken::From(token, public_key, &status); 37 TrialToken::From(token, public_key, &status);
35 if (status != blink::WebOriginTrialTokenStatus::Success) { 38 if (status != blink::WebOriginTrialTokenStatus::Success) {
36 return status; 39 return status;
37 } 40 }
38 41
39 return trial_token->IsValidForFeature(origin, feature_name, 42 return trial_token->IsValidForFeature(origin, feature_name,
40 base::Time::Now()); 43 base::Time::Now());
41 } 44 }
42 45
43 } // namespace content 46 } // namespace content
OLDNEW
« no previous file with comments | « chrome/common/pref_names.cc ('k') | content/common/origin_trials/trial_token_validator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698