Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Unified Diff: third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h

Issue 2474903002: Part 3.1: Is policy list subsumed under subsuming policy? (Closed)
Patch Set: Rebasing Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h
index 51ab571882a0465373623897c3833e542941dbc1..6be282e29871c883005f116ab0b8302870d87c2c 100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h
+++ b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.h
@@ -22,6 +22,8 @@ namespace blink {
class ContentSecurityPolicy;
+typedef HeapVector<Member<SourceListDirective>> SourceListDirectiveVector;
+
class CORE_EXPORT CSPDirectiveList
: public GarbageCollectedFinalized<CSPDirectiveList> {
WTF_MAKE_NONCOPYABLE(CSPDirectiveList);
@@ -156,10 +158,16 @@ class CORE_EXPORT CSPDirectiveList
bool shouldSendCSPHeader(Resource::Type) const;
+ // The algorithm is described here:
+ // https://w3c.github.io/webappsec-csp/embedded/#subsume-policy
+ bool subsumes(const CSPDirectiveListVector&);
+
DECLARE_TRACE();
private:
FRIEND_TEST_ALL_PREFIXES(CSPDirectiveListTest, IsMatchingNoncePresent);
+ FRIEND_TEST_ALL_PREFIXES(CSPDirectiveListTest, GetSourceVector);
+ FRIEND_TEST_ALL_PREFIXES(CSPDirectiveListTest, OperativeDirectiveGivenType);
enum RequireSRIForToken { None = 0, Script = 1 << 0, Style = 1 << 1 };
@@ -266,6 +274,17 @@ class CORE_EXPORT CSPDirectiveList
bool denyIfEnforcingPolicy() const { return isReportOnly(); }
+ // Tthis function returns a SourceListDirective of a given type
+ // or if it is not defined, the default SourceListDirective for that type.
+ SourceListDirective* operativeDirective(
+ const ContentSecurityPolicy::DirectiveType&);
+
+ // This function aggregates from a vector of policies all operative
+ // SourceListDirectives of a given type into a vector.
+ static SourceListDirectiveVector getSourceVector(
+ const ContentSecurityPolicy::DirectiveType&,
+ const CSPDirectiveListVector& policies);
+
Member<ContentSecurityPolicy> m_policy;
String m_header;
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698