X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=7f39ec1f88b027a7053758a5fb0f00de4216fe55;hb=9fdf5e99a7960e030a1bf0ec61894fabc3732151;hp=952d5359f640808087c2fdaab42d1d11397363d5;hpb=aa04777319db31344eb56d691cb38b3666e02b1c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 952d5359f..7f39ec1f8 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -2,13 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * @@ -23,31 +19,67 @@ #include #include "users.h" #include "modules.h" -#include "helperfuncs.h" #include "dns.h" +#include "inspircd.h" /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */ +enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; -/* We need this for checking our user hasnt /quit before we finish our lookup */ -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - -enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST }; - +/** Holds a CGI site's details + */ class CGIhost : public classbase { public: std::string hostmask; CGItype type; + std::string password; - CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST) - : hostmask(mask), type(t) + CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST, const std::string &password ="") + : hostmask(mask), type(t), password(password) { } }; - typedef std::vector CGIHostlist; +class cmd_webirc : public command_t +{ + InspIRCd* Me; + CGIHostlist Hosts; + bool notify; + public: + cmd_webirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : command_t(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify) + { + this->source = "m_cgiirc.so"; + this->syntax = "password client hostname ip"; + } + CmdResult Handle(const char** parameters, int pcnt, userrec *user) + { + if(user->registered == REG_ALL) + return CMD_FAILURE; + + for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++) + { + if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask)) + { + if(iter->type == WEBIRC && parameters[0] == iter->password) + { + 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], "_"); + user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2])); + return CMD_LOCALONLY; + } + } + } + return CMD_FAILURE; + } +}; + + +/** Resolver for CGI:IRC hostnames encoded in ident/GECOS + */ class CGIResolver : public Resolver { std::string typ; @@ -55,29 +87,30 @@ class CGIResolver : public Resolver userrec* them; bool notify; public: - CGIResolver(bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type) - : Resolver(source, forward, ""), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { } + 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_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { } - virtual void OnLookupComplete(const std::string &result) + virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) { /* Check the user still exists */ - if ((them) && (them == fd_ref_table[theirfd])) + if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { if (notify) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str()); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str()); strlcpy(them->host, result.c_str(), 63); strlcpy(them->dhost, result.c_str(), 63); strlcpy(them->ident, "~cgiirc", 8); + them->InvalidateCache(); } } - virtual void OnError(ResolverError e) + virtual void OnError(ResolverError e, const std::string &errormessage) { - if ((them) && (them == fd_ref_table[theirfd])) + if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { if (notify) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str()); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str()); } } @@ -88,19 +121,21 @@ class CGIResolver : public Resolver class ModuleCgiIRC : public Module { - Server *Srv; + cmd_webirc* mycommand; bool NotifyOpers; CGIHostlist Hosts; public: - ModuleCgiIRC(Server* Me) : Module::Module(Me) + ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - OnRehash(""); + + OnRehash(NULL,""); + mycommand=new cmd_webirc(Me, Hosts, NotifyOpers); + ServerInstance->AddCommand(mycommand); } void Implements(char* List) { - List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCleanup] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserQuit] = 1; + List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCleanup] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserQuit] = List[I_OnUserConnect] = 1; } virtual Priority Prioritize() @@ -109,9 +144,9 @@ public: return PRIORITY_FIRST; } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { - ConfigReader Conf; + ConfigReader Conf(ServerInstance); NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed. @@ -122,6 +157,7 @@ public: { std::string hostmask = Conf.ReadValue("cgihost", "mask", i); // An allowed CGI:IRC host std::string type = Conf.ReadValue("cgihost", "type", i); // What type of user-munging we do on this host. + std::string password = Conf.ReadValue("cgihost", "password", i); if(hostmask.length()) { @@ -133,10 +169,17 @@ public: 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 + ServerInstance->Log(DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str()); + } } else { - log(DEBUG, "m_cgiirc.so: Invalid value in config: %s", hostmask.c_str()); + ServerInstance->Log(DEFAULT, "m_cgiirc.so: Invalid value in config: %s", hostmask.c_str()); continue; } } @@ -196,19 +239,13 @@ public: } - virtual void OnUserRegister(userrec* user) - { - log(DEBUG, "m_cgiirc.so: User %s registering", user->nick); - + virtual int OnUserRegister(userrec* user) + { for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++) - { - log(DEBUG, "m_cgiirc.so: Matching %s against (%s or %s)", iter->hostmask.c_str(), user->host, inet_ntoa(user->ip4)); - - if(Srv->MatchText(user->host, iter->hostmask) || Srv->MatchText(inet_ntoa(user->ip4), iter->hostmask)) + { + if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask)) { // Deal with it... - log(DEBUG, "m_cgiirc.so: Handling CGI:IRC user: %s (%s) matched %s", user->GetFullRealHost(), inet_ntoa(user->ip4), iter->hostmask.c_str()); - if(iter->type == PASS) { CheckPass(user); // We do nothing if it fails so... @@ -227,59 +264,78 @@ public: // If the ident lookup fails, try the password. CheckPass(user); } - - return; + else if(iter->type == WEBIRC) + { + // We don't need to do anything here + } + return 0; } } + return 0; + } + + virtual void OnUserConnect(userrec* user) + { + std::string* webirc_hostname; + 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->Shrink("cgiirc_webirc_hostname"); + } } bool CheckPass(userrec* user) { - log(DEBUG, "m_cgiirc.so: CheckPass(%s) - %s", user->nick, user->password); - if(IsValidHost(user->password)) { user->Extend("cgiirc_realhost", new std::string(user->host)); - user->Extend("cgiirc_realip", new std::string(inet_ntoa(user->ip4))); + user->Extend("cgiirc_realip", new std::string(user->GetIPString())); strlcpy(user->host, user->password, 64); strlcpy(user->dhost, user->password, 64); - - if(inet_aton(user->password, &user->ip4)) + user->InvalidateCache(); + + bool valid = false; +#ifdef IPV6 + if (user->GetProtocolFamily() == AF_INET6) + 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)); +#else + if (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr)) + valid = true; +#endif + 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. */ - log(DEBUG, "m_cgiirc.so: Got an IP in the user's password"); - if(NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password); } else { /* We got as resolved hostname in the password. */ - log(DEBUG, "m_cgiirc.so: Got a hostname in the user's password"); - try { - CGIResolver* r = new CGIResolver(NotifyOpers, user->password, false, user, user->fd, "PASS"); - Srv->AddResolver(r); + bool cached; + CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached); + ServerInstance->AddResolver(r, cached); } catch (ModuleException& e) { if (NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); } } *user->password = 0; /*if(NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/ + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/ return true; } - else - { - log(DEBUG, "m_cgiirc.so: User's password was not a valid host"); - } return false; } @@ -305,22 +361,32 @@ public: snprintf(newip, 16, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); user->Extend("cgiirc_realhost", new std::string(user->host)); - user->Extend("cgiirc_realip", new std::string(inet_ntoa(user->ip4))); - inet_aton(newip, &user->ip4); + user->Extend("cgiirc_realip", new std::string(user->GetIPString())); +#ifdef IPV6 + if (user->GetProtocolFamily() == AF_INET6) + 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 + try { - CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->fd, "IDENT"); - Srv->AddResolver(r); + bool cached; + CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached); + ServerInstance->AddResolver(r, cached); } catch (ModuleException& e) { strlcpy(user->host, newip, 16); strlcpy(user->dhost, newip, 16); strlcpy(user->ident, "~cgiirc", 8); + user->InvalidateCache(); if(NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); } /*strlcpy(user->host, newip, 16); strlcpy(user->dhost, newip, 16); @@ -405,7 +471,7 @@ public: virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR); + return Version(1,1,0,0,VF_VENDOR,API_VERSION); } }; @@ -421,7 +487,7 @@ class ModuleCgiIRCFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleCgiIRC(Me); }