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

Side by Side Diff: Source/weborigin/OriginAccessEntry.h

Issue 50573004: Don't set document.domain to an IP address fragment. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: missing weboriginexport header Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/Settings.in ('k') | Source/weborigin/OriginAccessEntry.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef OriginAccessEntry_h 31 #ifndef OriginAccessEntry_h
32 #define OriginAccessEntry_h 32 #define OriginAccessEntry_h
33 33
34 #include "weborigin/WebOriginExport.h"
34 #include "wtf/text/WTFString.h" 35 #include "wtf/text/WTFString.h"
35 36
36 namespace WebCore { 37 namespace WebCore {
37 38
38 class SecurityOrigin; 39 class SecurityOrigin;
39 40
40 class OriginAccessEntry { 41 class WEBORIGIN_EXPORT OriginAccessEntry {
41 public: 42 public:
42 enum SubdomainSetting { 43 enum SubdomainSetting {
43 AllowSubdomains, 44 AllowSubdomains,
44 DisallowSubdomains 45 DisallowSubdomains
45 }; 46 };
46 47
48 enum IPAddressSetting {
49 TreatIPAddressAsDomain,
50 TreatIPAddressAsIPAddress
51 };
52
47 // If host is empty string and SubdomainSetting is AllowSubdomains, the entr y will match all domains in the specified protocol. 53 // If host is empty string and SubdomainSetting is AllowSubdomains, the entr y will match all domains in the specified protocol.
48 OriginAccessEntry(const String& protocol, const String& host, SubdomainSetti ng); 54 OriginAccessEntry(const String& protocol, const String& host, SubdomainSetti ng, IPAddressSetting);
49 bool matchesOrigin(const SecurityOrigin&) const; 55 bool matchesOrigin(const SecurityOrigin&) const;
50 56
51 const String& protocol() const { return m_protocol; } 57 const String& protocol() const { return m_protocol; }
52 const String& host() const { return m_host; } 58 const String& host() const { return m_host; }
53 SubdomainSetting subdomainSettings() const { return m_subdomainSettings; } 59 SubdomainSetting subdomainSettings() const { return m_subdomainSettings; }
60 IPAddressSetting ipAddressSettings() const { return m_ipAddressSettings; }
54 61
55 private: 62 private:
56 String m_protocol; 63 String m_protocol;
57 String m_host; 64 String m_host;
58 SubdomainSetting m_subdomainSettings; 65 SubdomainSetting m_subdomainSettings;
66 IPAddressSetting m_ipAddressSettings;
59 bool m_hostIsIPAddress; 67 bool m_hostIsIPAddress;
60 }; 68 };
61 69
62 inline bool operator==(const OriginAccessEntry& a, const OriginAccessEntry& b) 70 WEBORIGIN_EXPORT inline bool operator==(const OriginAccessEntry& a, const Origin AccessEntry& b)
63 { 71 {
64 return equalIgnoringCase(a.protocol(), b.protocol()) && equalIgnoringCase(a. host(), b.host()) && a.subdomainSettings() == b.subdomainSettings(); 72 return equalIgnoringCase(a.protocol(), b.protocol())
73 && equalIgnoringCase(a.host(), b.host())
74 && a.subdomainSettings() == b.subdomainSettings()
75 && a.ipAddressSettings() == b.ipAddressSettings();
65 } 76 }
66 77
67 inline bool operator!=(const OriginAccessEntry& a, const OriginAccessEntry& b) 78 WEBORIGIN_EXPORT inline bool operator!=(const OriginAccessEntry& a, const Origin AccessEntry& b)
68 { 79 {
69 return !(a == b); 80 return !(a == b);
70 } 81 }
71 82
72 } // namespace WebCore 83 } // namespace WebCore
73 84
74 #endif // OriginAccessEntry_h 85 #endif // OriginAccessEntry_h
OLDNEW
« no previous file with comments | « Source/core/page/Settings.in ('k') | Source/weborigin/OriginAccessEntry.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698