third_party/WebKit/LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html - Issue 2678433003: media: Require SecureContext for EME APIs

Side by Side Diff: third_party/WebKit/LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin.html

Issue 2678433003: media: Require SecureContext for EME APIs (Closed)

Patch Set: rebase & fix upload error 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:

« no previous file with comments | « android_webview/test/shell/assets/key-system-test.html ('k') | third_party/WebKit/LayoutTests/http/tests/security/powerfulFeatureRestrictions/old-powerful-features-on-insecure-origin-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-unique-origin.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html manifest="/security/powerfulFeatureRestrictions/resources/simple.manifest" >	2 <html manifest="/security/powerfulFeatureRestrictions/resources/simple.manifest" >

3 <head>	3 <head>

4 <title>Old Powerful Features on an Insecure Origin</title>	4 <title>Old Powerful Features on an Insecure Origin</title>

5 </head>	5 </head>

6 <script src="/resources/testharness.js"></script>	6 <script src="/resources/testharness.js"></script>

7 <script src="/resources/testharnessreport.js"></script>	7 <script src="/resources/testharnessreport.js"></script>

8 <script src="/resources/get-host-info.js"></script>	8 <script src="/resources/get-host-info.js"></script>

9	9

10 <body>	10 <body>

11 <div id="target"></div>	11 <div id="target"></div>

12 <script>	12 <script>

13 if (window.location.origin != get_host_info().UNAUTHENTICATED_ORIGIN) {	13 if (window.location.origin != get_host_info().UNAUTHENTICATED_ORIGIN) {

14 window.location = get_host_info().UNAUTHENTICATED_ORIGIN + window.location.p athname;	14 window.location = get_host_info().UNAUTHENTICATED_ORIGIN + window.location.p athname;

15 } else {	15 } else {

16 if (!window.internals)	16 if (!window.internals)

17 assert_unreached('window.internals is required for this test');	17 assert_unreached('window.internals is required for this test');

18	18

19

20 // Tests for APIs that are deprecated, but still allowed, on	19 // Tests for APIs that are deprecated, but still allowed, on

21 // insecure origins	20 // insecure origins

22 async_test(function() {	21 async_test(function() {

23 testRunner.setMockDeviceMotion(true, 0, true, 0, true, 0,	22 testRunner.setMockDeviceMotion(true, 0, true, 0, true, 0,

24 true, 0, true, 0, true, 0,	23 true, 0, true, 0, true, 0,

25 true, 0, true, 0, true, 0,	24 true, 0, true, 0, true, 0,

26 0);	25 0);

27 window.addEventListener('devicemotion', this.step_func_done());	26 window.addEventListener('devicemotion', this.step_func_done());

28 }, 'device motion');	27 }, 'device motion');

29	28

30 async_test(function() {	29 async_test(function() {

31 testRunner.setMockDeviceOrientation(11.1, 22.2, 33.3, true);	30 testRunner.setMockDeviceOrientation(11.1, 22.2, 33.3, true);

32 window.addEventListener('deviceorientation', this.step_func_done());	31 window.addEventListener('deviceorientation', this.step_func_done());

33 }, 'device orientation');	32 }, 'device orientation');

34	33

35 promise_test(function(test) {

36 return navigator.requestMediaKeySystemAccess('org.w3.clearkey',

37 [{ videoCapabilities: [{contentType: 'video/webm; codecs="vp9"'}] }] );

38 }, 'requestMediaKeySystemAccess');

39

40 // Tests for APIs that have been turned off on insecure origins	34 // Tests for APIs that have been turned off on insecure origins

41 async_test(function() {	35 async_test(function() {

42 navigator.geolocation.getCurrentPosition(	36 navigator.geolocation.getCurrentPosition(

43 this.unreached_func('getCurrentPosition should fail, but succeeded.' ),	37 this.unreached_func('getCurrentPosition should fail, but succeeded.' ),

44 this.step_func_done(function(error) {	38 this.step_func_done(function(error) {

45 assert_equals(error.code, error.PERMISSION_DENIED);	39 assert_equals(error.code, error.PERMISSION_DENIED);

46 }));	40 }));

47 }, 'getCurrentPosition');	41 }, 'getCurrentPosition');

48	42

49 // Note that the deprecation message for watchPosition() will be suppressed	43 // Note that the deprecation message for watchPosition() will be suppressed

(...skipping 30 matching lines...) Expand all Loading...
80 assert_equals(response.status, 200);	74 assert_equals(response.status, 200);

81 response.text().then(this.step_func_done(function(data) {	75 response.text().then(this.step_func_done(function(data) {

82 assert_equals(data, "Hello, World!");	76 assert_equals(data, "Hello, World!");

83 }));	77 }));

84 }))	78 }))

