Skip to content

Commit 876647d

Browse files
committed
Bug 1690981 [wpt PR 27500] - CSP: Remove 'plugin-types' directive, a=testonly
Automatic update from web-platform-tests CSP: Remove 'plugin-types' directive The Content Security Policy directive 'plugin-types' is being removed by the specification (w3c/webappsec-csp#456). This CL removes the code parsing and checking the 'plugin-types' directive from Blink and from the services/network CSP parser. All WP tests for plugin-types are removed, too. When parsing a plugin-types directive, we display a console error message informing that the directive has been removed and that object-src can be used instead. Bug: 1168001 Change-Id: I61420677a0f11f8daf46c473e578d66c932751d1 Cq-Do-Not-Cancel-Tryjobs: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2643282 Reviewed-by: Arthur Sonzogni <arthursonzognichromium.org> Reviewed-by: Mike West <mkwstchromium.org> Commit-Queue: Antonio Sartori <antoniosartorichromium.org> Cr-Commit-Position: refs/heads/master{#851760} -- wpt-commits: 8959b13684b68186781340c044d9c1b62a388358 wpt-pr: 27500 UltraBlame original commit: d137cd61151f86944a50e788d152c45f3323d3a8
1 parent 1096f3f commit 876647d

9 files changed

Lines changed: 59 additions & 1346 deletions

testing/web-platform/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html

Lines changed: 59 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,17 +1014,14 @@
10141014
"
10151015
:
10161016
"
1017-
Iframe
1018-
should
1019-
block
1020-
if
1017+
Removed
10211018
plugin
10221019
-
10231020
types
10241021
directive
1025-
is
1026-
not
1027-
subsumed
1022+
should
1023+
be
1024+
ignored
10281025
.
10291026
"
10301027
"
@@ -1050,24 +1047,23 @@
10501047
:
10511048
IframeLoad
10521049
.
1053-
EXPECT_BLOCK
1050+
EXPECT_LOAD
10541051
}
10551052
{
10561053
"
10571054
name
10581055
"
10591056
:
10601057
"
1061-
Iframe
1062-
should
1063-
load
1064-
if
1058+
Removed
10651059
plugin
10661060
-
10671061
types
10681062
directive
1069-
is
1070-
subsumed
1063+
should
1064+
be
1065+
ignored
1066+
2
10711067
.
10721068
"
10731069
"
@@ -1109,6 +1105,55 @@
11091105
.
11101106
EXPECT_LOAD
11111107
}
1108+
{
1109+
"
1110+
name
1111+
"
1112+
:
1113+
"
1114+
Removed
1115+
plugin
1116+
-
1117+
types
1118+
directive
1119+
should
1120+
be
1121+
ignored
1122+
3
1123+
.
1124+
"
1125+
"
1126+
required_csp
1127+
"
1128+
:
1129+
"
1130+
style
1131+
-
1132+
src
1133+
'
1134+
none
1135+
'
1136+
;
1137+
plugin
1138+
-
1139+
types
1140+
application
1141+
/
1142+
pdf
1143+
"
1144+
"
1145+
returned_csp
1146+
"
1147+
:
1148+
null
1149+
"
1150+
expected
1151+
"
1152+
:
1153+
IframeLoad
1154+
.
1155+
EXPECT_BLOCK
1156+
}
11121157
]
11131158
;
11141159
tests

testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-empty.sub.html

Lines changed: 0 additions & 187 deletions
This file was deleted.

0 commit comments

Comments
 (0)