thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
VadimPE 2018-07-13 15:18:08 +03:00 committed by alexey-milovidov
parent 849f02104f
commit 180ba17e6b
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dbms/src/Interpreters/Users.cpp
View File

@ -48,15 +48,15 @@ static Poco::Net::IPAddress toIPv6(const Poco::Net::IPAddress addr)
} }
/// IP-address or subnet mask. Example: 213.180.204.3 or 10.0.0.1/8 or /// IP-address or subnet mask. Example: 213.180.204.3 or 10.0.0.1/8 or 312.234.1.1/255.255.255.255
/// 2a02:6b8::3 or 2a02:6b8::3/64. /// 2a02:6b8::3 or 2a02:6b8::3/64 or 2a02:6b8::3/ffff:ffff:ffff:ffff:ffff:ffff::
class IPAddressPattern : public IAddressPattern class IPAddressPattern : public IAddressPattern
{ {
private: private:
/// Address of mask. Always transformed to IPv6. /// Address of mask. Always transformed to IPv6.
Poco::Net::IPAddress mask_address; Poco::Net::IPAddress mask_address;
/// Number of bits in mask. /// Mask of net (ip form). Always transformed to IPv6.
UInt8 prefix_bits; Poco::Net::IPAddress ip_mask;
public: public:
explicit IPAddressPattern(const String & str) explicit IPAddressPattern(const String & str)
@ -71,50 +71,43 @@ public:
{ {
String addr(str, 0, pos - str.c_str()); String addr(str, 0, pos - str.c_str());
String str_mask(str, addr.length() + 1, str.length() - addr.length() - 1); String str_mask(str, addr.length() + 1, str.length() - addr.length() - 1);
UInt8 prefix_bits_;
if (isDigits(str_mask)) if (isDigits(str_mask))
{ {
prefix_bits_ = parse<UInt8>(pos + 1); UInt8 prefix_bits = parse<UInt8>(pos + 1);
construct(Poco::Net::IPAddress(addr), prefix_bits);
} }
else else
{ {
Poco::Net::IPAddress ip_mask(str_mask); ip_mask = toIPv6(Poco::Net::IPAddress(str_mask));
prefix_bits_ = ip_mask.prefixLength();
} }
construct(Poco::Net::IPAddress(addr), prefix_bits_);
} }
} }
bool contains(const Poco::Net::IPAddress & addr) const override bool contains(const Poco::Net::IPAddress & addr) const override
{ {
return prefixBitsEquals( return prefixBitsEquals(addr, mask_address, ip_mask);
reinterpret_cast<const char *>(toIPv6(addr).addr()), reinterpret_cast<const char *>(mask_address.addr()), prefix_bits);
} }
private: private:
void construct(const Poco::Net::IPAddress & mask_address_) void construct(const Poco::Net::IPAddress & mask_address_)
{ {
mask_address = toIPv6(mask_address_); mask_address = mask_address_;
prefix_bits = 128; ip_mask = Poco::Net::IPAddress(128, Poco::Net::IPAddress::IPv6);
} }
void construct(const Poco::Net::IPAddress & mask_address_, UInt8 & prefix_bits_) void construct(const Poco::Net::IPAddress & mask_address_, UInt8 prefix_bits_)
{ {
mask_address = toIPv6(mask_address_); mask_address = toIPv6(mask_address_);
prefix_bits = mask_address_.family() == Poco::Net::IPAddress::IPv4 ? prefix_bits_ + 96 : prefix_bits_; prefix_bits = mask_address_.family() == Poco::Net::IPAddress::IPv4 ? prefix_bits_ + 96 : prefix_bits_;
ip_mask = Poco::Net::IPAddress(prefix_bits_, Poco::Net::IPAddress::IPv6);
} }
static bool prefixBitsEquals(const char * lhs, const char * rhs, UInt8 prefix_bits) static bool prefixBitsEquals(const Poco::Net::IPAddress & ip, const Poco::Net::IPAddress & address, const Poco::Net::IPAddress & mask)
{ {
UInt8 prefix_bytes = prefix_bits / 8; return ((toIPv6(ip) & toIPv6(mask)) == (toIPv6(address) & toIPv6(mask)));
UInt8 remaining_bits = prefix_bits % 8;
return 0 == memcmp(lhs, rhs, prefix_bytes)
&& (remaining_bits % 8 == 0
|| (lhs[prefix_bytes] >> (8 - remaining_bits)) == (rhs[prefix_bytes] >> (8 - remaining_bits)));
} }
bool isDigits(const std::string & str) bool isDigit(const std::string & str)
{ {
return str.find_first_not_of("0123456789") == std::string::npos; return str.find_first_not_of("0123456789") == std::string::npos;
} }