X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=79104578084d5b13b549e57c6076ac680d352d2d;hb=90abe2cd475c8ca2e81626f565d173e9f56d1251;hp=688da6f0581159e400038d75d6ff95b5943cc938;hpb=ce9d870efaab76a3a4d5d64c4c873b43c7b831a3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 688da6f05..791045780 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -1,340 +1,389 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2008 John Brooks + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton * - * --------------------------------------------------- + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include -#include -#include -#include -#include -#include -#include "users.h" -#include "modules.h" -#include "helperfuncs.h" -#include "dns.h" - -/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */ +#include "inspircd.h" +#include "xline.h" +#include "modules/dns.h" -/* 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, WEBIRC }; -enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST }; +// We need this method up here so that it can be accessed from anywhere +static void ChangeIP(User* user, const std::string& newip) +{ + ServerInstance->Users->RemoveCloneCounts(user); + user->SetClientIP(newip.c_str()); + ServerInstance->Users->AddClone(user); +} -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, const std::string &spassword) + : hostmask(mask), type(t), password(spassword) { } }; - typedef std::vector CGIHostlist; -class CGIResolver : public Resolver +/* + * 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 +{ + public: + bool notify; + StringExtItem realhost; + StringExtItem realip; + + CGIHostlist Hosts; + CommandWebirc(Module* Creator) + : Command(Creator, "WEBIRC", 4), + realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", 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()); + + // 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 + bool host_ok = (parameters[2].length() <= ServerInstance->Config->Limits.MaxHost); + const std::string& newhost = (host_ok ? parameters[2] : parameters[3]); + + if (notify) + ServerInstance->SNO->WriteGlobalSno('w', "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()); + + // Where the magic happens - change their IP + ChangeIP(user, parameters[3]); + // And follow this up by changing their host + user->host = user->dhost = newhost; + user->InvalidateCache(); + + return CMD_SUCCESS; + } + } + } + + ServerInstance->SNO->WriteGlobalSno('w', "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 DNS::Request { std::string typ; - int theirfd; - userrec* them; + std::string theiruid; + LocalIntExt& waiting; 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(DNS::Manager *mgr, Module* me, bool NotifyOpers, const std::string &source, LocalUser* u, + const std::string &ttype, LocalIntExt& ext) + : DNS::Request(mgr, me, source, DNS::QUERY_PTR), typ(ttype), theiruid(u->uuid), + waiting(ext), notify(NotifyOpers) + { + } - virtual void OnLookupComplete(const std::string &result) + void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE { /* Check the user still exists */ - if ((them) && (them == fd_ref_table[theirfd])) + User* them = ServerInstance->FindUUID(theiruid); + if ((them) && (!them->quitting)) { + LocalUser* lu = IS_LOCAL(them); + if (!lu) + return; + + const DNS::ResourceRecord &ans_record = r->answers[0]; + if (ans_record.rdata.empty() || ans_record.rdata.length() > ServerInstance->Config->Limits.MaxHost) + return; + 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->SNO->WriteGlobalSno('w', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), ans_record.rdata.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->host = them->dhost = ans_record.rdata; + them->InvalidateCache(); + lu->CheckLines(true); } } - virtual void OnError(ResolverError e) + void OnError(const DNS::Query *r) CXX11_OVERRIDE { - if ((them) && (them == fd_ref_table[theirfd])) + if (!notify) + return; + + User* them = ServerInstance->FindUUID(theiruid); + if ((them) && (!them->quitting)) { - 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('w', "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()); } } - virtual ~CGIResolver() + ~CGIResolver() { + User* them = ServerInstance->FindUUID(theiruid); + if (!them) + return; + int count = waiting.get(them); + if (count) + waiting.set(them, count - 1); } }; class ModuleCgiIRC : public Module { - Server *Srv; - bool NotifyOpers; - CGIHostlist Hosts; -public: - ModuleCgiIRC(Server* Me) : Module::Module(Me) + CommandWebirc cmd; + LocalIntExt waiting; + dynamic_reference DNS; + + static void RecheckClass(LocalUser* user) { - Srv = Me; - OnRehash(""); + user->MyClass = NULL; + user->SetClass(); + user->CheckClass(); } - void Implements(char* List) + void HandleIdentOrPass(LocalUser* user, const std::string& newip, bool was_pass) { - List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCleanup] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserQuit] = 1; + 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 || !DNS || !user->MyClass->resolvehostnames) + return; + + CGIResolver* r = new CGIResolver(*this->DNS, this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), waiting); + try + { + waiting.set(user, waiting.get(user) + 1); + this->DNS->Process(r); + } + catch (DNS::Exception &ex) + { + int count = waiting.get(user); + if (count) + waiting.set(user, count - 1); + delete r; + if (cmd.notify) + ServerInstance->SNO->WriteToSnoMask('w', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname; %s", user->nick.c_str(), user->host.c_str(), ex.GetReason().c_str()); + } } - - virtual Priority Prioritize() + +public: + ModuleCgiIRC() + : cmd(this) + , waiting("cgiirc-delay", this) + , DNS(this, "DNS") { - // We want to get here before m_cloaking and m_hostchange etc - return PRIORITY_FIRST; } - virtual void OnRehash(const std::string ¶meter) + void init() CXX11_OVERRIDE { - ConfigReader Conf; - - 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++) + ServerInstance->SNO->EnableSnomask('w', "CGIIRC"); + } + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + cmd.Hosts.clear(); + + // Do we send an oper notice when a CGI:IRC has their host changed? + cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true); + + ConfigTagList tags = ServerInstance->Config->ConfTags("cgihost"); + for (ConfigIter i = tags.first; i != tags.second; ++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. - + ConfigTag* tag = i->second; + std::string hostmask = tag->getString("mask"); // An allowed CGI:IRC host + std::string type = tag->getString("type"); // What type of user-munging we do on this host. + std::string password = tag->getString("password"); + 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.empty()) + { + ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str()); + } + else + { + CGItype cgitype; + if (type == "pass") + cgitype = PASS; + else if (type == "ident") + cgitype = IDENT; + else if (type == "passfirst") + cgitype = PASSFIRST; + else if (type == "webirc") + cgitype = WEBIRC; + else + { + cgitype = PASS; + ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Invalid value in config: %s, setting it to \"pass\"", type.c_str()); + } + + cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password)); + } } else { - log(DEBUG, "m_cgiirc.so: Invalid value in config: %s", hostmask.c_str()); + ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Invalid value in config: %s", hostmask.c_str()); continue; } } } - virtual void OnCleanup(int target_type, void* item) + ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE { - 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); - } - } - } + if (waiting.get(user)) + return MOD_RES_DENY; - virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) - { - if(target_type == TYPE_USER) - { - 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)); - } - } - } + if (!cmd.realip.get(user)) + return MOD_RES_PASSTHRU; - virtual void OnUserQuit(userrec* user, const std::string &message) - { - OnCleanup(TYPE_USER, user); + RecheckClass(user); + if (user->quitting) + return MOD_RES_DENY; + + user->CheckLines(true); + if (user->quitting) + return MOD_RES_DENY; + + return MOD_RES_PASSTHRU; } - - virtual void OnUserRegister(userrec* user) + ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE { - log(DEBUG, "m_cgiirc.so: User %s registering, %s %s", user->nick,user->host,insp_ntoa(user->ip4)); - - for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++) + for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++) { - log(DEBUG, "m_cgiirc.so: Matching %s against (%s or %s)", iter->hostmask.c_str(), user->host, insp_ntoa(user->ip4)); - - if(Srv->MatchText(user->host, iter->hostmask) || Srv->MatchText(insp_ntoa(user->ip4), 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(), insp_ntoa(user->ip4), 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; } - bool CheckPass(userrec* user) + bool CheckPass(LocalUser* 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(insp_ntoa(user->ip4))); - strlcpy(user->host, user->password, 64); - strlcpy(user->dhost, user->password, 64); - - if(insp_aton(user->password, &user->ip4)) - { - /* 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); - } - 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); - } - 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); - } - } - - *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);*/ - + HandleIdentOrPass(user, user->password, true); + 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(LocalUser* user) { - int ip[4]; - char* ident; - char newip[16]; - int len = strlen(user->ident); - - if(len == 8) - ident = user->ident; - else if(len == 9 && *user->ident == '~') - ident = user->ident+1; + const char* ident; + in_addr newip; + + if (user->ident.length() == 8) + ident = user->ident.c_str(); + else if (user->ident.length() == 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(insp_ntoa(user->ip4))); - insp_aton(newip, &user->ip4); - 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); - } - catch (ModuleException& e) - { - strlcpy(user->host, newip, 16); - strlcpy(user->dhost, newip, 16); - strlcpy(user->ident, "~cgiirc", 8); + errno = 0; + unsigned long ipaddr = strtoul(ident, NULL, 16); + if (errno) + return false; + newip.s_addr = htonl(ipaddr); + std::string newipstr(inet_ntoa(newip)); - if(NotifyOpers) - 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); - strlcpy(user->ident, "~cgiirc", 8);*/ + user->ident = "~cgiirc"; + HandleIdentOrPass(user, newipstr, false); return true; } - + bool IsValidHost(const std::string &host) { - if(!host.size()) + if(!host.size() || host.size() > ServerInstance->Config->Limits.MaxHost) return false; - + for(unsigned int i = 0; i < host.size(); i++) { if( ((host[i] >= '0') && (host[i] <= '9')) || @@ -342,95 +391,19 @@ 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; - } - 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++; - } - } + continue; 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); - } - -}; -class ModuleCgiIRCFactory : public ModuleFactory -{ - public: - ModuleCgiIRCFactory() + Version GetVersion() CXX11_OVERRIDE { + return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR); } - - ~ModuleCgiIRCFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleCgiIRC(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleCgiIRCFactory; -} +MODULE_INIT(ModuleCgiIRC)