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

Side by Side Diff: media/blink/key_system_config_selector.cc

Issue 1124863005: Restrict use of hardware-secure codecs based on the RendererPreference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setsecurity
Patch Set: Correct unittests. Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "key_system_config_selector.h" 5 #include "key_system_config_selector.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 return EmeConfigRule::PERSISTENCE_REQUIRED; 124 return EmeConfigRule::PERSISTENCE_REQUIRED;
125 } 125 }
126 126
127 } // namespace 127 } // namespace
128 128
129 struct KeySystemConfigSelector::SelectionRequest { 129 struct KeySystemConfigSelector::SelectionRequest {
130 std::string key_system; 130 std::string key_system;
131 blink::WebVector<blink::WebMediaKeySystemConfiguration> 131 blink::WebVector<blink::WebMediaKeySystemConfiguration>
132 candidate_configurations; 132 candidate_configurations;
133 blink::WebSecurityOrigin security_origin; 133 blink::WebSecurityOrigin security_origin;
134 base::Callback<void(const blink::WebMediaKeySystemConfiguration&)> 134 base::Callback<void(const blink::WebMediaKeySystemConfiguration&, bool)>
135 succeeded_cb; 135 succeeded_cb;
136 base::Callback<void(const blink::WebString&)> not_supported_cb; 136 base::Callback<void(const blink::WebString&)> not_supported_cb;
137 bool was_permission_requested = false; 137 bool was_permission_requested = false;
138 bool is_permission_granted = false; 138 bool is_permission_granted = false;
139 bool are_secure_codecs_supported = false;
139 }; 140 };
140 141
141 // Accumulates configuration rules to determine if a feature (additional 142 // Accumulates configuration rules to determine if a feature (additional
142 // configuration rule) can be added to an accumulated configuration. 143 // configuration rule) can be added to an accumulated configuration.
143 class KeySystemConfigSelector::ConfigState { 144 class KeySystemConfigSelector::ConfigState {
144 public: 145 public:
145 ConfigState(bool was_permission_requested, bool is_permission_granted) 146 ConfigState(bool was_permission_requested, bool is_permission_granted)
146 : was_permission_requested_(was_permission_requested), 147 : was_permission_requested_(was_permission_requested),
147 is_permission_granted_(is_permission_granted) {} 148 is_permission_granted_(is_permission_granted) {}
148 149
149 bool IsPermissionGranted() const { return is_permission_granted_; } 150 bool IsPermissionGranted() const { return is_permission_granted_; }
150 151
151 // Permission is possible if it has not been denied. 152 // Permission is possible if it has not been denied.
152 bool IsPermissionPossible() const { 153 bool IsPermissionPossible() const {
153 return is_permission_granted_ || !was_permission_requested_; 154 return is_permission_granted_ || !was_permission_requested_;
154 } 155 }
155 156
156 bool IsIdentifierRequired() const { return is_identifier_required_; } 157 bool IsIdentifierRequired() const { return is_identifier_required_; }
157 158
158 bool IsIdentifierRecommended() const { return is_identifier_recommended_; } 159 bool IsIdentifierRecommended() const { return is_identifier_recommended_; }
159 160
161 bool AreSecureCodecsRequired() const {
162 return are_secure_codecs_required_;
163 }
164
160 // Checks whether a rule is compatible with all previously added rules. 165 // Checks whether a rule is compatible with all previously added rules.
161 bool IsRuleSupported(EmeConfigRule rule) const { 166 bool IsRuleSupported(EmeConfigRule rule) const {
162 switch (rule) { 167 switch (rule) {
163 case EmeConfigRule::NOT_SUPPORTED: 168 case EmeConfigRule::NOT_SUPPORTED:
164 return false; 169 return false;
165 case EmeConfigRule::IDENTIFIER_NOT_ALLOWED: 170 case EmeConfigRule::IDENTIFIER_NOT_ALLOWED:
166 return !is_identifier_required_; 171 return !is_identifier_required_;
167 case EmeConfigRule::IDENTIFIER_REQUIRED: 172 case EmeConfigRule::IDENTIFIER_REQUIRED:
168 // TODO(sandersd): Confirm if we should be refusing these rules when 173 // TODO(sandersd): Confirm if we should be refusing these rules when
169 // permission has been denied (as the spec currently says). 174 // permission has been denied (as the spec currently says).
170 return !is_identifier_not_allowed_ && IsPermissionPossible(); 175 return !is_identifier_not_allowed_ && IsPermissionPossible();
171 case EmeConfigRule::IDENTIFIER_RECOMMENDED: 176 case EmeConfigRule::IDENTIFIER_RECOMMENDED:
172 return true; 177 return true;
173 case EmeConfigRule::PERSISTENCE_NOT_ALLOWED: 178 case EmeConfigRule::PERSISTENCE_NOT_ALLOWED:
174 return !is_persistence_required_; 179 return !is_persistence_required_;
175 case EmeConfigRule::PERSISTENCE_REQUIRED: 180 case EmeConfigRule::PERSISTENCE_REQUIRED:
176 return !is_persistence_not_allowed_; 181 return !is_persistence_not_allowed_;
177 case EmeConfigRule::IDENTIFIER_AND_PERSISTENCE_REQUIRED: 182 case EmeConfigRule::IDENTIFIER_AND_PERSISTENCE_REQUIRED:
178 return (!is_identifier_not_allowed_ && IsPermissionPossible() && 183 return (!is_identifier_not_allowed_ && IsPermissionPossible() &&
179 !is_persistence_not_allowed_); 184 !is_persistence_not_allowed_);
180 #if defined(OS_ANDROID)
181 case EmeConfigRule::SECURE_CODECS_NOT_ALLOWED: 185 case EmeConfigRule::SECURE_CODECS_NOT_ALLOWED:
182 return !are_secure_codecs_required_; 186 return !are_secure_codecs_required_;
183 case EmeConfigRule::SECURE_CODECS_REQUIRED: 187 case EmeConfigRule::SECURE_CODECS_REQUIRED:
184 return !are_secure_codecs_not_allowed_; 188 return !are_secure_codecs_not_allowed_;
185 #endif // defined(OS_ANDROID)
186 case EmeConfigRule::SUPPORTED: 189 case EmeConfigRule::SUPPORTED:
187 return true; 190 return true;
188 } 191 }
189 NOTREACHED(); 192 NOTREACHED();
190 return false; 193 return false;
191 } 194 }
192 195
193 // Add a rule to the accumulated configuration state. 196 // Add a rule to the accumulated configuration state.
194 void AddRule(EmeConfigRule rule) { 197 void AddRule(EmeConfigRule rule) {
195 DCHECK(IsRuleSupported(rule)); 198 DCHECK(IsRuleSupported(rule));
(...skipping 13 matching lines...) Expand all
209 case EmeConfigRule::PERSISTENCE_NOT_ALLOWED: 212 case EmeConfigRule::PERSISTENCE_NOT_ALLOWED:
210 is_persistence_not_allowed_ = true; 213 is_persistence_not_allowed_ = true;
211 return; 214 return;
212 case EmeConfigRule::PERSISTENCE_REQUIRED: 215 case EmeConfigRule::PERSISTENCE_REQUIRED:
213 is_persistence_required_ = true; 216 is_persistence_required_ = true;
214 return; 217 return;
215 case EmeConfigRule::IDENTIFIER_AND_PERSISTENCE_REQUIRED: 218 case EmeConfigRule::IDENTIFIER_AND_PERSISTENCE_REQUIRED:
216 is_identifier_required_ = true; 219 is_identifier_required_ = true;
217 is_persistence_required_ = true; 220 is_persistence_required_ = true;
218 return; 221 return;
219 #if defined(OS_ANDROID)
220 case EmeConfigRule::SECURE_CODECS_NOT_ALLOWED: 222 case EmeConfigRule::SECURE_CODECS_NOT_ALLOWED:
221 are_secure_codecs_not_allowed_ = true; 223 are_secure_codecs_not_allowed_ = true;
222 return; 224 return;
223 case EmeConfigRule::SECURE_CODECS_REQUIRED: 225 case EmeConfigRule::SECURE_CODECS_REQUIRED:
224 are_secure_codecs_required_ = true; 226 are_secure_codecs_required_ = true;
225 return; 227 return;
226 #endif // defined(OS_ANDROID)
227 case EmeConfigRule::SUPPORTED: 228 case EmeConfigRule::SUPPORTED:
228 return; 229 return;
229 } 230 }
230 NOTREACHED(); 231 NOTREACHED();
231 } 232 }
232 233
233 private: 234 private:
234 // Whether permission to use a distinctive identifier was requested. If set, 235 // Whether permission to use a distinctive identifier was requested. If set,
235 // |is_permission_granted_| represents the final decision. 236 // |is_permission_granted_| represents the final decision.
236 // (Not changed by adding rules.) 237 // (Not changed by adding rules.)
237 bool was_permission_requested_; 238 bool was_permission_requested_;
238 239
239 // Whether permission to use a distinctive identifier has been granted. 240 // Whether permission to use a distinctive identifier has been granted.
240 // (Not changed by adding rules.) 241 // (Not changed by adding rules.)
241 bool is_permission_granted_; 242 bool is_permission_granted_;
242 243
243 // Whether a rule has been added that requires or blocks a distinctive 244 // Whether a rule has been added that requires or blocks a distinctive
244 // identifier. 245 // identifier.
245 bool is_identifier_required_ = false; 246 bool is_identifier_required_ = false;
246 bool is_identifier_not_allowed_ = false; 247 bool is_identifier_not_allowed_ = false;
247 248
248 // Whether a rule has been added that recommends a distinctive identifier. 249 // Whether a rule has been added that recommends a distinctive identifier.
249 bool is_identifier_recommended_ = false; 250 bool is_identifier_recommended_ = false;
250 251
251 // Whether a rule has been added that requires or blocks persistent state. 252 // Whether a rule has been added that requires or blocks persistent state.
252 bool is_persistence_required_ = false; 253 bool is_persistence_required_ = false;
253 bool is_persistence_not_allowed_ = false; 254 bool is_persistence_not_allowed_ = false;
254 255
255 #if defined(OS_ANDROID) 256 // Whether a rule has been added that requires or blocks hardware-secure
256 // Whether a rule has been added that requires or blocks secure codecs. 257 // codecs.
257 bool are_secure_codecs_required_ = false; 258 bool are_secure_codecs_required_ = false;
258 bool are_secure_codecs_not_allowed_ = false; 259 bool are_secure_codecs_not_allowed_ = false;
259 #endif // defined(OS_ANDROID)
260 }; 260 };
261 261
262 KeySystemConfigSelector::KeySystemConfigSelector( 262 KeySystemConfigSelector::KeySystemConfigSelector(
263 const KeySystems* key_systems, 263 const KeySystems* key_systems,
264 MediaPermission* media_permission) 264 MediaPermission* media_permission)
265 : key_systems_(key_systems), 265 : key_systems_(key_systems),
266 media_permission_(media_permission), 266 media_permission_(media_permission),
267 weak_factory_(this) { 267 weak_factory_(this) {
268 DCHECK(key_systems_); 268 DCHECK(key_systems_);
269 DCHECK(media_permission_); 269 DCHECK(media_permission_);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 // 5. Return media type capabilities. 385 // 5. Return media type capabilities.
386 return true; 386 return true;
387 } 387 }
388 388
389 KeySystemConfigSelector::ConfigurationSupport 389 KeySystemConfigSelector::ConfigurationSupport
390 KeySystemConfigSelector::GetSupportedConfiguration( 390 KeySystemConfigSelector::GetSupportedConfiguration(
391 const std::string& key_system, 391 const std::string& key_system,
392 const blink::WebMediaKeySystemConfiguration& candidate, 392 const blink::WebMediaKeySystemConfiguration& candidate,
393 ConfigState* config_state, 393 ConfigState* config_state,
394 blink::WebMediaKeySystemConfiguration* accumulated_configuration) { 394 blink::WebMediaKeySystemConfiguration* accumulated_configuration) {
395 // TODO(sandersd): Set state of SECURE_CODECS from renderer pref.
396 // From https://w3c.github.io/encrypted-media/#get-supported-configuration 395 // From https://w3c.github.io/encrypted-media/#get-supported-configuration
397 // 1. Let accumulated configuration be empty. (Done by caller.) 396 // 1. Let accumulated configuration be empty. (Done by caller.)
398 // 2. If the initDataTypes member is present in candidate configuration, run 397 // 2. If the initDataTypes member is present in candidate configuration, run
399 // the following steps: 398 // the following steps:
400 if (candidate.hasInitDataTypes) { 399 if (candidate.hasInitDataTypes) {
401 // 2.1. Let supported types be empty. 400 // 2.1. Let supported types be empty.
402 std::vector<blink::WebEncryptedMediaInitDataType> supported_types; 401 std::vector<blink::WebEncryptedMediaInitDataType> supported_types;
403 402
404 // 2.2. For each value in candidate configuration's initDataTypes member: 403 // 2.2. For each value in candidate configuration's initDataTypes member:
405 for (size_t i = 0; i < candidate.initDataTypes.size(); i++) { 404 for (size_t i = 0; i < candidate.initDataTypes.size(); i++) {
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 665
667 // 17. Return accumulated configuration. 666 // 17. Return accumulated configuration.
668 return CONFIGURATION_SUPPORTED; 667 return CONFIGURATION_SUPPORTED;
669 } 668 }
670 669
671 void KeySystemConfigSelector::SelectConfig( 670 void KeySystemConfigSelector::SelectConfig(
672 const blink::WebString& key_system, 671 const blink::WebString& key_system,
673 const blink::WebVector<blink::WebMediaKeySystemConfiguration>& 672 const blink::WebVector<blink::WebMediaKeySystemConfiguration>&
674 candidate_configurations, 673 candidate_configurations,
675 const blink::WebSecurityOrigin& security_origin, 674 const blink::WebSecurityOrigin& security_origin,
676 base::Callback<void(const blink::WebMediaKeySystemConfiguration&)> 675 bool are_secure_codecs_supported,
676 base::Callback<void(const blink::WebMediaKeySystemConfiguration&, bool)>
677 succeeded_cb, 677 succeeded_cb,
678 base::Callback<void(const blink::WebString&)> not_supported_cb) { 678 base::Callback<void(const blink::WebString&)> not_supported_cb) {
679 // Continued from requestMediaKeySystemAccess(), step 7, from 679 // Continued from requestMediaKeySystemAccess(), step 7, from
680 // https://w3c.github.io/encrypted-media/#requestmediakeysystemaccess 680 // https://w3c.github.io/encrypted-media/#requestmediakeysystemaccess
681 // 681 //
682 // 7.1. If keySystem is not one of the Key Systems supported by the user 682 // 7.1. If keySystem is not one of the Key Systems supported by the user
683 // agent, reject promise with with a new DOMException whose name is 683 // agent, reject promise with with a new DOMException whose name is
684 // NotSupportedError. String comparison is case-sensitive. 684 // NotSupportedError. String comparison is case-sensitive.
685 if (!base::IsStringASCII(key_system)) { 685 if (!base::IsStringASCII(key_system)) {
686 not_supported_cb.Run("Only ASCII keySystems are supported"); 686 not_supported_cb.Run("Only ASCII keySystems are supported");
687 return; 687 return;
688 } 688 }
689 689
690 std::string key_system_ascii = base::UTF16ToASCII(key_system); 690 std::string key_system_ascii = base::UTF16ToASCII(key_system);
691 if (!key_systems_->IsSupportedKeySystem(key_system_ascii)) { 691 if (!key_systems_->IsSupportedKeySystem(key_system_ascii)) {
692 not_supported_cb.Run("Unsupported keySystem"); 692 not_supported_cb.Run("Unsupported keySystem");
693 return; 693 return;
694 } 694 }
695 695
696 // 7.2-7.4. Implemented by OnSelectConfig(). 696 // 7.2-7.4. Implemented by OnSelectConfig().
697 // TODO(sandersd): This should be async, ideally not on the main thread. 697 // TODO(sandersd): This should be async, ideally not on the main thread.
698 scoped_ptr<SelectionRequest> request(new SelectionRequest()); 698 scoped_ptr<SelectionRequest> request(new SelectionRequest());
699 request->key_system = key_system_ascii; 699 request->key_system = key_system_ascii;
700 request->candidate_configurations = candidate_configurations; 700 request->candidate_configurations = candidate_configurations;
701 request->security_origin = security_origin; 701 request->security_origin = security_origin;
702 request->are_secure_codecs_supported = are_secure_codecs_supported;
702 request->succeeded_cb = succeeded_cb; 703 request->succeeded_cb = succeeded_cb;
703 request->not_supported_cb = not_supported_cb; 704 request->not_supported_cb = not_supported_cb;
704 SelectConfigInternal(request.Pass()); 705 SelectConfigInternal(request.Pass());
705 } 706 }
706 707
707 void KeySystemConfigSelector::SelectConfigInternal( 708 void KeySystemConfigSelector::SelectConfigInternal(
708 scoped_ptr<SelectionRequest> request) { 709 scoped_ptr<SelectionRequest> request) {
709 // Continued from requestMediaKeySystemAccess(), step 7.1, from 710 // Continued from requestMediaKeySystemAccess(), step 7.1, from
710 // https://w3c.github.io/encrypted-media/#requestmediakeysystemaccess 711 // https://w3c.github.io/encrypted-media/#requestmediakeysystemaccess
711 // 712 //
712 // 7.2. Let implementation be the implementation of keySystem. 713 // 7.2. Let implementation be the implementation of keySystem.
713 // (|key_systems_| fills this role.) 714 // (|key_systems_| fills this role.)
714 // 7.3. For each value in supportedConfigurations: 715 // 7.3. For each value in supportedConfigurations:
715 for (size_t i = 0; i < request->candidate_configurations.size(); i++) { 716 for (size_t i = 0; i < request->candidate_configurations.size(); i++) {
716 // 7.3.1. Let candidate configuration be the value. 717 // 7.3.1. Let candidate configuration be the value.
717 // 7.3.2. Let supported configuration be the result of executing the Get 718 // 7.3.2. Let supported configuration be the result of executing the Get
718 // Supported Configuration algorithm on implementation, candidate 719 // Supported Configuration algorithm on implementation, candidate
719 // configuration, and origin. 720 // configuration, and origin.
720 // 7.3.3. If supported configuration is not null, [initialize and return a 721 // 7.3.3. If supported configuration is not null, [initialize and return a
721 // new MediaKeySystemAccess object.] 722 // new MediaKeySystemAccess object.]
722 ConfigState config_state(request->was_permission_requested, 723 ConfigState config_state(request->was_permission_requested,
723 request->is_permission_granted); 724 request->is_permission_granted);
725 DCHECK(config_state.IsRuleSupported(
726 EmeConfigRule::SECURE_CODECS_NOT_ALLOWED));
727 if (!request->are_secure_codecs_supported)
728 config_state.AddRule(EmeConfigRule::SECURE_CODECS_NOT_ALLOWED);
724 blink::WebMediaKeySystemConfiguration accumulated_configuration; 729 blink::WebMediaKeySystemConfiguration accumulated_configuration;
725 ConfigurationSupport support = GetSupportedConfiguration( 730 ConfigurationSupport support = GetSupportedConfiguration(
726 request->key_system, request->candidate_configurations[i], 731 request->key_system, request->candidate_configurations[i],
727 &config_state, &accumulated_configuration); 732 &config_state, &accumulated_configuration);
728 switch (support) { 733 switch (support) {
729 case CONFIGURATION_NOT_SUPPORTED: 734 case CONFIGURATION_NOT_SUPPORTED:
730 continue; 735 continue;
731 case CONFIGURATION_REQUIRES_PERMISSION: 736 case CONFIGURATION_REQUIRES_PERMISSION:
732 if (request->was_permission_requested) { 737 if (request->was_permission_requested) {
733 DVLOG(2) << "Rejecting requested configuration because " 738 DVLOG(2) << "Rejecting requested configuration because "
734 << "permission was denied."; 739 << "permission was denied.";
735 continue; 740 continue;
736 } 741 }
737 media_permission_->RequestPermission( 742 media_permission_->RequestPermission(
738 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, 743 MediaPermission::PROTECTED_MEDIA_IDENTIFIER,
739 GURL(request->security_origin.toString()), 744 GURL(request->security_origin.toString()),
740 base::Bind(&KeySystemConfigSelector::OnPermissionResult, 745 base::Bind(&KeySystemConfigSelector::OnPermissionResult,
741 weak_factory_.GetWeakPtr(), base::Passed(&request))); 746 weak_factory_.GetWeakPtr(), base::Passed(&request)));
742 return; 747 return;
743 case CONFIGURATION_SUPPORTED: 748 case CONFIGURATION_SUPPORTED:
744 request->succeeded_cb.Run(accumulated_configuration); 749 request->succeeded_cb.Run(accumulated_configuration,
750 config_state.AreSecureCodecsRequired());
745 return; 751 return;
746 } 752 }
747 } 753 }
748 754
749 // 7.4. Reject promise with a new DOMException whose name is 755 // 7.4. Reject promise with a new DOMException whose name is
750 // NotSupportedError. 756 // NotSupportedError.
751 request->not_supported_cb.Run( 757 request->not_supported_cb.Run(
752 "None of the requested configurations were supported."); 758 "None of the requested configurations were supported.");
753 } 759 }
754 760
755 void KeySystemConfigSelector::OnPermissionResult( 761 void KeySystemConfigSelector::OnPermissionResult(
756 scoped_ptr<SelectionRequest> request, 762 scoped_ptr<SelectionRequest> request,
757 bool is_permission_granted) { 763 bool is_permission_granted) {
758 request->was_permission_requested = true; 764 request->was_permission_requested = true;
759 request->is_permission_granted = is_permission_granted; 765 request->is_permission_granted = is_permission_granted;
760 SelectConfigInternal(request.Pass()); 766 SelectConfigInternal(request.Pass());
761 } 767 }
762 768
763 } // namespace media 769 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/key_system_config_selector.h ('k') | media/blink/key_system_config_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698