Changeset 285800 in webkit

Timestamp:

Nov 15, 2021 12:42:39 AM (8 months ago)

Author:

Patrick Griffis

Message:

CSP: Fix missing lineNumber and columnNumber in inline violation reports
​https://bugs.webkit.org/show_bug.cgi?id=233102

Reviewed by Carlos Garcia Campos.

LayoutTests/imported/w3c:

Update expectations as passing.

• web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-inline-expected.txt:

Source/WebCore:

• page/csp/ContentSecurityPolicy.cpp:

(WebCore::ContentSecurityPolicy::reportViolation const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-inline-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/csp/ContentSecurityPolicy.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-11-15  Patrick Griffis  <pgriffis@igalia.com>
+
+        CSP: Fix missing lineNumber and columnNumber in inline violation reports
+        https://bugs.webkit.org/show_bug.cgi?id=233102
+
+        Reviewed by Carlos Garcia Campos.
+
+        Update expectations as passing.
+
+        * web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-inline-expected.txt:
+
 2021-11-14  Tim Nguyen  <ntim@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/content-security-policy/securitypolicyviolation/blockeduri-inline-expected.txt

@@ -1 +1 @@
 
-FAIL Inline violations have a blockedURI of 'inline' assert_equals: expected 15 but got 0
+PASS Inline violations have a blockedURI of 'inline'
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-15  Patrick Griffis  <pgriffis@igalia.com>
+
+        CSP: Fix missing lineNumber and columnNumber in inline violation reports
+        https://bugs.webkit.org/show_bug.cgi?id=233102
+
+        Reviewed by Carlos Garcia Campos.
+
+        * page/csp/ContentSecurityPolicy.cpp:
+        (WebCore::ContentSecurityPolicy::reportViolation const):
+
 2021-11-14  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp

@@ -752 +752 @@
     auto blockedURL = URL(URL(), blockedURLString);
     info.documentURI = m_documentURL ? m_documentURL.value().strippedForUseAsReferrer() : deprecatedURLForReporting(blockedURL);
+    info.lineNumber = sourcePosition.m_line.oneBasedInt();
+    info.columnNumber = sourcePosition.m_column.oneBasedInt();
 
     if (m_client)