Changeset 77742 in webkit

Timestamp:

Feb 5, 2011 3:52:15 AM (13 years ago)

Author:

jochen@chromium.org

Message:

2011-02-05 Jochen Eisinger <​jochen@chromium.org>

Reviewed by Adam Barth.

Add ContentSecurityPolicy object to Document and pass the X-WebKit-CSP header from the MainResourceLoader.
​https://bugs.webkit.org/show_bug.cgi?id=53685

• WebCore.xcodeproj/project.pbxproj:
• dom/Document.h: (WebCore::Document::contentSecurityPolicy):
• loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::didReceiveResponse):
• page/ContentSecurityPolicy.cpp: (WebCore::ContentSecurityPolicy::didReceiveHeader):
• page/ContentSecurityPolicy.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• dom/Document.h (modified) (3 diffs)
• loader/MainResourceLoader.cpp (modified) (2 diffs)
• page/ContentSecurityPolicy.cpp (modified) (1 diff)
• page/ContentSecurityPolicy.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-05  Jochen Eisinger  <jochen@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add ContentSecurityPolicy object to Document and pass the X-WebKit-CSP header from the MainResourceLoader.
+        https://bugs.webkit.org/show_bug.cgi?id=53685
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/Document.h:
+        (WebCore::Document::contentSecurityPolicy):
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::didReceiveResponse):
+        * page/ContentSecurityPolicy.cpp:
+        (WebCore::ContentSecurityPolicy::didReceiveHeader):
+        * page/ContentSecurityPolicy.h:
+
 2011-02-05  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -3117 +3117 @@
                 97C078501165D5BE003A32EF /* SuffixTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 97C0784F1165D5BE003A32EF /* SuffixTree.h */; };
                 97C471DB12F925BD0086354B /* ContentSecurityPolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C471D912F925BC0086354B /* ContentSecurityPolicy.cpp */; };
-                97C471DC12F925BD0086354B /* ContentSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 97C471DA12F925BD0086354B /* ContentSecurityPolicy.h */; };
+                97C471DC12F925BD0086354B /* ContentSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 97C471DA12F925BD0086354B /* ContentSecurityPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 97DCE20110807C750057D394 /* HistoryController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97DCE1FF10807C750057D394 /* HistoryController.cpp */; };
                 97DCE20210807C750057D394 /* HistoryController.h in Headers */ = {isa = PBXBuildFile; fileRef = 97DCE20010807C750057D394 /* HistoryController.h */; settings = {ATTRIBUTES = (Private, ); }; };

trunk/Source/WebCore/dom/Document.h

@@ -33 +33 @@
 #include "Color.h"
 #include "ContainerNode.h"
+#include "ContentSecurityPolicy.h"
 #include "DOMTimeStamp.h"
 #include "DocumentOrderedMap.h"
@@ -1090 +1091 @@
     void initDNSPrefetch();
 
+    ContentSecurityPolicy* contentSecurityPolicy() { return &m_contentSecurityPolicy; }
+
 protected:
     Document(Frame*, const KURL& url, bool isXHTML, bool isHTML, const KURL& baseURL = KURL());
@@ -1391 +1394 @@
     int m_nextRequestAnimationFrameCallbackId;
 #endif
+
+    ContentSecurityPolicy m_contentSecurityPolicy;
 };
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -32 +32 @@
 
 #include "ApplicationCacheHost.h"
+#include "ContentSecurityPolicy.h"
+#include "Document.h"
 #include "DocumentLoadTiming.h"
 #include "DocumentLoader.h"
@@ -357 +359 @@
     }
 
+    it = r.httpHeaderFields().find(AtomicString("x-webkit-csp"));
+    if (it != r.httpHeaderFields().end()) {
+        String content = it->second;
+        m_frame->document()->contentSecurityPolicy()->didReceiveHeader(content);
+    }
+
     // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
     // See <rdar://problem/6304600> for more details.

trunk/Source/WebCore/page/ContentSecurityPolicy.cpp

@@ -33 +33 @@
 }
 
+void ContentSecurityPolicy::didReceiveHeader(const String& header)
+{
+    m_header = header;
 }
+
+}

trunk/Source/WebCore/page/ContentSecurityPolicy.h

@@ -35 +35 @@
 public:
     ContentSecurityPolicy();
+
+    void didReceiveHeader(const String&);
+
+private:
+    String m_header;
 };