* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
/* $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 };
class DNSBLResolver : public Resolver
{
int theirfd;
- userrec* them;
+ User* them;
DNSBLConfEntry *ConfEntry;
public:
- DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, userrec* u, int userfd, DNSBLConfEntry *conf, bool &cached)
- : Resolver(ServerInstance, hostname, DNS_QUERY_A, cached, me)
+ DNSBLResolver(Module *me, InspIRCd *Instance, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached)
+ : Resolver(Instance, hostname, DNS_QUERY_A, cached, me)
{
theirfd = userfd;
them = u;
{
case DNSBLConfEntry::I_KILL:
{
- userrec::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
+ ServerInstance->Users->QuitUser(them, std::string("Killed (") + reason + ")");
break;
}
case DNSBLConfEntry::I_KLINE:
{
- std::string ban = std::string("*@") + them->GetIPString();
- if (show)
- ServerInstance->XLines->apply_lines(APPLY_KLINES);
- show = ServerInstance->XLines->add_kline(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, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+ "*", them->GetIPString());
+ if (ServerInstance->XLines->AddLine(kl,NULL))
+ {
+ ServerInstance->XLines->ApplyLines();
+ }
+ else
+ delete kl;
break;
}
case DNSBLConfEntry::I_GLINE:
{
- std::string ban = std::string("*@") + them->GetIPString();
- show = ServerInstance->XLines->add_gline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str());
- if (show)
- ServerInstance->XLines->apply_lines(APPLY_GLINES);
- FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, ban));
+ GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+ "*", them->GetIPString());
+ if (ServerInstance->XLines->AddLine(gl,NULL))
+ {
+ ServerInstance->XLines->ApplyLines();
+ }
+ else
+ delete gl;
break;
}
case DNSBLConfEntry::I_ZLINE:
{
- show = ServerInstance->XLines->add_zline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), them->GetIPString());
- if (show)
- ServerInstance->XLines->apply_lines(APPLY_ZLINES);
- FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString()));
+ ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
+ them->GetIPString());
+ if (ServerInstance->XLines->AddLine(zl,NULL))
+ {
+ ServerInstance->XLines->ApplyLines();
+ }
+ else
+ delete zl;
break;
}
case DNSBLConfEntry::I_UNKNOWN:
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->WriteToSnoMask('A', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->name.c_str(), bitmask);
}
}
else
ModuleDNSBL(InspIRCd *Me) : Module(Me)
{
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("$Id$", 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();
}
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));
-
+
/* Use portparser for record replies */
/* yeah, logic here is a little messy */
if (e->bitmask <= 0)
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): invalid bitmask",i);
+ ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): invalid bitmask",i);
}
else if (e->name.empty())
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i);
+ ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid name",i);
}
else if (e->domain.empty())
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i);
+ ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid domain",i);
}
else if (e->banaction == DNSBLConfEntry::I_UNKNOWN)
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i);
+ ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid banaction", i);
}
else
{
if (e->reason.empty())
{
- ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i);
+ ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): empty reason, using defaults",i);
e->reason = "Your IP has been blacklisted.";
}
delete MyConf;
}
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
ReadConf();
}
- virtual int OnUserRegister(userrec* user)
+ virtual int OnUserRegister(User* user)
{
/* only do lookups on local users */
if (IS_LOCAL(user))
/* don't do anything with this hot potato */
return 0;
}
-
- virtual int OnStats(char symbol, userrec* user, string_list &results)
+
+ virtual int OnStats(char symbol, User* user, string_list &results)
{
if (symbol != 'd')
return 0;
-
+
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;
}
};
projects / user / henk / code / inspircd.git / blobdiff