/*
* InspIRCd -- Internet Relay Chat Daemon
*
+ * Copyright (C) 2018-2020 Matt Schatz <genius3000@g3k.solutions>
+ * Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013, 2016-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013, 2015-2016 Adam <Adam@anope.org>
+ * Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2018 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
- * Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2009 Robin Burchell <robin+git@viroteck.net>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
* redistribute it and/or modify it under the terms of the GNU General Public
"*", them->GetIPString());
if (ServerInstance->XLines->AddLine(kl,NULL))
{
- ServerInstance->SNO->WriteGlobalSno('x', "K-line added due to DNSBL match on *@%s to expire in %s (on %s): %s",
+ ServerInstance->SNO->WriteToSnoMask('x', "K-line added due to DNSBL match on *@%s to expire in %s (on %s): %s",
them->GetIPString().c_str(), InspIRCd::DurationString(kl->duration).c_str(),
InspIRCd::TimeString(kl->expiry).c_str(), reason.c_str());
ServerInstance->XLines->ApplyLines();
"*", them->GetIPString());
if (ServerInstance->XLines->AddLine(gl,NULL))
{
- ServerInstance->SNO->WriteGlobalSno('x', "G-line added due to DNSBL match on *@%s to expire in %s (on %s): %s",
+ ServerInstance->SNO->WriteToSnoMask('x', "G-line added due to DNSBL match on *@%s to expire in %s (on %s): %s",
them->GetIPString().c_str(), InspIRCd::DurationString(gl->duration).c_str(),
InspIRCd::TimeString(gl->expiry).c_str(), reason.c_str());
ServerInstance->XLines->ApplyLines();
them->GetIPString());
if (ServerInstance->XLines->AddLine(zl,NULL))
{
- ServerInstance->SNO->WriteGlobalSno('x', "Z-line added due to DNSBL match on %s to expire in %s (on %s): %s",
+ ServerInstance->SNO->WriteToSnoMask('x', "Z-line added due to DNSBL match on %s to expire in %s (on %s): %s",
them->GetIPString().c_str(), InspIRCd::DurationString(zl->duration).c_str(),
InspIRCd::TimeString(zl->expiry).c_str(), reason.c_str());
ServerInstance->XLines->ApplyLines();
*/
DNSBLConfEntry::EnumBanaction str2banaction(const std::string &action)
{
- if(action.compare("KILL")==0)
+ if (stdalgo::string::equalsci(action, "kill"))
return DNSBLConfEntry::I_KILL;
- if(action.compare("KLINE")==0)
+ if (stdalgo::string::equalsci(action, "kline"))
return DNSBLConfEntry::I_KLINE;
- if(action.compare("ZLINE")==0)
+ if (stdalgo::string::equalsci(action, "zline"))
return DNSBLConfEntry::I_ZLINE;
- if(action.compare("GLINE")==0)
+ if (stdalgo::string::equalsci(action, "gline"))
return DNSBLConfEntry::I_GLINE;
- if(action.compare("MARK")==0)
+ if (stdalgo::string::equalsci(action, "mark"))
return DNSBLConfEntry::I_MARK;
-
return DNSBLConfEntry::I_UNKNOWN;
}
public:
ServerInstance->SNO->EnableSnomask('d', "DNSBL");
}
+ void Prioritize() CXX11_OVERRIDE
+ {
+ Module* corexline = ServerInstance->Modules->Find("core_xline");
+ ServerInstance->Modules->SetPriority(this, I_OnSetUserIP, PRIORITY_AFTER, corexline);
+ }
+
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides handling of DNS blacklists", VF_VENDOR);
+ return Version("Allows the server administrator to check the IP address of connecting users against a DNSBL.", VF_VENDOR);
}
/** Fill our conf vector with data
e->name = tag->getString("name");
e->ident = tag->getString("ident");
e->host = tag->getString("host");
- e->reason = tag->getString("reason");
+ e->reason = tag->getString("reason", "Your IP has been blacklisted.", 1);
e->domain = tag->getString("domain");
if (stdalgo::string::equalsci(tag->getString("type"), "bitmask"))
}
else
{
- if (e->reason.empty())
- {
- std::string location = tag->getTagLocation();
- ServerInstance->SNO->WriteGlobalSno('d', "DNSBL(%s): empty reason, using defaults", location.c_str());
- e->reason = "Your IP has been blacklisted.";
- }
-
/* add it, all is ok */
newentries.push_back(e);
}
void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
{
- if ((user->exempt) || !DNS)
+ if (user->exempt || user->quitting || !DNS)
return;
// Clients can't be in a DNSBL if they aren't connected via IPv4 or IPv6.
return;
}
else
+ {
ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "User has no connect class in OnSetUserIP");
+ return;
+ }
std::string reversedip;
if (user->client_sa.family() == AF_INET)
std::string* match = nameExt.get(user);
if (!match)
- return MOD_RES_PASSTHRU;
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires a DNSBL mark",
+ myclass->GetName().c_str());
+ return MOD_RES_DENY;
+ }
- if (InspIRCd::Match(*match, dnsbl))
- return MOD_RES_PASSTHRU;
+ if (!InspIRCd::Match(*match, dnsbl))
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as the DNSBL mark (%s) does not match %s",
+ myclass->GetName().c_str(), match->c_str(), dnsbl.c_str());
+ return MOD_RES_DENY;
+ }
- return MOD_RES_DENY;
+ return MOD_RES_PASSTHRU;
}
ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE
projects / user / henk / code / inspircd.git / blobdiff