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

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

Issue 2470083002: Part 2.1: Is policy list subsumed under subsuming policy? (Closed)
Patch Set: Rebasing on part1.1 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
Index: third_party/WebKit/Source/core/frame/csp/CSPSource.h
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPSource.h b/third_party/WebKit/Source/core/frame/csp/CSPSource.h
index ede22feb45f77a5e79d20fae2b2cf08fe457476a..fab4f5e9481177a155a13ad74057f7a30ffe47ba 100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPSource.h
+++ b/third_party/WebKit/Source/core/frame/csp/CSPSource.h
@@ -36,16 +36,23 @@ class CORE_EXPORT CSPSource : public GarbageCollectedFinalized<CSPSource> {
// subsumption algorithm described here:
// https://w3c.github.io/webappsec-csp/embedded/#subsume-policy
bool subsumes(CSPSource*);
+ // Retrieve the most restrictive information from the two CSPSources if
+ // isSimilar is true for the two. Otherwise, return nullptr.
+ CSPSource* getNormalized(CSPSource*);
jochen (gone - plz use gerrit) 2016/11/04 13:14:51 what about static CSPSource* intersect(CSPSource*
DECLARE_TRACE();
private:
+ FRIEND_TEST_ALL_PREFIXES(CSPSourceTest, IsSimilar);
+ FRIEND_TEST_ALL_PREFIXES(SourceListDirectiveTest, GetNormalizedCSPSources);
+
bool schemeMatches(const String&) const;
bool hostMatches(const String&) const;
bool pathMatches(const String&) const;
// Protocol is necessary to determine default port if it is zero.
bool portMatches(int port, const String& protocol) const;
bool isSchemeOnly() const;
+ bool isSimilar(CSPSource* other);
Member<ContentSecurityPolicy> m_policy;
String m_scheme;

Powered by Google App Engine
This is Rietveld 408576698