pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-28 06:36:38 +02:00
Code Activity

Added configuration for m_dnsbl for what return values get banned

Browse Source
This commit is contained in:
Adam
2010-09-19 17:21:08 -04:00
parent f8ee95ef98
commit ce69f294a1
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/example.conf
+12 -1
View File
@@ -1744,16 +1744,27 @@ blacklist
{
/* Name of the blacklist */
name = "rbl.efnetrbl.org";
/* How long to set the akill for */
time = 4h;
/* Reason for akill.
* %n is the nick of the user
* %u is the ident/username of the user
* %r is the realname of the user
* %g is the realname of the user
* %h is the hostname of the user
* %i is the IP of the user
* %r is the reason (configured below). Will be nothing if not configured.
*/
reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
/* Replies to ban and their reason. If this is totally ommited all replies get banned */
1 = "Open Proxy";
/* Don't ban for result 2 or 3 */
#2 = "spamtrap666";
#3 = "spamtrap50";
4 = "TOR";
5 = "Drones / Flooding";
}
blacklist
{
modules/extra/m_dnsbl.cpp
+25 -4
View File
@@ -12,8 +12,9 @@ struct Blacklist
Anope::string name;
time_t bantime;
Anope::string reason;
std::map<int, Anope::string> replies;
Blacklist(const Anope::string &n, time_t b, const Anope::string &r) : name(n), bantime(b), reason(r) { }
Blacklist(const Anope::string &n, time_t b, const Anope::string &r, const std::map<int, Anope::string> &re) : name(n), bantime(b), reason(r), replies(re) { }
};
class DNSBLResolver : public DNSRequest
@@ -25,19 +26,32 @@ class DNSBLResolver : public DNSRequest
public:
DNSBLResolver(Module *c, User *u, const Blacklist &b, const Anope::string &host, bool add_akill) : DNSRequest(host, DNS_QUERY_A, true, c), user(u), blacklist(b), add_to_akill(add_akill) { }
void OnLookupComplete(const DNSRecord *)
void OnLookupComplete(const DNSRecord *record)
{
if (!user || user->GetExt("m_dnsbl_akilled"))
return;
Anope::string record_reason;
if (!this->blacklist.replies.empty())
{
sockaddrs sresult;
sresult.pton(AF_INET, record->result);
int result = (sresult.sa4.sin_addr.s_addr & 0xFF000000) >> 24;
if (!this->blacklist.replies.count(result))
return;
record_reason = this->blacklist.replies[result];
}
user->Extend("m_dnsbl_akilled");
Anope::string reason = this->blacklist.reason;
reason = reason.replace_all_ci("%n", user->nick);
reason = reason.replace_all_ci("%u", user->GetIdent());
reason = reason.replace_all_ci("%r", user->realname);
reason = reason.replace_all_ci("%g", user->realname);
reason = reason.replace_all_ci("%h", user->host);
reason = reason.replace_all_ci("%i", user->ip.addr());
reason = reason.replace_all_ci("%r", record_reason);
XLine *x = NULL;
if (this->add_to_akill && SGLine && (x = SGLine->Add(NULL, NULL, Anope::string("*@") + user->host, Anope::CurTime + this->blacklist.bantime, reason)))
@@ -96,8 +110,15 @@ class ModuleDNSBL : public Module
if (bantime < 0)
bantime = 9000;
Anope::string reason = config.ReadValue("blacklist", "reason", "", i);
std::map<int, Anope::string> replies;
for (int j = 0; j < 256; ++j)
{
Anope::string k = config.ReadValue("blacklist", stringify(j), "", i);
if (!k.empty())
replies[j] = k;
}
this->blacklists.push_back(Blacklist(bname, bantime, reason));
this->blacklists.push_back(Blacklist(bname, bantime, reason, replies));
}
}