X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=49a6fdabb454a1229083354dd2b2024278b6f820;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=812e3acf56cc3e93aea4daeaf1ccac8b54b59d6d;hpb=621ab4c775866e1c81f98ec4fee148fd58e8ffa7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 812e3acf5..49a6fdabb 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -11,20 +11,18 @@ * --------------------------------------------------- */ -#include -#include -#include +#include "inspircd.h" + +#ifndef WINDOWS #include #include #include -#include "users.h" -#include "modules.h" -#include "dns.h" -#include "inspircd.h" +#endif /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */ -enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; +enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; + /** Holds a CGI site's details */ @@ -67,8 +65,9 @@ class cmd_webirc : public command_t user->Extend("cgiirc_realhost", new std::string(user->host)); user->Extend("cgiirc_realip", new std::string(user->GetIPString())); if (notify) - ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2], "_"); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2], user->host); user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2])); + user->Extend("cgiirc_webirc_ip", new std::string(parameters[3])); return CMD_LOCALONLY; } } @@ -88,10 +87,13 @@ class CGIResolver : public Resolver bool notify; public: CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached) - : Resolver(ServerInstance, source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { } + : Resolver(ServerInstance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { } - virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) + virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0) { + if (resultnum) + return; + /* Check the user still exists */ if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { @@ -125,7 +127,7 @@ class ModuleCgiIRC : public Module bool NotifyOpers; CGIHostlist Hosts; public: - ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me) + ModuleCgiIRC(InspIRCd* Me) : Module(Me) { OnRehash(NULL,""); @@ -161,21 +163,28 @@ public: if(hostmask.length()) { - Hosts.push_back(CGIhost(hostmask)); - - if(type == "pass") - Hosts.back().type = PASS; - else if(type == "ident") - Hosts.back().type = IDENT; - else if(type == "passfirst") - Hosts.back().type = PASSFIRST; - else if(type == "webirc") { - Hosts.back().type = WEBIRC; - if(password.length()) - Hosts.back().password=password; - else + if (type == "webirc" && !password.length()) { ServerInstance->Log(DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str()); } + else + { + CGItype cgitype = INVALID; + if (type == "pass") + cgitype = PASS; + else if (type == "ident") + cgitype = IDENT; + else if (type == "passfirst") + cgitype = PASSFIRST; + else if (type == "webirc") + { + cgitype = WEBIRC; + } + + if (cgitype == INVALID) + cgitype = PASS; + + Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" )); + } } else { @@ -207,7 +216,7 @@ public: } } - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname) + virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) { @@ -233,7 +242,7 @@ public: } } - virtual void OnUserQuit(userrec* user, const std::string &message) + virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message) { OnCleanup(TYPE_USER, user); } @@ -276,15 +285,36 @@ public: virtual void OnUserConnect(userrec* user) { - std::string* webirc_hostname; + std::string *webirc_hostname, *webirc_ip; if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname)) { strlcpy(user->host,webirc_hostname->c_str(),63); strlcpy(user->dhost,webirc_hostname->c_str(),63); - user->InvalidateCache(); delete webirc_hostname; + user->InvalidateCache(); user->Shrink("cgiirc_webirc_hostname"); } + if(user->GetExt("cgiirc_webirc_ip", webirc_ip)) + { + bool valid=false; + user->RemoveCloneCounts(); +#ifdef IPV6 + valid = (inet_pton(AF_INET6, webirc_ip->c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0); + + if(!valid) + valid = (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr)); +#else + if (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr)) + valid = true; +#endif + + delete webirc_ip; + user->InvalidateCache(); + user->Shrink("cgiirc_webirc_ip"); + ServerInstance->AddLocalClone(user); + ServerInstance->AddGlobalClone(user); + user->CheckClass(); + } } bool CheckPass(userrec* user) @@ -296,17 +326,22 @@ public: strlcpy(user->host, user->password, 64); strlcpy(user->dhost, user->password, 64); user->InvalidateCache(); - + bool valid = false; + user->RemoveCloneCounts(); #ifdef IPV6 if (user->GetProtocolFamily() == AF_INET6) - valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)&user->ip)->sin6_addr) > 0); + valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)user->ip)->sin6_addr) > 0); else - valid = (inet_aton(user->password, &((sockaddr_in*)&user->ip)->sin_addr)); + valid = (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr)); #else - if (inet_aton(user->password, &((sockaddr_in*)&user->ip)->sin_addr)) + if (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr)) valid = true; #endif + ServerInstance->AddLocalClone(user); + ServerInstance->AddGlobalClone(user); + user->CheckClass(); + if (valid) { /* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */ @@ -318,11 +353,12 @@ public: /* We got as resolved hostname in the password. */ try { + bool cached; CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached); ServerInstance->AddResolver(r, cached); } - catch (ModuleException& e) + catch (...) { if (NotifyOpers) ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); @@ -362,23 +398,27 @@ public: user->Extend("cgiirc_realhost", new std::string(user->host)); user->Extend("cgiirc_realip", new std::string(user->GetIPString())); + user->RemoveCloneCounts(); #ifdef IPV6 if (user->GetProtocolFamily() == AF_INET6) - inet_pton(AF_INET6, newip, &((sockaddr_in6*)&user->ip)->sin6_addr); + inet_pton(AF_INET6, newip, &((sockaddr_in6*)user->ip)->sin6_addr); else - inet_aton(newip, &((sockaddr_in*)&user->ip)->sin_addr); -#else - inet_aton(newip, &((sockaddr_in*)&user->ip)->sin_addr); #endif - - + inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr); + ServerInstance->AddLocalClone(user); + ServerInstance->AddGlobalClone(user); + user->CheckClass(); try { + strlcpy(user->host, newip, 16); + strlcpy(user->dhost, newip, 16); + strlcpy(user->ident, "~cgiirc", 8); + bool cached; CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached); ServerInstance->AddResolver(r, cached); } - catch (ModuleException& e) + catch (...) { strlcpy(user->host, newip, 16); strlcpy(user->dhost, newip, 16); @@ -476,26 +516,4 @@ public: }; -class ModuleCgiIRCFactory : public ModuleFactory -{ - public: - ModuleCgiIRCFactory() - { - } - - ~ModuleCgiIRCFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleCgiIRC(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleCgiIRCFactory; -} +MODULE_INIT(ModuleCgiIRC)