Chromium Code Reviews| Index: third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h |
| diff --git a/third_party/WebKit/public/web/WebContentSecurityPolicy.h b/third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h |
| similarity index 65% |
| rename from third_party/WebKit/public/web/WebContentSecurityPolicy.h |
| rename to third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h |
| index 704d43dc676bff887bddddb9afc9901e6149b988..53244f5b9144721311be388b24bad6b466040af1 100644 |
| --- a/third_party/WebKit/public/web/WebContentSecurityPolicy.h |
| +++ b/third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h |
| @@ -28,21 +28,40 @@ |
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| -#ifndef WebContentSecurityPolicy_h |
| -#define WebContentSecurityPolicy_h |
| +#ifndef WebContentSecurityPolicyStruct_h |
| +#define WebContentSecurityPolicyStruct_h |
| + |
| +#include "public/platform/WebContentSecurityPolicy.h" |
| +#include "public/platform/WebString.h" |
| +#include "public/platform/WebVector.h" |
| namespace blink { |
| -enum WebContentSecurityPolicyType { |
| - WebContentSecurityPolicyTypeReport, |
| - WebContentSecurityPolicyTypeEnforce, |
| - WebContentSecurityPolicyTypeLast = WebContentSecurityPolicyTypeEnforce |
| +struct WebContentSecurityPolicySourceExpression { |
| + WebString scheme; |
| + WebString host; |
| + bool isHostWildcard; |
| + int port; |
| + bool isPortWildcard; |
| + WebString path; |
| +}; |
| + |
| +struct WebContentSecurityPolicySourceList { |
| + bool allowSelf; |
| + bool allowStar; |
| + WebVector<WebContentSecurityPolicySourceExpression> sourceList; |
|
Mike West
2017/02/13 14:10:51
Nit: `sourceList` seems wrong, given the name of t
arthursonzogni
2017/02/14 17:07:03
I agree. What about sources?
Mike West
2017/02/15 16:18:17
SGTM.
|
| +}; |
| + |
| +struct WebContentSecurityPolicyDirective { |
| + WebString name; |
| + WebContentSecurityPolicySourceList sourceList; |
| }; |
|
Mike West
2017/02/13 14:10:51
Since you're only exporting source-list directives
arthursonzogni
2017/02/14 17:07:03
I prefer to store a list of CSPDirective inside a
Mike West
2017/02/15 16:18:17
I think you're adding complexity for little benefi
|
| -enum WebContentSecurityPolicySource { |
| - WebContentSecurityPolicySourceHTTP, |
| - WebContentSecurityPolicySourceMeta, |
| - WebContentSecurityPolicySourceLast = WebContentSecurityPolicySourceMeta |
| +struct WebContentSecurityPolicyPolicy { |
|
Mike West
2017/02/13 14:10:51
Nit: ContentSecurityPolicyPolicy sounds super-weir
arthursonzogni
2017/02/14 17:07:03
Inside blink, a ContentSecurityPolicy doesn't repr
Mike West
2017/02/15 16:18:17
Blink is serving a few masters with the naming: we
|
| + WebContentSecurityPolicyType disposition; |
| + WebContentSecurityPolicySource source; |
| + WebVector<WebContentSecurityPolicyDirective> directives; |
| + WebVector<WebString> reportEndpoints; |
| }; |
| } // namespace blink |