Commit 0caa1d89 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[trac1069] cleanup: removed ACL related definitions and tests from Client.

they were moved to acl::dns and merged with RequestContext.
parent e3b0557e
......@@ -66,10 +66,3 @@ std::ostream&
isc::server_common::operator<<(std::ostream& os, const Client& client) {
return (os << client.toText());
}
template <>
bool
IPCheck<Client>::matches(const Client& client) const {
const IPAddress& request_src(client.getRequestSourceIPAddress());
return (compare(request_src.getData(), request_src.getFamily()));
}
......@@ -145,17 +145,6 @@ private:
/// parameter \c os after the insertion operation.
std::ostream& operator<<(std::ostream& os, const Client& client);
}
namespace acl {
/// The specialization of \c IPCheck for access control with \c Client.
///
/// It returns \c true if the source IP address of the client's request
/// matches the expression encapsulated in the \c IPCheck, and returns
/// \c false if not.
template <>
bool IPCheck<server_common::Client>::matches(
const server_common::Client& client) const;
}
}
#endif // __CLIENT_H
......
......@@ -89,30 +89,6 @@ TEST_F(ClientTest, constructIPv6) {
client6->getRequestSourceIPAddress().getData(), 16));
}
TEST_F(ClientTest, ACLCheckIPv4) {
// Exact match
EXPECT_TRUE(IPCheck<Client>("192.0.2.1").matches(*client4));
// Exact match (negative)
EXPECT_FALSE(IPCheck<Client>("192.0.2.53").matches(*client4));
// Prefix match
EXPECT_TRUE(IPCheck<Client>("192.0.2.0/24").matches(*client4));
// Prefix match (negative)
EXPECT_FALSE(IPCheck<Client>("192.0.1.0/24").matches(*client4));
// Address family mismatch (the first 4 bytes of the IPv6 address has the
// same binary representation as the client's IPv4 address, which
// shouldn't confuse the match logic)
EXPECT_FALSE(IPCheck<Client>("c000:0201::").matches(*client4));
}
TEST_F(ClientTest, ACLCheckIPv6) {
// The following are a set of tests of the same concept as ACLCheckIPv4
EXPECT_TRUE(IPCheck<Client>("2001:db8::1").matches(*client6));
EXPECT_FALSE(IPCheck<Client>("2001:db8::53").matches(*client6));
EXPECT_TRUE(IPCheck<Client>("2001:db8::/64").matches(*client6));
EXPECT_FALSE(IPCheck<Client>("2001:db8:1::/64").matches(*client6));
EXPECT_FALSE(IPCheck<Client>("32.1.13.184").matches(*client6));
}
TEST_F(ClientTest, toText) {
EXPECT_EQ("192.0.2.1#53214", client4->toText());
EXPECT_EQ("2001:db8::1#53216", client6->toText());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment