OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "extensions/common/permissions/permission_set.h" | 5 #include "extensions/common/permissions/permission_set.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 AddPatternsAndRemovePaths(explicit_hosts, &explicit_hosts_); | 46 AddPatternsAndRemovePaths(explicit_hosts, &explicit_hosts_); |
47 InitImplicitPermissions(); | 47 InitImplicitPermissions(); |
48 InitEffectiveHosts(); | 48 InitEffectiveHosts(); |
49 } | 49 } |
50 | 50 |
51 // static | 51 // static |
52 PermissionSet* PermissionSet::CreateDifference( | 52 PermissionSet* PermissionSet::CreateDifference( |
53 const PermissionSet* set1, | 53 const PermissionSet* set1, |
54 const PermissionSet* set2) { | 54 const PermissionSet* set2) { |
55 scoped_refptr<PermissionSet> empty = new PermissionSet(); | 55 scoped_refptr<PermissionSet> empty = new PermissionSet(); |
56 const PermissionSet* set1_safe = (set1 == NULL) ? empty.get() : set1; | 56 const PermissionSet* set1_safe = (set1 == nullptr) ? empty.get() : set1; |
57 const PermissionSet* set2_safe = (set2 == NULL) ? empty.get() : set2; | 57 const PermissionSet* set2_safe = (set2 == nullptr) ? empty.get() : set2; |
58 | 58 |
59 APIPermissionSet apis; | 59 APIPermissionSet apis; |
60 APIPermissionSet::Difference(set1_safe->apis(), set2_safe->apis(), &apis); | 60 APIPermissionSet::Difference(set1_safe->apis(), set2_safe->apis(), &apis); |
61 | 61 |
62 ManifestPermissionSet manifest_permissions; | 62 ManifestPermissionSet manifest_permissions; |
63 ManifestPermissionSet::Difference(set1_safe->manifest_permissions(), | 63 ManifestPermissionSet::Difference(set1_safe->manifest_permissions(), |
64 set2_safe->manifest_permissions(), | 64 set2_safe->manifest_permissions(), |
65 &manifest_permissions); | 65 &manifest_permissions); |
66 | 66 |
67 URLPatternSet explicit_hosts; | 67 URLPatternSet explicit_hosts; |
68 URLPatternSet::CreateDifference(set1_safe->explicit_hosts(), | 68 URLPatternSet::CreateDifference(set1_safe->explicit_hosts(), |
69 set2_safe->explicit_hosts(), | 69 set2_safe->explicit_hosts(), |
70 &explicit_hosts); | 70 &explicit_hosts); |
71 | 71 |
72 URLPatternSet scriptable_hosts; | 72 URLPatternSet scriptable_hosts; |
73 URLPatternSet::CreateDifference(set1_safe->scriptable_hosts(), | 73 URLPatternSet::CreateDifference(set1_safe->scriptable_hosts(), |
74 set2_safe->scriptable_hosts(), | 74 set2_safe->scriptable_hosts(), |
75 &scriptable_hosts); | 75 &scriptable_hosts); |
76 | 76 |
77 return new PermissionSet(apis, manifest_permissions, | 77 return new PermissionSet(apis, manifest_permissions, |
78 explicit_hosts, scriptable_hosts); | 78 explicit_hosts, scriptable_hosts); |
79 } | 79 } |
80 | 80 |
81 // static | 81 // static |
82 PermissionSet* PermissionSet::CreateIntersection( | 82 PermissionSet* PermissionSet::CreateIntersection( |
83 const PermissionSet* set1, | 83 const PermissionSet* set1, |
84 const PermissionSet* set2) { | 84 const PermissionSet* set2) { |
85 scoped_refptr<PermissionSet> empty = new PermissionSet(); | 85 scoped_refptr<PermissionSet> empty = new PermissionSet(); |
86 const PermissionSet* set1_safe = (set1 == NULL) ? empty.get() : set1; | 86 const PermissionSet* set1_safe = (set1 == nullptr) ? empty.get() : set1; |
87 const PermissionSet* set2_safe = (set2 == NULL) ? empty.get() : set2; | 87 const PermissionSet* set2_safe = (set2 == nullptr) ? empty.get() : set2; |
88 | 88 |
89 APIPermissionSet apis; | 89 APIPermissionSet apis; |
90 APIPermissionSet::Intersection(set1_safe->apis(), set2_safe->apis(), &apis); | 90 APIPermissionSet::Intersection(set1_safe->apis(), set2_safe->apis(), &apis); |
91 | 91 |
92 ManifestPermissionSet manifest_permissions; | 92 ManifestPermissionSet manifest_permissions; |
93 ManifestPermissionSet::Intersection(set1_safe->manifest_permissions(), | 93 ManifestPermissionSet::Intersection(set1_safe->manifest_permissions(), |
94 set2_safe->manifest_permissions(), | 94 set2_safe->manifest_permissions(), |
95 &manifest_permissions); | 95 &manifest_permissions); |
96 | 96 |
97 URLPatternSet explicit_hosts; | 97 URLPatternSet explicit_hosts; |
98 URLPatternSet::CreateIntersection(set1_safe->explicit_hosts(), | 98 URLPatternSet::CreateIntersection(set1_safe->explicit_hosts(), |
99 set2_safe->explicit_hosts(), | 99 set2_safe->explicit_hosts(), |
100 &explicit_hosts); | 100 &explicit_hosts); |
101 | 101 |
102 URLPatternSet scriptable_hosts; | 102 URLPatternSet scriptable_hosts; |
103 URLPatternSet::CreateIntersection(set1_safe->scriptable_hosts(), | 103 URLPatternSet::CreateIntersection(set1_safe->scriptable_hosts(), |
104 set2_safe->scriptable_hosts(), | 104 set2_safe->scriptable_hosts(), |
105 &scriptable_hosts); | 105 &scriptable_hosts); |
106 | 106 |
107 return new PermissionSet(apis, manifest_permissions, | 107 return new PermissionSet(apis, manifest_permissions, |
108 explicit_hosts, scriptable_hosts); | 108 explicit_hosts, scriptable_hosts); |
109 } | 109 } |
110 | 110 |
111 // static | 111 // static |
112 PermissionSet* PermissionSet::CreateUnion( | 112 PermissionSet* PermissionSet::CreateUnion( |
113 const PermissionSet* set1, | 113 const PermissionSet* set1, |
114 const PermissionSet* set2) { | 114 const PermissionSet* set2) { |
115 scoped_refptr<PermissionSet> empty = new PermissionSet(); | 115 scoped_refptr<PermissionSet> empty = new PermissionSet(); |
116 const PermissionSet* set1_safe = (set1 == NULL) ? empty.get() : set1; | 116 const PermissionSet* set1_safe = (set1 == nullptr) ? empty.get() : set1; |
117 const PermissionSet* set2_safe = (set2 == NULL) ? empty.get() : set2; | 117 const PermissionSet* set2_safe = (set2 == nullptr) ? empty.get() : set2; |
118 | 118 |
119 APIPermissionSet apis; | 119 APIPermissionSet apis; |
120 APIPermissionSet::Union(set1_safe->apis(), set2_safe->apis(), &apis); | 120 APIPermissionSet::Union(set1_safe->apis(), set2_safe->apis(), &apis); |
121 | 121 |
122 ManifestPermissionSet manifest_permissions; | 122 ManifestPermissionSet manifest_permissions; |
123 ManifestPermissionSet::Union(set1_safe->manifest_permissions(), | 123 ManifestPermissionSet::Union(set1_safe->manifest_permissions(), |
124 set2_safe->manifest_permissions(), | 124 set2_safe->manifest_permissions(), |
125 &manifest_permissions); | 125 &manifest_permissions); |
126 | 126 |
127 URLPatternSet explicit_hosts; | 127 URLPatternSet explicit_hosts; |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 | 178 |
179 bool PermissionSet::HasAPIPermission(const std::string& permission_name) const { | 179 bool PermissionSet::HasAPIPermission(const std::string& permission_name) const { |
180 const APIPermissionInfo* permission = | 180 const APIPermissionInfo* permission = |
181 PermissionsInfo::GetInstance()->GetByName(permission_name); | 181 PermissionsInfo::GetInstance()->GetByName(permission_name); |
182 // Ensure our PermissionsProvider is aware of this permission. | 182 // Ensure our PermissionsProvider is aware of this permission. |
183 CHECK(permission) << permission_name; | 183 CHECK(permission) << permission_name; |
184 return (permission && apis_.count(permission->id())); | 184 return (permission && apis_.count(permission->id())); |
185 } | 185 } |
186 | 186 |
187 bool PermissionSet::CheckAPIPermission(APIPermission::ID permission) const { | 187 bool PermissionSet::CheckAPIPermission(APIPermission::ID permission) const { |
188 return CheckAPIPermissionWithParam(permission, NULL); | 188 return CheckAPIPermissionWithParam(permission, nullptr); |
189 } | 189 } |
190 | 190 |
191 bool PermissionSet::CheckAPIPermissionWithParam( | 191 bool PermissionSet::CheckAPIPermissionWithParam( |
192 APIPermission::ID permission, | 192 APIPermission::ID permission, |
193 const APIPermission::CheckParam* param) const { | 193 const APIPermission::CheckParam* param) const { |
194 APIPermissionSet::const_iterator iter = apis().find(permission); | 194 APIPermissionSet::const_iterator iter = apis().find(permission); |
195 if (iter == apis().end()) | 195 if (iter == apis().end()) |
196 return false; | 196 return false; |
197 return iter->Check(param); | 197 return iter->Check(param); |
198 } | 198 } |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 if (iter->ImpliesAllHosts()) { | 275 if (iter->ImpliesAllHosts()) { |
276 should_warn_all_hosts_ = WARN_ALL_HOSTS; | 276 should_warn_all_hosts_ = WARN_ALL_HOSTS; |
277 return; | 277 return; |
278 } | 278 } |
279 } | 279 } |
280 | 280 |
281 should_warn_all_hosts_ = DONT_WARN_ALL_HOSTS; | 281 should_warn_all_hosts_ = DONT_WARN_ALL_HOSTS; |
282 } | 282 } |
283 | 283 |
284 } // namespace extensions | 284 } // namespace extensions |
OLD | NEW |