Fix iteration of ServerInstance->Users->local_users now that QuitUser can modify...

[user/henk/code/inspircd.git] / src / modules / m_dnsbl.cpp

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 7fb652cf715ffa8ee7cd012398fa975dcc45b4b3..8ce1ce37c4b26617b38d2ddaefea5d0764f71d27 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -27,9 +27,9 @@
 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;
@@ -107,13 +107,29 @@ class DNSBLResolver : public Resolver
                                                        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:
                                                {
                                                        KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(),
                                                                        "*", them->GetIPString());
                                                        if (ServerInstance->XLines->AddLine(kl,NULL))
                                                        {
-                                                               ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added K:line on *@%s to expire on %s (%s).", 
+                                                               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();
                                                        }
@@ -127,7 +143,7 @@ class DNSBLResolver : public Resolver
                                                                        "*", them->GetIPString());
                                                        if (ServerInstance->XLines->AddLine(gl,NULL))
                                                        {
-                                                               ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added G:line on *@%s to expire on %s (%s).", 
+                                                               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();
                                                        }
@@ -141,7 +157,7 @@ class DNSBLResolver : public Resolver
                                                                        them->GetIPString());
                                                        if (ServerInstance->XLines->AddLine(zl,NULL))
                                                        {
-                                                               ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added Z:line on *@%s to expire on %s (%s).", 
+                                                               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();
                                                        }
@@ -156,7 +172,7 @@ class DNSBLResolver : public Resolver
                                                break;
                                        }
 
-                                       ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->name.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
+                                       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++;
@@ -193,6 +209,8 @@ class ModuleDNSBL : public Module
                        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;
        }
@@ -236,6 +254,8 @@ class ModuleDNSBL : public Module
                        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);
 
@@ -305,7 +325,7 @@ class ModuleDNSBL : public Module
                ReadConf();
        }
 
-       virtual int OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(User* user)
        {
                /* only do lookups on local users */
                if (IS_LOCAL(user))
@@ -320,7 +340,7 @@ class ModuleDNSBL : public Module
                        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;
@@ -344,13 +364,13 @@ class ModuleDNSBL : public Module
                }
 
                /* 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;
 
@@ -366,7 +386,7 @@ class ModuleDNSBL : public Module
                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;
        }
 };