85 .catch(this.unreached_func("fetch() for cachable resource unexpe ctedly failed"));	79 .catch(this.unreached_func("fetch() for cachable resource unexpe ctedly failed"));

86 });	80 });

87	81

88 applicationCache.addEventListener('cached', cached, false);	82 applicationCache.addEventListener('cached', cached, false);

89 }, 'appcache');	83 }, 'appcache');

	84

	85 test(function() {

	86 assert_false(navigator.hasOwnProperty('requestMediaKeySystemAccess'),
	foolip 2017/02/07 00:06:11 navigator.hasOwnProperty('requestMediaKeySystemAcc navigator.hasOwnProperty('requestMediaKeySystemAccess') was false before this change as well because the method is on the prototype. assert_false('requestMediaKeySystemAccess' in navigator) or assert_equals(typeof navigator.requestMediaKeySystemAccess, "undefined") would work. I'd suggest omitting the assert description since there's just one in the test. (If kept, it should ideally describe the actual value, i.e. the first argument, the resulting error messages make more sense this way.) xhwang 2017/02/07 00:23:56 I am not super familiar with this code, but here's Show quoted text On 2017/02/07 00:06:11, foolip wrote: > navigator.hasOwnProperty('requestMediaKeySystemAccess') was false before this > change as well because the method is on the prototype. > assert_false('requestMediaKeySystemAccess' in navigator) or assert_equals(typeof > navigator.requestMediaKeySystemAccess, "undefined") would work. I am not super familiar with this code, but here's what I think how things work. navigator is the same as window.navigator which returns a reference to the Navigator object. So you don't need the "prototype" part. https://developer.mozilla.org/en-US/docs/Web/API/Window/navigator Navigator (note the uppercase N) is the interface, so you would need the prototype part. I tried without my change that both of the following return true: navigator.hasOwnProperty('requestMediaKeySystemAccess') Navigator.prototype.hasOwnProperty('requestMediaKeySystemAccess') I actually had "'requestMediaKeySystemAccess' in navigator" first, but then felt hasOwnProperty() would seem a better way to do it. But I really don't have any strong opinion. With the explanation above, do you still recommend to use "'requestMediaKeySystemAccess' in navigator" in the test? Show quoted text > I'd suggest omitting the assert description since there's just one in the test. > (If kept, it should ideally describe the actual value, i.e. the first argument, > the resulting error messages make more sense this way.) Will do. foolip 2017/02/07 00:27:12 That's odd, I've tested in Chrome Stable and Chrom Show quoted text On 2017/02/07 00:23:56, xhwang_slow wrote: > On 2017/02/07 00:06:11, foolip wrote: > > navigator.hasOwnProperty('requestMediaKeySystemAccess') was false before this > > change as well because the method is on the prototype. > > assert_false('requestMediaKeySystemAccess' in navigator) or > assert_equals(typeof > > navigator.requestMediaKeySystemAccess, "undefined") would work. > > I am not super familiar with this code, but here's what I think how things work. > > navigator is the same as window.navigator which returns a reference to the > Navigator object. So you don't need the "prototype" part. > https://developer.mozilla.org/en-US/docs/Web/API/Window/navigator > > Navigator (note the uppercase N) is the interface, so you would need the > prototype part. > > I tried without my change that both of the following return true: > > navigator.hasOwnProperty('requestMediaKeySystemAccess') > Navigator.prototype.hasOwnProperty('requestMediaKeySystemAccess') > > I actually had "'requestMediaKeySystemAccess' in navigator" first, but then felt > hasOwnProperty() would seem a better way to do it. > > But I really don't have any strong opinion. With the explanation above, do you > still recommend to use "'requestMediaKeySystemAccess' in navigator" in the test? That's odd, I've tested in Chrome Stable and Chrome Canary, and in both navigator.hasOwnProperty('requestMediaKeySystemAccess') are false even though navigator.requestMediaKeySystemAccess exists and is a method. Navigator.prototype.hasOwnProperty('requestMediaKeySystemAccess') is true though, which is precisely what I expected. Can you re-confirm that navigator.hasOwnProperty('requestMediaKeySystemAccess') returns true on ToT without these changes?
	87 'navigator.requestMediaKeySystemAccess should not be available.');

	88 }, 'requestMediaKeySystemAccess');

90 }	89 }

91 </script>	90 </script>

92 </body>	91 </body>

93 </html>	92 </html>

OLD	NEW