* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
/* $ModDesc: Provides handling of DNS blacklists */
/* Class holding data for a single entry */
-class DNSBLConfEntry
+class DNSBLConfEntry : public classbase
{
public:
- enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE };
+ enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE, I_MARK };
enum EnumType { A_RECORD, A_BITMASK };
- std::string name, domain, reason;
+ std::string name, ident, host, domain, reason;
EnumBanaction banaction;
EnumType type;
long duration;
public:
- DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached)
- : Resolver(ServerInstance, hostname, DNS_QUERY_A, cached, me)
+ DNSBLResolver(Module *me, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached)
+ : Resolver(hostname, DNS_QUERY_A, cached, me)
{
theirfd = userfd;
them = u;
}
/* Note: This may be called multiple times for multiple A record results */
- virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+ virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
{
- /* for bitmask reply types, we arent interested in any but the first result (number 0) */
- if ((ConfEntry->type == DNSBLConfEntry::A_BITMASK) && (resultnum))
- return;
-
/* Check the user still exists */
if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
{
if(result.length())
{
unsigned int bitmask = 0, record = 0;
- bool show = false, match = false;
+ bool match = false;
in_addr resultip;
inet_aton(result.c_str(), &resultip);
{
case DNSBLConfEntry::I_KILL:
{
- User::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
+ ServerInstance->Users->QuitUser(them, std::string("Killed (") + reason + ")");
+ break;
+ }
+ case DNSBLConfEntry::I_MARK:
+ {
+ if (!ConfEntry->ident.empty())
+ {
+ them->WriteServ("304 " + them->nick + " :Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
+ them->ChangeIdent(ConfEntry->ident.c_str());
+ }
+
+ if (!ConfEntry->host.empty())
+ {
+ them->WriteServ("304 " + them->nick + " :Your host has been set to " + ConfEntry->host + " because you matched " + reason);
+ them->ChangeDisplayedHost(ConfEntry->host.c_str());
+ }
+
break;
}
case DNSBLConfEntry::I_KLINE:
{
- std::string ban = std::string("*@") + them->GetIPString();
- if (show)
- ServerInstance->XLines->ApplyLines();
- show = ServerInstance->XLines->AddKLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str());
- FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, ban));
+ KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+ "*", them->GetIPString());
+ if (ServerInstance->XLines->AddLine(kl,NULL))
+ {
+ ServerInstance->SNO->WriteGlobalSno('x',"K:line added due to DNSBL match on *@%s to expire on %s: %s",
+ them->GetIPString(), ServerInstance->TimeString(kl->expiry).c_str(), reason.c_str());
+ ServerInstance->XLines->ApplyLines();
+ }
+ else
+ delete kl;
break;
}
case DNSBLConfEntry::I_GLINE:
{
- std::string ban = std::string("*@") + them->GetIPString();
- show = ServerInstance->XLines->AddGLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str());
- if (show)
+ GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+ "*", them->GetIPString());
+ if (ServerInstance->XLines->AddLine(gl,NULL))
+ {
+ ServerInstance->SNO->WriteGlobalSno('x',"G:line added due to DNSBL match on *@%s to expire on %s: %s",
+ them->GetIPString(), ServerInstance->TimeString(gl->expiry).c_str(), reason.c_str());
ServerInstance->XLines->ApplyLines();
- FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, ban));
+ }
+ else
+ delete gl;
break;
}
case DNSBLConfEntry::I_ZLINE:
{
- show = ServerInstance->XLines->AddZLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), them->GetIPString());
- if (show)
+ ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+ them->GetIPString());
+ if (ServerInstance->XLines->AddLine(zl,NULL))
+ {
+ ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on *@%s to expire on %s: %s",
+ them->GetIPString(), ServerInstance->TimeString(zl->expiry).c_str(), reason.c_str());
ServerInstance->XLines->ApplyLines();
- FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString()));
+ }
+ else
+ delete zl;
break;
}
case DNSBLConfEntry::I_UNKNOWN:
break;
}
- if (show)
- {
- ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask);
- }
+ ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
}
else
ConfEntry->stats_misses++;
return DNSBLConfEntry::I_ZLINE;
if(action.compare("GLINE")==0)
return DNSBLConfEntry::I_GLINE;
+ if(action.compare("MARK")==0)
+ return DNSBLConfEntry::I_MARK;
return DNSBLConfEntry::I_UNKNOWN;
}
public:
- ModuleDNSBL(InspIRCd *Me) : Module(Me)
- {
+ ModuleDNSBL() {
ReadConf();
+ Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnStats };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
}
virtual ~ModuleDNSBL()
virtual Version GetVersion()
{
- return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION);
+ return Version("Provides handling of DNS blacklists", VF_VENDOR, API_VERSION);
}
- void Implements(char* List)
- {
- List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnStats] = 1;
- }
/** Clear entries and free the mem it was using
*/
void ClearEntries()
{
- std::vector<DNSBLConfEntry *>::iterator i;
for (std::vector<DNSBLConfEntry *>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
delete *i;
DNSBLConfEntries.clear();
*/
virtual void ReadConf()
{
- ConfigReader *MyConf = new ConfigReader(ServerInstance);
+ ConfigReader *MyConf = new ConfigReader;
ClearEntries();
for (int i=0; i< MyConf->Enumerate("dnsbl"); i++)
DNSBLConfEntry *e = new DNSBLConfEntry();
e->name = MyConf->ReadValue("dnsbl", "name", i);
+ e->ident = MyConf->ReadValue("dnsbl", "ident", i);
+ e->host = MyConf->ReadValue("dnsbl", "host", i);
e->reason = MyConf->ReadValue("dnsbl", "reason", i);
e->domain = MyConf->ReadValue("dnsbl", "domain", i);
}
else
{
- memset(e->records, 0, 256);
+ memset(e->records, 0, sizeof(e->records));
e->type = DNSBLConfEntry::A_RECORD;
irc::portparser portrange(MyConf->ReadValue("dnsbl", "records", i), false);
long item = -1;
}
e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i));
- e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i));
-
+ e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", "60", i));
+
/* Use portparser for record replies */
/* yeah, logic here is a little messy */
- if (e->bitmask <= 0)
+ if ((e->bitmask <= 0) && (DNSBLConfEntry::A_BITMASK == e->type))
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): invalid bitmask",i);
+ ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): invalid bitmask",i);
}
else if (e->name.empty())
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i);
+ ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid name",i);
}
else if (e->domain.empty())
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i);
+ ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid domain",i);
}
else if (e->banaction == DNSBLConfEntry::I_UNKNOWN)
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i);
+ ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid banaction", i);
+ }
+ else if (e->duration <= 0)
+ {
+ ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid duration", i);
}
else
{
if (e->reason.empty())
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i);
+ ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): empty reason, using defaults",i);
e->reason = "Your IP has been blacklisted.";
}
delete MyConf;
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
ReadConf();
}
- virtual int OnUserRegister(User* user)
+ virtual ModResult OnUserRegister(User* user)
{
/* only do lookups on local users */
if (IS_LOCAL(user))
unsigned char a, b, c, d;
char reversedipbuf[128];
std::string reversedip;
- bool success = false;
+ bool success;
- if (!inet_aton(user->GetIPString(), &in))
- {
-#ifdef IPV6
- /* We could have an ipv6 address here */
- std::string x = user->GetIPString();
- /* Is it a 4in6 address? (Compensate for this kernel kludge that people love) */
- if (x.find("0::ffff:") == 0)
- {
- x.erase(x.begin(), x.begin() + 8);
- if (inet_aton(x.c_str(), &in))
- success = true;
- }
-#endif
- }
- else
- {
- success = true;
- }
+ success = inet_aton(user->GetIPString(), &in);
if (!success)
- return 0;
+ return MOD_RES_PASSTHRU;
d = (unsigned char) (in.s_addr >> 24) & 0xFF;
c = (unsigned char) (in.s_addr >> 16) & 0xFF;
/* now we'd need to fire off lookups for `hostname'. */
bool cached;
- DNSBLResolver *r = new DNSBLResolver(this, ServerInstance, hostname, user, user->GetFd(), *i, cached);
+ DNSBLResolver *r = new DNSBLResolver(this, hostname, user, user->GetFd(), *i, cached);
ServerInstance->AddResolver(r, cached);
}
}
/* don't do anything with this hot potato */
- return 0;
+ return MOD_RES_PASSTHRU;
}
-
- virtual int OnStats(char symbol, User* user, string_list &results)
+
+ virtual ModResult OnStats(char symbol, User* user, string_list &results)
{
if (symbol != 'd')
- return 0;
-
+ return MOD_RES_PASSTHRU;
+
unsigned long total_hits = 0, total_misses = 0;
for (std::vector<DNSBLConfEntry*>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
{
total_hits += (*i)->stats_hits;
total_misses += (*i)->stats_misses;
-
+
results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
ConvToStr((*i)->stats_hits) + " hits and " + ConvToStr((*i)->stats_misses) + " misses");
}
-
+
results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
-
- return 0;
+
+ return MOD_RES_PASSTHRU;
}
};
projects / user / henk / code / inspircd.git / blobdiff