Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport Rec ecs cache limit with tt (7631) #7651

Merged
merged 14 commits into from
Apr 2, 2019
Merged

Backport Rec ecs cache limit with tt (7631) #7651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5eac74b
implement a configurable ECS cache limit, defaulting to /24 and /56 o…
ahupowerdns Mar 12, 2019
973db90
rec: Move the ECS cache limit check to the SyncRes
rgacogne Mar 12, 2019
7ad6637
rec: Add unit tests for the ECS cache limit feature
rgacogne Mar 12, 2019
0b8eeae
rec: Document 'ecs-ipv4-cache-bits' and 'ecs-ipv6-cache-bits'
rgacogne Mar 12, 2019
ca0d90a
rec: Set ecs-ipv4-cache-bits and ecs-ipv6-cache-bits in the tests
rgacogne Mar 12, 2019
c3b0277
Initial code for ecs-cache-limit-ttl.
omoerbeek Mar 27, 2019
ffd3611
Add tests for ecs-cache-limit-ttl
omoerbeek Mar 27, 2019
08977b7
New approach. I spelled out the logic to make it more clear.
omoerbeek Mar 29, 2019
d92c5da
Only apply "do not cache" if both limits are set and satisfied. Doc …
omoerbeek Apr 1, 2019
8361f5b
Reformulate condition and comment to make it more clear.
omoerbeek Apr 1, 2019
32c02b0
Resolve merge errors
omoerbeek Apr 1, 2019
bc03f2d
Make unit test work.
omoerbeek Apr 1, 2019
2a4a023
Fix do not cache condition (merge error spotted by rcagogne)
omoerbeek Apr 1, 2019
e014a79
Move the setQuerySource() method to a wrapper in the syncres test code.
omoerbeek Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pdns/recursordist/test-syncres_cc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1926,7 +1926,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_limit_allowed) {
sr->setQuerySource(ComboAddress(), boost::optional<const EDNSSubnetOpts&>(incomingECS));
SyncRes::s_ecsipv4cachelimit = 24;

sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, LWResult* res, bool* chained) {
sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, std::shared_ptr<RemoteLogger> outgoingLogger, LWResult* res, bool* chained) {

BOOST_REQUIRE(srcmask);
BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24");
Expand Down Expand Up @@ -1965,7 +1965,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_limit_no_ttl_limit_allowed) {
sr->setQuerySource(ComboAddress(), boost::optional<const EDNSSubnetOpts&>(incomingECS));
SyncRes::s_ecsipv4cachelimit = 16;

sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, LWResult* res, bool* chained) {
sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, std::shared_ptr<RemoteLogger> outgoingLogger, LWResult* res, bool* chained) {

BOOST_REQUIRE(srcmask);
BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24");
Expand Down Expand Up @@ -2004,7 +2004,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_allowed) {
sr->setQuerySource(ComboAddress(), boost::optional<const EDNSSubnetOpts&>(incomingECS));
SyncRes::s_ecscachelimitttl = 30;

sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, LWResult* res, bool* chained) {
sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, std::shared_ptr<RemoteLogger> outgoingLogger, LWResult* res, bool* chained) {

BOOST_REQUIRE(srcmask);
BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24");
Expand Down Expand Up @@ -2044,7 +2044,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_and_scope_allowed) {
SyncRes::s_ecscachelimitttl = 100;
SyncRes::s_ecsipv4cachelimit = 24;

sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, LWResult* res, bool* chained) {
sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, std::shared_ptr<RemoteLogger> outgoingLogger, LWResult* res, bool* chained) {

BOOST_REQUIRE(srcmask);
BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24");
Expand Down Expand Up @@ -2084,7 +2084,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_notallowed) {
SyncRes::s_ecscachelimitttl = 100;
SyncRes::s_ecsipv4cachelimit = 16;

sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, LWResult* res, bool* chained) {
sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional<Netmask>& srcmask, boost::optional<const ResolveContext&> context, std::shared_ptr<RemoteLogger> outgoingLogger, LWResult* res, bool* chained) {

BOOST_REQUIRE(srcmask);
BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24");
Expand Down
1 change: 1 addition & 0 deletions pdns/syncres.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2927,3 +2927,4 @@ int SyncRes::getRootNS(struct timeval now, asyncresolve_t asyncCallback) {

return res;
}

6 changes: 6 additions & 0 deletions pdns/syncres.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,12 @@ public:
d_skipCNAMECheck = skip;
}

void setQuerySource(const ComboAddress& requestor, boost::optional<const EDNSSubnetOpts&> incomingECS) {
omoerbeek marked this conversation as resolved.
Show resolved Hide resolved

setIncomingECSFound();
setIncomingECS(incomingECS);
}

void setIncomingECS(boost::optional<const EDNSSubnetOpts&> incomingECS);

#ifdef HAVE_PROTOBUF
Expand Down