X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=cce2e785531ad3c38b6fd3283fdeb173a8712aa0;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=f47dc4b539bc6d9878e5a2de47faf07facf7ad50;hpb=cff57f7ba780a5c4fc331ccbab489abdc572379c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index f47dc4b53..cce2e7855 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -24,16 +24,11 @@ #include "inspircd.h" - -#ifndef WINDOWS -#include -#include -#include -#endif +#include "xline.h" /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */ -enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; +enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; /** Holds a CGI site's details @@ -45,7 +40,7 @@ public: CGItype type; std::string password; - CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST, const std::string &spassword ="") + CGIhost(const std::string &mask, CGItype t, const std::string &spassword) : hostmask(mask), type(t), password(spassword) { } @@ -94,9 +89,19 @@ class CommandWebirc : public Command { realhost.set(user, user->host); realip.set(user, user->GetIPString()); + + bool host_ok = (parameters[2].length() < 64); + const std::string& newhost = (host_ok ? parameters[2] : parameters[3]); + if (notify) - ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), parameters[2].c_str(), user->host.c_str()); - webirc_hostname.set(user, parameters[2]); + ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), newhost.c_str(), user->host.c_str()); + + // Check if we're happy with the provided hostname. If it's problematic then make sure we won't set a host later, just the IP + if (host_ok) + webirc_hostname.set(user, parameters[2]); + else + webirc_hostname.unset(user); + webirc_ip.set(user, parameters[3]); return CMD_SUCCESS; } @@ -118,9 +123,9 @@ class CGIResolver : public Resolver LocalIntExt& waiting; bool notify; public: - CGIResolver(Module* me, bool NotifyOpers, const std::string &source, bool forward, LocalUser* u, + CGIResolver(Module* me, bool NotifyOpers, const std::string &source, LocalUser* u, const std::string &type, bool &cached, LocalIntExt& ext) - : Resolver(source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theiruid(u->uuid), + : Resolver(source, DNS_QUERY_PTR4, cached, me), typ(type), theiruid(u->uuid), waiting(ext), notify(NotifyOpers) { } @@ -129,7 +134,7 @@ class CGIResolver : public Resolver { /* Check the user still exists */ User* them = ServerInstance->FindUUID(theiruid); - if (them) + if ((them) && (!them->quitting)) { if (notify) ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), result.c_str(), typ.c_str()); @@ -145,11 +150,13 @@ class CGIResolver : public Resolver virtual void OnError(ResolverError e, const std::string &errormessage) { + if (!notify) + return; + User* them = ServerInstance->FindUUID(theiruid); - if (them) + if ((them) && (!them->quitting)) { - if (notify) - ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host.c_str(), typ.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host.c_str(), typ.c_str()); } } @@ -168,6 +175,48 @@ class ModuleCgiIRC : public Module { CommandWebirc cmd; LocalIntExt waiting; + + static void RecheckClass(LocalUser* user) + { + user->MyClass = NULL; + user->SetClass(); + user->CheckClass(); + } + + static void ChangeIP(LocalUser* user, const std::string& newip) + { + ServerInstance->Users->RemoveCloneCounts(user); + user->SetClientIP(newip.c_str()); + ServerInstance->Users->AddLocalClone(user); + ServerInstance->Users->AddGlobalClone(user); + } + + void HandleIdentOrPass(LocalUser* user, const std::string& newip, bool was_pass) + { + cmd.realhost.set(user, user->host); + cmd.realip.set(user, user->GetIPString()); + ChangeIP(user, newip); + user->host = user->dhost = user->GetIPString(); + user->InvalidateCache(); + RecheckClass(user); + // Don't create the resolver if the core couldn't put the user in a connect class or when dns is disabled + if (user->quitting || ServerInstance->Config->NoUserDns) + return; + + try + { + bool cached; + CGIResolver* r = new CGIResolver(this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), cached, waiting); + waiting.set(user, waiting.get(user) + 1); + ServerInstance->AddResolver(r, cached); + } + catch (...) + { + if (cmd.notify) + ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str()); + } + } + public: ModuleCgiIRC() : cmd(this), waiting("cgiirc-delay", this) { @@ -176,15 +225,11 @@ public: void init() { OnRehash(NULL); - ServerInstance->AddCommand(&cmd); - ServerInstance->Extensions.Register(&cmd.realhost); - ServerInstance->Extensions.Register(&cmd.realip); - ServerInstance->Extensions.Register(&cmd.webirc_hostname); - ServerInstance->Extensions.Register(&cmd.webirc_ip); - ServerInstance->Extensions.Register(&waiting); + ServiceProvider* providerlist[] = { &cmd, &cmd.realhost, &cmd.realip, &cmd.webirc_hostname, &cmd.webirc_ip, &waiting }; + ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*)); Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady }; - ServerInstance->Modules->Attach(eventlist, this, 3); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } void OnRehash(User* user) @@ -204,12 +249,13 @@ public: if(hostmask.length()) { - if (type == "webirc" && !password.length()) { - ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str()); + if (type == "webirc" && password.empty()) + { + ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str()); } else { - CGItype cgitype = INVALID; + CGItype cgitype; if (type == "pass") cgitype = PASS; else if (type == "ident") @@ -217,14 +263,14 @@ public: else if (type == "passfirst") cgitype = PASSFIRST; else if (type == "webirc") - { cgitype = WEBIRC; - } - - if (cgitype == INVALID) + else + { cgitype = PASS; + ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid value in config: %s, setting it to \"pass\"", type.c_str()); + } - cmd.Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" )); + cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password)); } } else @@ -244,27 +290,23 @@ public: if (!webirc_ip) return MOD_RES_PASSTHRU; - ServerInstance->Users->RemoveCloneCounts(user); - user->SetClientIP(webirc_ip->c_str()); - cmd.webirc_ip.unset(user); + ChangeIP(user, *webirc_ip); std::string* webirc_hostname = cmd.webirc_hostname.get(user); - if (webirc_hostname && webirc_hostname->length() < 64) - user->host = user->dhost = *webirc_hostname; - else - user->host = user->dhost = user->GetIPString(); - + user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString()); user->InvalidateCache(); - cmd.webirc_hostname.unset(user); - ServerInstance->Users->AddLocalClone(user); - ServerInstance->Users->AddGlobalClone(user); - user->SetClass(); - user->CheckClass(); + RecheckClass(user); + if (user->quitting) + return MOD_RES_DENY; + user->CheckLines(true); if (user->quitting) return MOD_RES_DENY; + cmd.webirc_hostname.unset(user); + cmd.webirc_ip.unset(user); + return MOD_RES_PASSTHRU; } @@ -311,32 +353,7 @@ public: { if(IsValidHost(user->password)) { - cmd.realhost.set(user, user->host); - cmd.realip.set(user, user->GetIPString()); - user->host = user->password; - user->dhost = user->password; - user->InvalidateCache(); - - ServerInstance->Users->RemoveCloneCounts(user); - user->SetClientIP(user->password.c_str()); - ServerInstance->Users->AddLocalClone(user); - ServerInstance->Users->AddGlobalClone(user); - user->SetClass(); - user->CheckClass(); - - try - { - bool cached; - CGIResolver* r = new CGIResolver(this, cmd.notify, user->password, false, user, "PASS", cached, waiting); - ServerInstance->AddResolver(r, cached); - waiting.set(user, waiting.get(user) + 1); - } - catch (...) - { - if (cmd.notify) - ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str()); - } - + HandleIdentOrPass(user, user->password, true); user->password.clear(); return true; } @@ -347,12 +364,11 @@ public: bool CheckIdent(LocalUser* user) { const char* ident; - int len = user->ident.length(); in_addr newip; - if(len == 8) + if (user->ident.length() == 8) ident = user->ident.c_str(); - else if(len == 9 && user->ident[0] == '~') + else if (user->ident.length() == 9 && user->ident[0] == '~') ident = user->ident.c_str() + 1; else return false; @@ -362,34 +378,10 @@ public: if (errno) return false; newip.s_addr = htonl(ipaddr); - char* newipstr = inet_ntoa(newip); + std::string newipstr(inet_ntoa(newip)); - cmd.realhost.set(user, user->host); - cmd.realip.set(user, user->GetIPString()); - ServerInstance->Users->RemoveCloneCounts(user); - user->SetClientIP(newipstr); - ServerInstance->Users->AddLocalClone(user); - ServerInstance->Users->AddGlobalClone(user); - user->SetClass(); - user->CheckClass(); - user->host = newipstr; - user->dhost = newipstr; - user->ident.assign("~cgiirc", 0, 8); - try - { - - bool cached; - CGIResolver* r = new CGIResolver(this, cmd.notify, newipstr, false, user, "IDENT", cached, waiting); - ServerInstance->AddResolver(r, cached); - waiting.set(user, waiting.get(user) + 1); - } - catch (...) - { - user->InvalidateCache(); - - if(cmd.notify) - ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str()); - } + user->ident = "~cgiirc"; + HandleIdentOrPass(user, newipstr, false); return true; } @@ -415,45 +407,6 @@ public: return true; } - bool IsValidIP(const std::string &ip) - { - if(ip.size() < 7 || ip.size() > 15) - return false; - - short sincedot = 0; - short dots = 0; - - for(unsigned int i = 0; i < ip.size(); i++) - { - if((dots <= 3) && (sincedot <= 3)) - { - if((ip[i] >= '0') && (ip[i] <= '9')) - { - sincedot++; - } - else if(ip[i] == '.') - { - sincedot = 0; - dots++; - } - } - else - { - return false; - - } - } - - if(dots != 3) - return false; - - return true; - } - - virtual ~ModuleCgiIRC() - { - } - virtual Version GetVersion() { return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);