Title: [196653] trunk
Revision
196653
Author
[email protected]
Date
2016-02-16 13:16:18 -0800 (Tue, 16 Feb 2016)

Log Message

CSP: Disallow an empty host in a host-source source _expression_
https://bugs.webkit.org/show_bug.cgi?id=153168
<rdar://problem/24383366>

Reviewed by Brent Fulgham.

Source/WebCore:

Merged from Blink (patch by [email protected]):
<https://src.chromium.org/viewvc/blink?revision=180407&view=revision>

* page/csp/ContentSecurityPolicySourceList.cpp:
(WebCore::ContentSecurityPolicySourceList::parseSource):

LayoutTests:

Remove entry for test http/tests/security/contentSecurityPolicy/source-list-parsing-07.html
as it now passes.

* TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (196652 => 196653)


--- trunk/LayoutTests/ChangeLog	2016-02-16 21:12:04 UTC (rev 196652)
+++ trunk/LayoutTests/ChangeLog	2016-02-16 21:16:18 UTC (rev 196653)
@@ -1,3 +1,16 @@
+2016-02-16  Daniel Bates  <[email protected]>
+
+        CSP: Disallow an empty host in a host-source source _expression_
+        https://bugs.webkit.org/show_bug.cgi?id=153168
+        <rdar://problem/24383366>
+
+        Reviewed by Brent Fulgham.
+
+        Remove entry for test http/tests/security/contentSecurityPolicy/source-list-parsing-07.html
+        as it now passes.
+
+        * TestExpectations:
+
 2016-02-16  Chris Dumez  <[email protected]>
 
         [Web IDL] Operations should be on the instance for global objects or if [Unforgeable]

Modified: trunk/LayoutTests/TestExpectations (196652 => 196653)


--- trunk/LayoutTests/TestExpectations	2016-02-16 21:12:04 UTC (rev 196652)
+++ trunk/LayoutTests/TestExpectations	2016-02-16 21:16:18 UTC (rev 196653)
@@ -833,7 +833,6 @@
 webkit.org/b/153166 http/tests/security/contentSecurityPolicy/report-uri.html [ Failure ]
 webkit.org/b/153166 webkit.org/b/153242 http/tests/security/contentSecurityPolicy/report-and-enforce.html [ Failure ]
 webkit.org/b/153166 webkit.org/b/153242 http/tests/security/contentSecurityPolicy/report-blocked-data-uri.html [ Failure ]
-webkit.org/b/153168 http/tests/security/contentSecurityPolicy/source-list-parsing-07.html [ Failure ]
 webkit.org/b/153170 http/tests/security/contentSecurityPolicy/source-list-parsing-paths-03.html [ Failure ]
 http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html [ Pass Failure ]
 

Modified: trunk/Source/WebCore/ChangeLog (196652 => 196653)


--- trunk/Source/WebCore/ChangeLog	2016-02-16 21:12:04 UTC (rev 196652)
+++ trunk/Source/WebCore/ChangeLog	2016-02-16 21:16:18 UTC (rev 196653)
@@ -1,3 +1,17 @@
+2016-02-16  Daniel Bates  <[email protected]>
+
+        CSP: Disallow an empty host in a host-source source _expression_
+        https://bugs.webkit.org/show_bug.cgi?id=153168
+        <rdar://problem/24383366>
+
+        Reviewed by Brent Fulgham.
+
+        Merged from Blink (patch by [email protected]):
+        <https://src.chromium.org/viewvc/blink?revision=180407&view=revision>
+
+        * page/csp/ContentSecurityPolicySourceList.cpp:
+        (WebCore::ContentSecurityPolicySourceList::parseSource):
+
 2016-02-16  Brady Eidson  <[email protected]>
 
         Modern IDB: WK2 IPC Scaffolding.

Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp (196652 => 196653)


--- trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp	2016-02-16 21:12:04 UTC (rev 196652)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp	2016-02-16 21:16:18 UTC (rev 196653)
@@ -221,7 +221,7 @@
                 || !skipExactly<UChar>(position, end, '/'))
                 return false;
             if (position == end)
-                return true;
+                return false;
             beginHost = position;
             skipWhile<UChar, isNotColonOrSlash>(position, end);
         }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to