X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=7bb46b753b8b8393df70b00fdee75a7d27464263;hb=9db7af579c46a9f0379fdf71fb773a0a76a94846;hp=3a1bccaf730602494caa271da8a95a9c992f9bb4;hpb=a361a0bbc980a44e775c868b34d6c01f545a8515;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 3a1bccaf7..53c761b3e 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -2,82 +2,137 @@ * | 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include -#include -#include +#include "inspircd.h" + +#ifndef WINDOWS #include #include #include -#include "users.h" -#include "modules.h" -#include "helperfuncs.h" -#include "dns.h" +#endif /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */ +enum CGItype { INVALID, 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 }; -class CGIhost : public classbase +/** Holds a CGI site's details + */ +class CGIhost { 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 &spassword ="") + : hostmask(mask), type(t), password(spassword) { } }; - typedef std::vector CGIHostlist; +/* + * WEBIRC + * This is used for the webirc method of CGIIRC auth, and is (really) the best way to do these things. + * Syntax: WEBIRC password client hostname ip + * Where password is a shared key, client is the name of the "client" and version (e.g. cgiirc), hostname + * is the resolved host of the client issuing the command and IP is the real IP of the client. + * + * How it works: + * To tie in with the rest of cgiirc module, and to avoid race conditions, /webirc is only processed locally + * and simply sets metadata on the user, which is later decoded on full connect to give something meaningful. + */ +class CommandWebirc : public Command +{ + bool notify; + public: + StringExtItem realhost; + StringExtItem realip; + LocalStringExt webirc_hostname; + LocalStringExt webirc_ip; + + CGIHostlist Hosts; + CommandWebirc(Module* Creator, bool bnotify) + : Command(Creator, "WEBIRC", 4), notify(bnotify), + realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator), + webirc_hostname("cgiirc_webirc_hostname", Creator), webirc_ip("cgiirc_webirc_ip", Creator) + { + works_before_reg = true; + this->syntax = "password client hostname ip"; + } + CmdResult Handle(const std::vector ¶meters, User *user) + { + if(user->registered == REG_ALL) + return CMD_FAILURE; + + for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++) + { + if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map)) + { + if(iter->type == WEBIRC && parameters[0] == iter->password) + { + realhost.set(user, user->host); + realip.set(user, user->GetIPString()); + 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]); + webirc_ip.set(user, parameters[3]); + return CMD_SUCCESS; + } + } + } + + ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str()); + return CMD_FAILURE; + } +}; + + +/** Resolver for CGI:IRC hostnames encoded in ident/GECOS + */ class CGIResolver : public Resolver { std::string typ; int theirfd; - userrec* them; + User* them; bool notify; public: - CGIResolver(bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type) - : Resolver(source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { } + CGIResolver(Module* me, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached) + : Resolver(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()); - - strlcpy(them->host, result.c_str(), 63); - strlcpy(them->dhost, result.c_str(), 63); - strlcpy(them->ident, "~cgiirc", 8); + 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()); + + them->host.assign(result,0, 64); + them->dhost.assign(result, 0, 64); + if (querytype) + them->SetClientIP(result.c_str()); + them->ident.assign("~cgiirc", 0, 8); + them->InvalidateCache(); + them->CheckLines(true); } } 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->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()); } } @@ -88,261 +143,240 @@ class CGIResolver : public Resolver class ModuleCgiIRC : public Module { - Server *Srv; + CommandWebirc cmd; bool NotifyOpers; - CGIHostlist Hosts; public: - ModuleCgiIRC(Server* Me) : Module::Module(Me) + ModuleCgiIRC() : cmd(this, NotifyOpers) { - Srv = Me; - OnRehash(""); + 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); + + Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnSyncUser, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect }; + ServerInstance->Modules->Attach(eventlist, this, 6); } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCleanup] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserQuit] = 1; - } - - virtual Priority Prioritize() + + virtual void Prioritize() { - // We want to get here before m_cloaking and m_hostchange etc - return PRIORITY_FIRST; + ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST); } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(User* user) { ConfigReader Conf; - + cmd.Hosts.clear(); + NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed. - + if(Conf.GetError() == CONF_VALUE_NOT_FOUND) NotifyOpers = true; - + for(int i = 0; i < Conf.Enumerate("cgihost"); i++) { 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()) { - 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; + if (type == "webirc" && !password.length()) { + ServerInstance->Logs->Log("CONFIG",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; + + cmd.Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" )); + } } else { - log(DEBUG, "m_cgiirc.so: Invalid value in config: %s", hostmask.c_str()); + ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid value in config: %s", hostmask.c_str()); continue; } } } - virtual void OnCleanup(int target_type, void* item) - { - if(target_type == TYPE_USER) - { - userrec* user = (userrec*)item; - std::string* realhost; - std::string* realip; - - if(user->GetExt("cgiirc_realhost", realhost)) - { - delete realhost; - user->Shrink("cgiirc_realhost"); - } - - if(user->GetExt("cgiirc_realip", realip)) - { - delete realip; - user->Shrink("cgiirc_realip"); - } - } - } - - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname) - { - if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) - { - std::string* data; - - if(user->GetExt(extname, data)) - { - proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *data); - } - } - } - - virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) + virtual ModResult OnUserRegister(User* user) { - if(target_type == TYPE_USER) + for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++) { - userrec* dest = (userrec*)target; - std::string* bleh; - if(((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh))) - { - dest->Extend(extname, new std::string(extdata)); - } - } - } - - virtual void OnUserQuit(userrec* user, const std::string &message) - { - OnCleanup(TYPE_USER, user); - } - - - virtual void OnUserRegister(userrec* user) - { - log(DEBUG, "m_cgiirc.so: User %s registering, %s %s", user->nick,user->host,user->GetIPString()); - - 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, user->GetIPString()); - - if(Srv->MatchText(user->host, iter->hostmask) || Srv->MatchText(user->GetIPString(), iter->hostmask)) + if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map)) { // Deal with it... - log(DEBUG, "m_cgiirc.so: Handling CGI:IRC user: %s (%s) matched %s", user->GetFullRealHost(), user->GetIPString(), iter->hostmask.c_str()); - if(iter->type == PASS) { CheckPass(user); // We do nothing if it fails so... + user->CheckLines(true); } else if(iter->type == PASSFIRST && !CheckPass(user)) { // If the password lookup failed, try the ident CheckIdent(user); // If this fails too, do nothing + user->CheckLines(true); } else if(iter->type == IDENT) { CheckIdent(user); // Nothing on failure. + user->CheckLines(true); } else if(iter->type == IDENTFIRST && !CheckIdent(user)) { // If the ident lookup fails, try the password. CheckPass(user); + user->CheckLines(true); } - - return; + else if(iter->type == WEBIRC) + { + // We don't need to do anything here + } + return MOD_RES_PASSTHRU; } } + return MOD_RES_PASSTHRU; + } + + virtual void OnUserConnect(User* user) + { + std::string *webirc_hostname = cmd.webirc_hostname.get(user); + std::string *webirc_ip = cmd.webirc_ip.get(user); + if (webirc_hostname) + { + user->host.assign(*webirc_hostname, 0, 64); + user->dhost.assign(*webirc_hostname, 0, 64); + user->InvalidateCache(); + cmd.webirc_hostname.unset(user); + } + if (webirc_ip) + { + ServerInstance->Users->RemoveCloneCounts(user); + user->SetClientIP(webirc_ip->c_str()); + user->InvalidateCache(); + cmd.webirc_ip.unset(user); + ServerInstance->Users->AddLocalClone(user); + ServerInstance->Users->AddGlobalClone(user); + user->CheckClass(); + user->CheckLines(true); + } } - bool CheckPass(userrec* user) + bool CheckPass(User* 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(user->GetIPString())); - strlcpy(user->host, user->password, 64); - strlcpy(user->dhost, user->password, 64); - -#ifdef IPV6 - if (insp_aton(user->password, (insp_inaddr*)&((sockaddr_in6*)&user->ip)->sin6_addr)) -#else - if (insp_aton(user->password, (insp_inaddr*)&((sockaddr_in*)&user->ip)->sin_addr)) -#endif + cmd.realhost.set(user, user->host); + cmd.realip.set(user, user->GetIPString()); + user->host.assign(user->password, 0, 64); + user->dhost.assign(user->password, 0, 64); + user->InvalidateCache(); + + bool valid = false; + ServerInstance->Users->RemoveCloneCounts(user); + valid = user->SetClientIP(user->password.c_str()); + ServerInstance->Users->AddLocalClone(user); + ServerInstance->Users->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. */ - 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->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick.c_str(), user->host.c_str(), user->password.c_str()); } 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, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached); + ServerInstance->AddResolver(r, cached); } - catch (ModuleException& e) + catch (...) { if (NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); + 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->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);*/ + user->password.clear(); return true; } - else - { - log(DEBUG, "m_cgiirc.so: User's password was not a valid host"); - } - + return false; } - - bool CheckIdent(userrec* user) + + bool CheckIdent(User* user) { - int ip[4]; - char* ident; - char newip[16]; - int len = strlen(user->ident); - + const char* ident; + int len = user->ident.length(); + in_addr newip; + if(len == 8) - ident = user->ident; - else if(len == 9 && *user->ident == '~') - ident = user->ident+1; + ident = user->ident.c_str(); + else if(len == 9 && user->ident[0] == '~') + ident = user->ident.c_str() + 1; else return false; - - for(int i = 0; i < 4; i++) - if(!HexToInt(ip[i], ident + i*2)) - return false; - 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(user->GetIPString())); -#ifdef IPV6 - insp_aton(newip, (insp_inaddr*)&((sockaddr_in6*)&user->ip)->sin6_addr); -#else - insp_aton(newip, (insp_inaddr*)&((sockaddr_in*)&user->ip)->sin_addr); -#endif - + errno = 0; + unsigned long ipaddr = strtoul(ident, NULL, 16); + if (errno) + return false; + newip.s_addr = htonl(ipaddr); + char* 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->CheckClass(); + user->host = newipstr; + user->dhost = newipstr; + user->ident.assign("~cgiirc", 0, 8); try { - log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->fd, "IDENT"); - CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->fd, "IDENT"); - Srv->AddResolver(r); + + bool cached; + CGIResolver* r = new CGIResolver(this, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached); + ServerInstance->AddResolver(r, cached); } - catch (ModuleException& e) + catch (...) { - 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->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()); } - /*strlcpy(user->host, newip, 16); - strlcpy(user->dhost, newip, 16); - strlcpy(user->ident, "~cgiirc", 8);*/ return true; } - + bool IsValidHost(const std::string &host) { if(!host.size()) return false; - + for(unsigned int i = 0; i < host.size(); i++) { if( ((host[i] >= '0') && (host[i] <= '9')) || @@ -350,12 +384,12 @@ public: ((host[i] >= 'a') && (host[i] <= 'z')) || ((host[i] == '-') && (i > 0) && (i+1 < host.size()) && (host[i-1] != '.') && (host[i+1] != '.')) || ((host[i] == '.') && (i > 0) && (i+1 < host.size())) ) - + continue; else return false; } - + return true; } @@ -363,10 +397,10 @@ public: { 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)) @@ -384,61 +418,25 @@ public: else { return false; - + } } - + if(dots != 3) return false; - - return true; - } - - bool HexToInt(int &out, const char* in) - { - char ip[3]; - ip[0] = in[0]; - ip[1] = in[1]; - ip[2] = 0; - out = strtol(ip, NULL, 16); - - if(out > 255 || out < 0) - return false; return true; } - + virtual ~ModuleCgiIRC() { } - + virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR); + return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR); } - -}; -class ModuleCgiIRCFactory : public ModuleFactory -{ - public: - ModuleCgiIRCFactory() - { - } - - ~ModuleCgiIRCFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleCgiIRC(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleCgiIRCFactory; -} +MODULE_INIT(ModuleCgiIRC)