| OLD | NEW |
| 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 #include "net/base/ip_pattern.h" | 5 #include "net/base/ip_pattern.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 uint32 minimum; | 28 uint32 minimum; |
| 29 uint32 maximum; | 29 uint32 maximum; |
| 30 }; | 30 }; |
| 31 typedef std::vector<Range> RangeVector; | 31 typedef std::vector<Range> RangeVector; |
| 32 | 32 |
| 33 RangeVector ranges_; | 33 RangeVector ranges_; |
| 34 | 34 |
| 35 DISALLOW_COPY_AND_ASSIGN(ComponentPattern); | 35 DISALLOW_COPY_AND_ASSIGN(ComponentPattern); |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 IPPattern::ComponentPattern::ComponentPattern() {} | 38 IPPattern::ComponentPattern::ComponentPattern() { |
| 39 } |
| 39 | 40 |
| 40 void IPPattern::ComponentPattern::AppendRange(uint32 min, uint32 max) { | 41 void IPPattern::ComponentPattern::AppendRange(uint32 min, uint32 max) { |
| 41 ranges_.push_back(Range(min, max)); | 42 ranges_.push_back(Range(min, max)); |
| 42 } | 43 } |
| 43 | 44 |
| 44 bool IPPattern::ComponentPattern::Match(uint32 value) const { | 45 bool IPPattern::ComponentPattern::Match(uint32 value) const { |
| 45 // Simple linear search should be fine, as we usually only have very few | 46 // Simple linear search should be fine, as we usually only have very few |
| 46 // distinct ranges to test. | 47 // distinct ranges to test. |
| 47 for (RangeVector::const_iterator range_it = ranges_.begin(); | 48 for (RangeVector::const_iterator range_it = ranges_.begin(); |
| 48 range_it != ranges_.end(); ++range_it) { | 49 range_it != ranges_.end(); |
| 50 ++range_it) { |
| 49 if (range_it->maximum >= value && range_it->minimum <= value) | 51 if (range_it->maximum >= value && range_it->minimum <= value) |
| 50 return true; | 52 return true; |
| 51 } | 53 } |
| 52 return false; | 54 return false; |
| 53 } | 55 } |
| 54 | 56 |
| 55 IPPattern::IPPattern() : is_ipv4_(true) {} | 57 IPPattern::IPPattern() : is_ipv4_(true) { |
| 58 } |
| 56 | 59 |
| 57 IPPattern::~IPPattern() { | 60 IPPattern::~IPPattern() { |
| 58 STLDeleteElements(&component_patterns_); | 61 STLDeleteElements(&component_patterns_); |
| 59 } | 62 } |
| 60 | 63 |
| 61 bool IPPattern::Match(const IPAddressNumber& address) const { | 64 bool IPPattern::Match(const IPAddressNumber& address) const { |
| 62 if (ip_mask_.empty()) | 65 if (ip_mask_.empty()) |
| 63 return false; | 66 return false; |
| 64 bool address_is_ipv4 = address.size() == kIPv4AddressSize; | 67 bool address_is_ipv4 = address.size() == kIPv4AddressSize; |
| 65 if (address_is_ipv4 != is_ipv4_) | 68 if (address_is_ipv4 != is_ipv4_) |
| (...skipping 26 matching lines...) Expand all Loading... |
| 92 if (ip_pattern.find(':') != std::string::npos) { | 95 if (ip_pattern.find(':') != std::string::npos) { |
| 93 is_ipv4_ = false; | 96 is_ipv4_ = false; |
| 94 } | 97 } |
| 95 Strings components; | 98 Strings components; |
| 96 base::SplitString(ip_pattern, is_ipv4_ ? '.' : ':', &components); | 99 base::SplitString(ip_pattern, is_ipv4_ ? '.' : ':', &components); |
| 97 if (components.size() != (is_ipv4_ ? 4u : 8u)) { | 100 if (components.size() != (is_ipv4_ ? 4u : 8u)) { |
| 98 DVLOG(1) << "Invalid component count: " << ip_pattern; | 101 DVLOG(1) << "Invalid component count: " << ip_pattern; |
| 99 return false; | 102 return false; |
| 100 } | 103 } |
| 101 for (Strings::iterator component_it = components.begin(); | 104 for (Strings::iterator component_it = components.begin(); |
| 102 component_it != components.end(); ++component_it) { | 105 component_it != components.end(); |
| 106 ++component_it) { |
| 103 if (component_it->empty()) { | 107 if (component_it->empty()) { |
| 104 DVLOG(1) << "Empty component: " << ip_pattern; | 108 DVLOG(1) << "Empty component: " << ip_pattern; |
| 105 return false; | 109 return false; |
| 106 } | 110 } |
| 107 if (*component_it == "*") { | 111 if (*component_it == "*") { |
| 108 // Let standard code handle this below. | 112 // Let standard code handle this below. |
| 109 *component_it = is_ipv4_ ? "[0-255]" : "[0-FFFF]"; | 113 *component_it = is_ipv4_ ? "[0-255]" : "[0-FFFF]"; |
| 110 } else if ((*component_it)[0] != '[') { | 114 } else if ((*component_it)[0] != '[') { |
| 111 // This value will just have a specific integer to match. | 115 // This value will just have a specific integer to match. |
| 112 uint32 value; | 116 uint32 value; |
| 113 if (!ValueTextToInt(*component_it, &value)) | 117 if (!ValueTextToInt(*component_it, &value)) |
| 114 return false; | 118 return false; |
| 115 ip_mask_.push_back(true); | 119 ip_mask_.push_back(true); |
| 116 component_values_.push_back(value); | 120 component_values_.push_back(value); |
| 117 continue; | 121 continue; |
| 118 } | 122 } |
| 119 if ((*component_it)[component_it->size() - 1] != ']') { | 123 if ((*component_it)[component_it->size() - 1] != ']') { |
| 120 DVLOG(1) << "Missing close bracket: " << ip_pattern; | 124 DVLOG(1) << "Missing close bracket: " << ip_pattern; |
| 121 return false; | 125 return false; |
| 122 } | 126 } |
| 123 // Now we know the size() is at least 2. | 127 // Now we know the size() is at least 2. |
| 124 if (component_it->size() == 2) { | 128 if (component_it->size() == 2) { |
| 125 DVLOG(1) << "Empty bracket: " << ip_pattern; | 129 DVLOG(1) << "Empty bracket: " << ip_pattern; |
| 126 return false; | 130 return false; |
| 127 } | 131 } |
| 128 // We'll need a pattern to match this bracketed component. | 132 // We'll need a pattern to match this bracketed component. |
| 129 scoped_ptr<ComponentPattern> component_pattern(new ComponentPattern); | 133 scoped_ptr<ComponentPattern> component_pattern(new ComponentPattern); |
| 130 // Trim leading and trailing bracket before calling for parsing. | 134 // Trim leading and trailing bracket before calling for parsing. |
| 131 if (!ParseComponentPattern(base::StringPiece(component_it->data() + 1, | 135 if (!ParseComponentPattern(base::StringPiece(component_it->data() + 1, |
| 132 component_it->size() - 2), component_pattern.get())) { | 136 component_it->size() - 2), |
| 137 component_pattern.get())) { |
| 133 return false; | 138 return false; |
| 134 } | 139 } |
| 135 ip_mask_.push_back(false); | 140 ip_mask_.push_back(false); |
| 136 component_patterns_.push_back(component_pattern.release()); | 141 component_patterns_.push_back(component_pattern.release()); |
| 137 } | 142 } |
| 138 return true; | 143 return true; |
| 139 } | 144 } |
| 140 | 145 |
| 141 bool IPPattern::ParseComponentPattern(const base::StringPiece& text, | 146 bool IPPattern::ParseComponentPattern(const base::StringPiece& text, |
| 142 ComponentPattern* pattern) const { | 147 ComponentPattern* pattern) const { |
| 143 // We're given a comma separated set of ranges, some of which may be simple | 148 // We're given a comma separated set of ranges, some of which may be simple |
| 144 // constants. | 149 // constants. |
| 145 Strings ranges; | 150 Strings ranges; |
| 146 base::SplitString(text.as_string(), ',', &ranges); | 151 base::SplitString(text.as_string(), ',', &ranges); |
| 147 for (Strings::iterator range_it = ranges.begin(); | 152 for (Strings::iterator range_it = ranges.begin(); range_it != ranges.end(); |
| 148 range_it != ranges.end(); ++range_it) { | 153 ++range_it) { |
| 149 base::StringTokenizer range_pair(*range_it, "-"); | 154 base::StringTokenizer range_pair(*range_it, "-"); |
| 150 uint32 min = 0; | 155 uint32 min = 0; |
| 151 range_pair.GetNext(); | 156 range_pair.GetNext(); |
| 152 if (!ValueTextToInt(range_pair.token(), &min)) | 157 if (!ValueTextToInt(range_pair.token(), &min)) |
| 153 return false; | 158 return false; |
| 154 uint32 max = min; // Sometimes we have no distinct max. | 159 uint32 max = min; // Sometimes we have no distinct max. |
| 155 if (range_pair.GetNext()) { | 160 if (range_pair.GetNext()) { |
| 156 if (!ValueTextToInt(range_pair.token(), &max)) | 161 if (!ValueTextToInt(range_pair.token(), &max)) |
| 157 return false; | 162 return false; |
| 158 } | 163 } |
| 159 if (range_pair.GetNext()) { | 164 if (range_pair.GetNext()) { |
| 160 // Too many "-" in this range specifier. | 165 // Too many "-" in this range specifier. |
| 161 DVLOG(1) << "Too many hyphens in range: "; | 166 DVLOG(1) << "Too many hyphens in range: "; |
| 162 return false; | 167 return false; |
| 163 } | 168 } |
| 164 pattern->AppendRange(min, max); | 169 pattern->AppendRange(min, max); |
| 165 } | 170 } |
| 166 return true; | 171 return true; |
| 167 } | 172 } |
| 168 | 173 |
| 169 bool IPPattern::ValueTextToInt(const base::StringPiece& input, | 174 bool IPPattern::ValueTextToInt(const base::StringPiece& input, |
| 170 uint32* output) const { | 175 uint32* output) const { |
| 171 bool ok = is_ipv4_ ? base::StringToUint(input, output) : | 176 bool ok = is_ipv4_ ? base::StringToUint(input, output) |
| 172 base::HexStringToUInt(input, output); | 177 : base::HexStringToUInt(input, output); |
| 173 if (!ok) { | 178 if (!ok) { |
| 174 DVLOG(1) << "Could not convert value to number: " << input; | 179 DVLOG(1) << "Could not convert value to number: " << input; |
| 175 return false; | 180 return false; |
| 176 } | 181 } |
| 177 if (is_ipv4_ && *output > 255u) { | 182 if (is_ipv4_ && *output > 255u) { |
| 178 DVLOG(1) << "IPv4 component greater than 255"; | 183 DVLOG(1) << "IPv4 component greater than 255"; |
| 179 return false; | 184 return false; |
| 180 } | 185 } |
| 181 if (!is_ipv4_ && *output > 0xFFFFu) { | 186 if (!is_ipv4_ && *output > 0xFFFFu) { |
| 182 DVLOG(1) << "IPv6 component greater than 0xFFFF"; | 187 DVLOG(1) << "IPv6 component greater than 0xFFFF"; |
| 183 return false; | 188 return false; |
| 184 } | 189 } |
| 185 return ok; | 190 return ok; |
| 186 } | 191 } |
| 187 | 192 |
| 188 } // namespace net | 193 } // namespace net |
| OLD | NEW |