pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-12 19:14:47 +02:00
Code Activity

m_dnsbl: fix exempts, allow cidrs, default exempt 127.0.0.0/8

Browse Source
This commit is contained in:
Adam
2017-05-17 08:51:57 -04:00
parent 010d20198e
commit 087f1cb359
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/modules.example.conf
+1 -1
View File
@@ -175,7 +175,7 @@ module { name = "help" }
}
/* Exempt localhost from DNSBL checks */
exempt { ip = "127.0.0.1" }
exempt { ip = "127.0.0.0/8" }
}
/*
modules/m_dnsbl.cpp
+12 -3
View File
@@ -99,7 +99,7 @@ class DNSBLResolver : public Request
class ModuleDNSBL : public Module
{
std::vector<Blacklist> blacklists;
std::set<Anope::string> exempts;
std::set<cidr> exempts;
bool check_on_connect;
bool check_on_netburst;
bool add_to_akill;
@@ -146,7 +146,10 @@ class ModuleDNSBL : public Module
this->exempts.clear();
for (int i = 0; i < block->CountBlock("exempt"); ++i)
this->exempts.insert(block->Get<Anope::string>("ip"));
{
Configuration::Block *bl = block->GetBlock("exempt", i);
this->exempts.insert(bl->Get<Anope::string>("ip"));
}
}
void OnUserConnect(User *user, bool &exempt) anope_override
@@ -162,9 +165,15 @@ class ModuleDNSBL : public Module
/* User doesn't have a valid IPv4 IP (ipv6/spoof/etc) */
return;
if (this->exempts.count(user->ip.addr()))
if (this->blacklists.empty())
return;
if (this->exempts.count(user->ip.addr()))
{
Log(LOG_DEBUG) << "User " << user->nick << " is exempt from dnsbl check - ip: " << user->ip.addr();
return;
}
const unsigned long &ip = user->ip.sa4.sin_addr.s_addr;
unsigned long reverse_ip = (ip << 24) | ((ip & 0xFF00) << 8) | ((ip & 0xFF0000) >> 8) | (ip >> 24);