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

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

Issue 2442513004: Part 1.1: Is policy list subsumed under subsuming policy? (Closed)
Patch Set: Addressing comments 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CSPSource_h 5 #ifndef CSPSource_h
6 #define CSPSource_h 6 #define CSPSource_h
7 7
8 #include "core/CoreExport.h" 8 #include "core/CoreExport.h"
9 #include "core/frame/csp/ContentSecurityPolicy.h" 9 #include "core/frame/csp/ContentSecurityPolicy.h"
10 #include "platform/heap/Handle.h" 10 #include "platform/heap/Handle.h"
(...skipping 13 matching lines...) Expand all
24 CSPSource(ContentSecurityPolicy*, 24 CSPSource(ContentSecurityPolicy*,
25 const String& scheme, 25 const String& scheme,
26 const String& host, 26 const String& host,
27 int port, 27 int port,
28 const String& path, 28 const String& path,
29 WildcardDisposition hostWildcard, 29 WildcardDisposition hostWildcard,
30 WildcardDisposition portWildcard); 30 WildcardDisposition portWildcard);
31 bool matches(const KURL&, 31 bool matches(const KURL&,
32 ResourceRequest::RedirectStatus = 32 ResourceRequest::RedirectStatus =
33 ResourceRequest::RedirectStatus::NoRedirect) const; 33 ResourceRequest::RedirectStatus::NoRedirect) const;
34 34 // Find the normalized CSPSource of the two.
Mike West 2016/10/26 11:40:29 What does this mean? :)
35 CSPSource* getNormalized(CSPSource*);
36 // Assuming two CSPSources are matching, return whichever is more restrictive.
Mike West 2016/10/26 11:40:29 This is incomplete: you're also synthesizing new `
37 CSPSource* getPreferredCSPSource(CSPSource*);
35 DECLARE_TRACE(); 38 DECLARE_TRACE();
36 39
37 private: 40 private:
38 bool schemeMatches(const KURL&) const; 41 bool schemeMatches(const KURL&) const;
39 bool hostMatches(const KURL&) const; 42 bool hostMatches(const KURL&) const;
40 bool pathMatches(const KURL&) const; 43 bool pathMatches(const KURL&) const;
41 bool portMatches(const KURL&) const; 44 bool portMatches(const KURL&) const;
42 bool isSchemeOnly() const; 45 bool isSchemeOnly() const;
43 46
47 bool schemeMatches(const String&) const;
48 bool hostMatches(const String&) const;
49 bool pathMatches(const String&) const;
50 bool portMatches(int, const String&) const;
51
52 CSPSource* getPreferredCSPSourceBasedOnEmptySchemes(CSPSource* other,
Mike West 2016/10/26 11:40:29 Nit: Describe these methods too. I'm still not sur
53 CSPSource* preferred);
54 CSPSource* getPreferredCSPSourceBasedOnWildcards(CSPSource* other,
55 CSPSource* preferreds);
56
44 Member<ContentSecurityPolicy> m_policy; 57 Member<ContentSecurityPolicy> m_policy;
45 String m_scheme; 58 String m_scheme;
46 String m_host; 59 String m_host;
47 int m_port; 60 int m_port;
48 String m_path; 61 String m_path;
49 62
50 WildcardDisposition m_hostWildcard; 63 WildcardDisposition m_hostWildcard;
51 WildcardDisposition m_portWildcard; 64 WildcardDisposition m_portWildcard;
52 }; 65 };
53 66
54 } // namespace blink 67 } // namespace blink
55 68
56 #endif 69 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698