Changeset 244563 in webkit

Timestamp:

Apr 23, 2019 1:40:58 PM (5 years ago)

Author:

Devin Rousso

Message:

ContentSecurityPolicy::logToConsole should include line/column number and source location
​https://bugs.webkit.org/show_bug.cgi?id=114317
<rdar://problem/13614617>

Reviewed by Timothy Hatcher.

Source/WebCore:

No change in functionality.

• page/csp/ContentSecurityPolicy.h:
• page/csp/ContentSecurityPolicy.cpp:

(WebCore::ContentSecurityPolicy::reportViolation const):
(WebCore::ContentSecurityPolicy::logToConsole const):

LayoutTests:

• inspector/debugger/csp-exceptions.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/csp-exceptions.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/csp/ContentSecurityPolicy.cpp (modified) (2 diffs)
• Source/WebCore/page/csp/ContentSecurityPolicy.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-23  Devin Rousso  <drousso@apple.com>
+
+        ContentSecurityPolicy::logToConsole should include line/column number and source location
+        https://bugs.webkit.org/show_bug.cgi?id=114317
+        <rdar://problem/13614617>
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/debugger/csp-exceptions.html:
+
 2019-04-23  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/LayoutTests/inspector/debugger/csp-exceptions.html

@@ -33 +33 @@
 
             WI.consoleManager.singleFireEventListener(WI.ConsoleManager.Event.MessageAdded, (event) => {
-                InspectorTest.assert(event.data.message.level === WI.ConsoleMessage.MessageLevel.Error);
-                InspectorTest.pass("CSP Exception Console Message: " + event.data.message.messageText);
+                let {message} = event.data;
+                InspectorTest.assert(message.level === WI.ConsoleMessage.MessageLevel.Error);
+                InspectorTest.assert(message.line > 0);
+                InspectorTest.assert(message.column > 0);
+                InspectorTest.pass("CSP Exception Console Message: " + message.messageText);
                 resolve();
             });
@@ -54 +57 @@
             WI.consoleManager.singleFireEventListener(WI.ConsoleManager.Event.MessageAdded, (event) => {
                 WI.debuggerManager.removeEventListener(WI.DebuggerManager.Event.Paused, tempPauseFailListener, null);
-                InspectorTest.assert(event.data.message.level === WI.ConsoleMessage.MessageLevel.Error);
+
+                let {message} = event.data;
+                InspectorTest.assert(message.level === WI.ConsoleMessage.MessageLevel.Error);
+                InspectorTest.assert(message.line > 0);
+                InspectorTest.assert(message.column > 0);
                 InspectorTest.expectFalse(didPause, "CSP Exception caused outside of script evaluation should not pause.");
-                InspectorTest.pass("CSP Exception Console Message: " + event.data.message.messageText);
+                InspectorTest.pass("CSP Exception Console Message: " + message.messageText);
                 resolve();
             });

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-23  Devin Rousso  <drousso@apple.com>
+
+        ContentSecurityPolicy::logToConsole should include line/column number and source location
+        https://bugs.webkit.org/show_bug.cgi?id=114317
+        <rdar://problem/13614617>
+
+        Reviewed by Timothy Hatcher.
+
+        No change in functionality.
+
+        * page/csp/ContentSecurityPolicy.h:
+        * page/csp/ContentSecurityPolicy.cpp:
+        (WebCore::ContentSecurityPolicy::reportViolation const):
+        (WebCore::ContentSecurityPolicy::logToConsole const):
+
 2019-04-23  Devin Rousso  <drousso@apple.com>
 

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

@@ -671 +671 @@
 void ContentSecurityPolicy::reportViolation(const String& effectiveViolatedDirective, const String& violatedDirective, const ContentSecurityPolicyDirectiveList& violatedDirectiveList, const URL& blockedURL, const String& consoleMessage, const String& sourceURL, const TextPosition& sourcePosition, JSC::ExecState* state) const
 {
-    logToConsole(consoleMessage, sourceURL, sourcePosition.m_line, state);
+    logToConsole(consoleMessage, sourceURL, sourcePosition.m_line, sourcePosition.m_column, state);
 
     if (!m_isReportingEnabled)
@@ -850 +850 @@
 }
 
-void ContentSecurityPolicy::logToConsole(const String& message, const String& contextURL, const WTF::OrdinalNumber& contextLine, JSC::ExecState* state) const
+void ContentSecurityPolicy::logToConsole(const String& message, const String& contextURL, const WTF::OrdinalNumber& contextLine, const WTF::OrdinalNumber& contextColumn, JSC::ExecState* state) const
 {
     if (!m_isReportingEnabled)
         return;
 
-    // FIXME: <http://webkit.org/b/114317> ContentSecurityPolicy::logToConsole should include a column number
     if (m_client)
         m_client->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message, 0);
     else if (m_scriptExecutionContext)
-        m_scriptExecutionContext->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message, contextURL, contextLine.oneBasedInt(), 0, state);
+        m_scriptExecutionContext->addConsoleMessage(MessageSource::Security, MessageLevel::Error, message, contextURL, contextLine.oneBasedInt(), contextColumn.oneBasedInt(), state);
 }
 

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

@@ -174 +174 @@
 
 private:
-    void logToConsole(const String& message, const String& contextURL = String(), const WTF::OrdinalNumber& contextLine = WTF::OrdinalNumber::beforeFirst(), JSC::ExecState* = nullptr) const;
+    void logToConsole(const String& message, const String& contextURL = String(), const WTF::OrdinalNumber& contextLine = WTF::OrdinalNumber::beforeFirst(), const WTF::OrdinalNumber& contextColumn = WTF::OrdinalNumber::beforeFirst(), JSC::ExecState* = nullptr) const;
     void updateSourceSelf(const SecurityOrigin&);
     void applyPolicyToScriptExecutionContext();