Extract CSPDirectiveList from ContentSecurityPolicy.

Extract CSPDirectiveList from ContentSecurityPolicy.

BUG=346642
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=168451

[Mike West, 2014-03-03 15:02:51]

Hey Kenneth, since you've looked at a few of these already, mind skimming
another?

-mike

[Mike West, 2014-03-04 10:37:08]

On 2014/03/03 15:02:51, Mike West wrote:
> Hey Kenneth, since you've looked at a few of these already, mind skimming
> another?
> 
> -mike

Ping?

[kenneth.r.christiansen, 2014-03-04 10:45:16]

lgtm

[kenneth.r.christiansen, 2014-03-04 10:45:24]

https://codereview.chromium.org/180273012/diff/20001/Source/core/frame/Conten...
File Source/core/frame/ContentSecurityPolicy.cpp (right):

https://codereview.chromium.org/180273012/diff/20001/Source/core/frame/Conten...
Source/core/frame/ContentSecurityPolicy.cpp:93: || equalIgnoringCase(name,
DefaultSrc)
We are getting quite many here... :-) I was wondering whether we could use some
tricks like the SWITCH/CASE from CSSParser-in.cpp... but probably not worth it
yet. We have similar code in the media query code

[Mike West, 2014-03-04 10:48:13]

The CQ bit was checked by mkwst@chromium.org

[commit-bot: I haz the power, 2014-03-04 10:48:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mkwst@chromium.org/180273012/20001

[commit-bot: I haz the power, 2014-03-04 10:48:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-04 10:48:30]

Failed to apply patch for Source/core/frame/ContentSecurityPolicy.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/frame/ContentSecurityPolicy.h
  Hunk #1 FAILED at 58.
  1 out of 1 hunk FAILED -- saving rejects to file
Source/core/frame/ContentSecurityPolicy.h.rej

Patch:       Source/core/frame/ContentSecurityPolicy.h
Index: Source/core/frame/ContentSecurityPolicy.h
diff --git a/Source/core/frame/ContentSecurityPolicy.h
b/Source/core/frame/ContentSecurityPolicy.h
index
e5cda96ed024846aa73d2db0630fed3111013450..dc07cf80f0bb1c2c04976cf9bc51b08567f85f07
100644
--- a/Source/core/frame/ContentSecurityPolicy.h
+++ b/Source/core/frame/ContentSecurityPolicy.h
@@ -58,6 +58,28 @@ typedef Vector<OwnPtr<CSPDirectiveList> >
CSPDirectiveListVector;
 class ContentSecurityPolicy {
     WTF_MAKE_FAST_ALLOCATED;
 public:
+    // CSP 1.0 Directives
+    static const char ConnectSrc[];
+    static const char DefaultSrc[];
+    static const char FontSrc[];
+    static const char FrameSrc[];
+    static const char ImgSrc[];
+    static const char MediaSrc[];
+    static const char ObjectSrc[];
+    static const char ReportURI[];
+    static const char Sandbox[];
+    static const char ScriptSrc[];
+    static const char StyleSrc[];
+
+    // CSP 1.1 Directives
+    static const char BaseURI[];
+    static const char ChildSrc[];
+    static const char FormAction[];
+    static const char FrameAncestors[];
+    static const char PluginTypes[];
+    static const char ReflectedXSS[];
+    static const char Referrer[];
+
     static PassOwnPtr<ContentSecurityPolicy> create(ExecutionContextClient*
client)
     {
         return adoptPtr(new ContentSecurityPolicy(client));

[Mike West, 2014-03-04 10:48:36]

On 2014/03/04 10:45:24, kenneth.r.christiansen wrote:
>
https://codereview.chromium.org/180273012/diff/20001/Source/core/frame/Conten...
> File Source/core/frame/ContentSecurityPolicy.cpp (right):
> 
>
https://codereview.chromium.org/180273012/diff/20001/Source/core/frame/Conten...
> Source/core/frame/ContentSecurityPolicy.cpp:93: || equalIgnoringCase(name,
> DefaultSrc)
> We are getting quite many here... :-) I was wondering whether we could use
some
> tricks like the SWITCH/CASE from CSSParser-in.cpp... but probably not worth it
> yet. We have similar code in the media query code

Hrm. I guess. It's not terrible yet. :)

Point me to the CSSParser code? I'd be happy to take a look...

[kenneth.r.christiansen, 2014-03-04 10:54:39]

On 2014/03/04 10:48:36, Mike West wrote:
> On 2014/03/04 10:45:24, kenneth.r.christiansen wrote:
> >
>
https://codereview.chromium.org/180273012/diff/20001/Source/core/frame/Conten...
> > File Source/core/frame/ContentSecurityPolicy.cpp (right):
> > 
> >
>
https://codereview.chromium.org/180273012/diff/20001/Source/core/frame/Conten...
> > Source/core/frame/ContentSecurityPolicy.cpp:93: || equalIgnoringCase(name,
> > DefaultSrc)
> > We are getting quite many here... :-) I was wondering whether we could use
> some
> > tricks like the SWITCH/CASE from CSSParser-in.cpp... but probably not worth
it
> > yet. We have similar code in the media query code
> 
> Hrm. I guess. It's not terrible yet. :)
> 
> Point me to the CSSParser code? I'd be happy to take a look...

It is preprocessed (hense the -in.cpp suffix). It basically works for string
based switches today (SWITCH/CASE macro). You can see it in use in
Source/core/html/HTMLMetaElement-in.cpp and Source/core/css/CSSTokenizer-in.cpp

This seems to be the precompiler: Source/build/scripts/make_token_matcher.py

[Mike West, 2014-03-04 11:07:16]

The CQ bit was checked by mkwst@chromium.org

[commit-bot: I haz the power, 2014-03-04 11:08:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mkwst@chromium.org/180273012/40001

[commit-bot: I haz the power, 2014-03-05 08:52:08]

Change committed as 168451