Allow arbitrary object-src CSP directives for component extensions

extensions/common/csp_validator.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_COMMON_CSP_VALIDATOR_H_
 #define EXTENSIONS_COMMON_CSP_VALIDATOR_H_
 
 #include <string>
 
 #include "extensions/common/manifest.h"
 
 namespace extensions {
 
 namespace csp_validator {
 
 // Checks whether the given |policy| is legal for use in the extension system.
 // This check just ensures that the policy doesn't contain any characters that
 // will cause problems when we transmit the policy in an HTTP header.
 bool ContentSecurityPolicyIsLegal(const std::string& policy);
 
+enum Options {

[Sam McNally, 2014/11/24 04:40:15]

Comments?

[not at google - send to devlin, 2014/11/24 18:18:02]

when you do: please add a comment to ALLOW_INSECURE_OBJECT_SRC mentioning what
exactly makes it "insecure" (otherwise it's quite open to interpretation).

[raymes, 2014/11/25 13:34:10]

Done.

[raymes, 2014/11/25 13:34:10]

Done.

+  NO_OPTIONS = 0x00,

[Sam McNally, 2014/11/24 04:40:15]

Prefix values with OPTIONS_.

[raymes, 2014/11/25 13:34:10]

Done.

+  ALLOW_UNSAFE_EVAL = 0x01,
+  ALLOW_INSECURE_OBJECT_SRC = 0x02,

[not at google - send to devlin, 2014/11/24 18:18:02]

Let's keep discussing this enum: More typical style is to use (1 << 1), (1 <<
2), etc.

[raymes, 2014/11/25 13:34:10]

Done.

+};
+
 // Checks whether the given |policy| meets the minimum security requirements
 // for use in the extension system.
 //
 // Ideally, we would like to say that an XSS vulnerability in the extension
 // should not be able to execute script, even in the precense of an active
 // network attacker.
 //
 // However, we found that it broke too many deployed extensions to limit
 // 'unsafe-eval' in the script-src directive, so that is allowed as a special
 // case for extensions. Platform apps disallow it.
 bool ContentSecurityPolicyIsSecure(
-    const std::string& policy, Manifest::Type type);
+    const std::string& policy, int options);

[not at google - send to devlin, 2014/11/24 18:18:03]

Mention that this is a bitmask.

[raymes, 2014/11/25 13:34:10]

Done.

 
 // Checks whether the given |policy| enforces a unique origin sandbox as
 // defined by http://www.whatwg.org/specs/web-apps/current-work/multipage/
 // the-iframe-element.html#attr-iframe-sandbox. The policy must have the
 // "sandbox" directive, and the sandbox tokens must not include
 // "allow-same-origin". Additional restrictions may be imposed depending on
 // |type|.
 bool ContentSecurityPolicyIsSandboxed(
     const std::string& policy, Manifest::Type type);
 
 }  // namespace csp_validator
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_CSP_VALIDATOR_H_