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

Side by Side Diff: content/common/feature_policy/feature_policy.cc

Issue 2655023004: Feature policy: Add basic algorithm for supporting frame policies. (Closed)
Patch Set: Addressing review comments Created 3 years, 10 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/feature_policy/feature_policy.h" 5 #include "content/common/feature_policy/feature_policy.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 10
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 for (const auto& targetOrigin : origins_) { 102 for (const auto& targetOrigin : origins_) {
103 if (targetOrigin.IsSameOriginWith(origin)) 103 if (targetOrigin.IsSameOriginWith(origin))
104 return true; 104 return true;
105 } 105 }
106 return false; 106 return false;
107 } 107 }
108 108
109 // static 109 // static
110 std::unique_ptr<FeaturePolicy> FeaturePolicy::CreateFromParentPolicy( 110 std::unique_ptr<FeaturePolicy> FeaturePolicy::CreateFromParentPolicy(
111 const FeaturePolicy* parent_policy, 111 const FeaturePolicy* parent_policy,
112 const ParsedFeaturePolicyHeader* container_policy,
112 const url::Origin& origin) { 113 const url::Origin& origin) {
113 return CreateFromParentPolicy(parent_policy, origin, GetDefaultFeatureList()); 114 return CreateFromParentPolicy(parent_policy, container_policy, origin,
115 GetDefaultFeatureList());
114 } 116 }
115 117
116 bool FeaturePolicy::IsFeatureEnabledForOrigin( 118 bool FeaturePolicy::IsFeatureEnabledForOrigin(
117 blink::WebFeaturePolicyFeature feature, 119 blink::WebFeaturePolicyFeature feature,
118 const url::Origin& origin) const { 120 const url::Origin& origin) const {
119 DCHECK(base::ContainsKey(feature_list_, feature)); 121 DCHECK(base::ContainsKey(feature_list_, feature));
120 const FeaturePolicy::Feature* feature_definition = feature_list_.at(feature); 122 const FeaturePolicy::Feature* feature_definition = feature_list_.at(feature);
121 DCHECK(base::ContainsKey(inherited_policies_, feature)); 123 DCHECK(base::ContainsKey(inherited_policies_, feature));
122 if (!inherited_policies_.at(feature)) 124 if (!inherited_policies_.at(feature))
123 return false; 125 return false;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 : origin_(origin), feature_list_(feature_list) {} 160 : origin_(origin), feature_list_(feature_list) {}
159 161
160 FeaturePolicy::FeaturePolicy(url::Origin origin) 162 FeaturePolicy::FeaturePolicy(url::Origin origin)
161 : origin_(origin), feature_list_(GetDefaultFeatureList()) {} 163 : origin_(origin), feature_list_(GetDefaultFeatureList()) {}
162 164
163 FeaturePolicy::~FeaturePolicy() {} 165 FeaturePolicy::~FeaturePolicy() {}
164 166
165 // static 167 // static
166 std::unique_ptr<FeaturePolicy> FeaturePolicy::CreateFromParentPolicy( 168 std::unique_ptr<FeaturePolicy> FeaturePolicy::CreateFromParentPolicy(
167 const FeaturePolicy* parent_policy, 169 const FeaturePolicy* parent_policy,
170 const ParsedFeaturePolicyHeader* container_policy,
168 const url::Origin& origin, 171 const url::Origin& origin,
169 const FeaturePolicy::FeatureList& features) { 172 const FeaturePolicy::FeatureList& features) {
170 std::unique_ptr<FeaturePolicy> new_policy = 173 std::unique_ptr<FeaturePolicy> new_policy =
171 base::WrapUnique(new FeaturePolicy(origin, features)); 174 base::WrapUnique(new FeaturePolicy(origin, features));
172 for (const auto& feature : features) { 175 for (const auto& feature : features) {
173 if (!parent_policy || 176 if (!parent_policy ||
174 parent_policy->IsFeatureEnabledForOrigin(feature.first, origin)) { 177 parent_policy->IsFeatureEnabledForOrigin(feature.first, origin)) {
175 new_policy->inherited_policies_[feature.first] = true; 178 new_policy->inherited_policies_[feature.first] = true;
176 } else { 179 } else {
177 new_policy->inherited_policies_[feature.first] = false; 180 new_policy->inherited_policies_[feature.first] = false;
178 } 181 }
182 if (container_policy)
183 new_policy->AddContainerPolicy(container_policy, parent_policy);
179 } 184 }
180 return new_policy; 185 return new_policy;
181 } 186 }
182 187
188 void FeaturePolicy::AddContainerPolicy(
189 const ParsedFeaturePolicyHeader* container_policy,
190 const FeaturePolicy* parent_policy) {
191 DCHECK(container_policy);
192 DCHECK(parent_policy);
193 for (const ParsedFeaturePolicyDeclaration& parsed_declaration :
194 *container_policy) {
195 // If a feature is enabled in the parent frame, and the parent chooses to
196 // delegate it to the child frame, using the iframe attribute, then the
197 // feature should be enabled in the child frame.
198 blink::WebFeaturePolicyFeature feature =
199 FeatureForName(parsed_declaration.feature_name, feature_list_);
200 if (feature == blink::WebFeaturePolicyFeature::NotFound)
201 continue;
202 if (WhitelistFromDeclaration(parsed_declaration)->Contains(origin_) &&
203 parent_policy->IsFeatureEnabled(feature)) {
204 inherited_policies_[feature] = true;
205 } else {
206 inherited_policies_[feature] = false;
207 }
208 }
209 }
210
183 // static 211 // static
184 const FeaturePolicy::FeatureList& FeaturePolicy::GetDefaultFeatureList() { 212 const FeaturePolicy::FeatureList& FeaturePolicy::GetDefaultFeatureList() {
185 CR_DEFINE_STATIC_LOCAL( 213 CR_DEFINE_STATIC_LOCAL(
186 FeatureList, default_feature_list, 214 FeatureList, default_feature_list,
187 ({{blink::WebFeaturePolicyFeature::DocumentCookie, &kDocumentCookie}, 215 ({{blink::WebFeaturePolicyFeature::DocumentCookie, &kDocumentCookie},
188 {blink::WebFeaturePolicyFeature::DocumentDomain, &kDocumentDomain}, 216 {blink::WebFeaturePolicyFeature::DocumentDomain, &kDocumentDomain},
189 {blink::WebFeaturePolicyFeature::DocumentWrite, &kDocumentWrite}, 217 {blink::WebFeaturePolicyFeature::DocumentWrite, &kDocumentWrite},
190 {blink::WebFeaturePolicyFeature::Fullscreen, &kFullscreenFeature}, 218 {blink::WebFeaturePolicyFeature::Fullscreen, &kFullscreenFeature},
191 {blink::WebFeaturePolicyFeature::Geolocation, &kGeolocationFeature}, 219 {blink::WebFeaturePolicyFeature::Geolocation, &kGeolocationFeature},
192 {blink::WebFeaturePolicyFeature::MidiFeature, &kMidiFeature}, 220 {blink::WebFeaturePolicyFeature::MidiFeature, &kMidiFeature},
193 {blink::WebFeaturePolicyFeature::Notifications, &kNotificationsFeature}, 221 {blink::WebFeaturePolicyFeature::Notifications, &kNotificationsFeature},
194 {blink::WebFeaturePolicyFeature::Payment, &kPaymentFeature}, 222 {blink::WebFeaturePolicyFeature::Payment, &kPaymentFeature},
195 {blink::WebFeaturePolicyFeature::Push, &kPushFeature}, 223 {blink::WebFeaturePolicyFeature::Push, &kPushFeature},
196 {blink::WebFeaturePolicyFeature::SyncScript, &kSyncScript}, 224 {blink::WebFeaturePolicyFeature::SyncScript, &kSyncScript},
197 {blink::WebFeaturePolicyFeature::SyncXHR, &kSyncXHR}, 225 {blink::WebFeaturePolicyFeature::SyncXHR, &kSyncXHR},
198 {blink::WebFeaturePolicyFeature::Usermedia, &kUsermedia}, 226 {blink::WebFeaturePolicyFeature::Usermedia, &kUsermedia},
199 {blink::WebFeaturePolicyFeature::Vibrate, &kVibrateFeature}, 227 {blink::WebFeaturePolicyFeature::Vibrate, &kVibrateFeature},
200 {blink::WebFeaturePolicyFeature::WebRTC, &kWebRTC}})); 228 {blink::WebFeaturePolicyFeature::WebRTC, &kWebRTC}}));
201 return default_feature_list; 229 return default_feature_list;
202 } 230 }
203 231
204 } // namespace content 232 } // namespace content
OLDNEW
« no previous file with comments | « content/common/feature_policy/feature_policy.h ('k') | content/common/feature_policy/feature_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698