X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=721d6ba081a693b0237d326b7aab742cd7416e0e;hb=f9fd78c01623514a060c607534fc52cb73140200;hp=745dc13d2225b8878cc8ef4c04d99889f99840d3;hpb=123eac3f25ce4dd3142b4ac66eb321f7df1e23e4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 745dc13d2..721d6ba08 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -1,28 +1,41 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * 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 * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * 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 free but copyrighted software; see - * the file COPYING for details. + * 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 "inspircd.h" - -#ifndef WINDOWS -#include -#include -#include -#endif -/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */ +#include "inspircd.h" +#include "xline.h" +#include "modules/dns.h" -enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; +enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; +// 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); +} /** Holds a CGI site's details */ @@ -33,7 +46,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) { } @@ -53,18 +66,16 @@ typedef std::vector CGIHostlist; */ class CommandWebirc : public Command { - bool notify; public: + bool notify; 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) + CommandWebirc(Module* Creator) + : Command(Creator, "WEBIRC", 4), + realhost("cgiirc_realhost", ExtensionItem::EXT_USER, Creator) + , realip("cgiirc_realip", ExtensionItem::EXT_USER, Creator) { works_before_reg = true; this->syntax = "password client hostname ip"; @@ -82,16 +93,26 @@ class CommandWebirc : public Command { 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('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]); + 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('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str()); + 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; } }; @@ -99,96 +120,146 @@ class CommandWebirc : public Command /** Resolver for CGI:IRC hostnames encoded in ident/GECOS */ -class CGIResolver : public Resolver +class CGIResolver : public DNS::Request { std::string typ; - int theirfd; - User* them; + std::string theiruid; + LocalIntExt& waiting; bool notify; public: - 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) { } + 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, unsigned int ttl, bool cached) + void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE { /* Check the user still exists */ - if ((them) && (them == ServerInstance->SE->GetRef(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) - 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()); + 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()); - 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->host = them->dhost = ans_record.rdata; them->InvalidateCache(); - them->CheckLines(true); + lu->CheckLines(true); } } - virtual void OnError(ResolverError e, const std::string &errormessage) + void OnError(const DNS::Query *r) CXX11_OVERRIDE { - if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) + if (!notify) + return; + + User* them = ServerInstance->FindUUID(theiruid); + 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('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 { CommandWebirc cmd; - bool NotifyOpers; -public: - ModuleCgiIRC() : cmd(this, NotifyOpers) + LocalIntExt waiting; + dynamic_reference DNS; + + static void RecheckClass(LocalUser* user) { - 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); + user->MyClass = NULL; + user->SetClass(); + user->CheckClass(); } + 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); - virtual void Prioritize() + // 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()); + } + } + +public: + ModuleCgiIRC() + : cmd(this) + , waiting("cgiirc-delay", ExtensionItem::EXT_USER, this) + , DNS(this, "DNS") { - ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST); } - virtual void OnRehash(User* user) + void init() CXX11_OVERRIDE { - ConfigReader Conf; - cmd.Hosts.clear(); + ServerInstance->SNO->EnableSnomask('w', "CGIIRC"); + } - NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed. + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + cmd.Hosts.clear(); - if(Conf.GetError() == CONF_VALUE_NOT_FOUND) - NotifyOpers = true; + // Do we send an oper notice when a CGI:IRC has their host changed? + cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true); - for(int i = 0; i < Conf.Enumerate("cgihost"); i++) + 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. - std::string password = Conf.ReadValue("cgihost", "password", i); + 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()) { - 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", LOG_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") @@ -196,25 +267,44 @@ public: else if (type == "passfirst") cgitype = PASSFIRST; else if (type == "webirc") - { cgitype = WEBIRC; - } - - if (cgitype == INVALID) + 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.length() ? password : "" )); + cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password)); } } else { - ServerInstance->Logs->Log("CONFIG",DEFAULT, "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 ModResult OnUserRegister(LocalUser* user) + ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE + { + if (waiting.get(user)) + return MOD_RES_DENY; + + if (!cmd.realip.get(user)) + return MOD_RES_PASSTHRU; + + RecheckClass(user); + if (user->quitting) + return MOD_RES_DENY; + + user->CheckLines(true); + if (user->quitting) + return MOD_RES_DENY; + + return MOD_RES_PASSTHRU; + } + + ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE { for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++) { @@ -253,70 +343,11 @@ public: return MOD_RES_PASSTHRU; } - virtual void OnUserConnect(LocalUser* 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(User* user) + bool CheckPass(LocalUser* user) { if(IsValidHost(user->password)) { - 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. */ - if(NotifyOpers) - 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. */ - try - { - - bool cached; - CGIResolver* r = new CGIResolver(this, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached); - ServerInstance->AddResolver(r, cached); - } - catch (...) - { - if (NotifyOpers) - 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; } @@ -324,15 +355,14 @@ public: return false; } - bool CheckIdent(User* user) + 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; @@ -342,39 +372,17 @@ 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->CheckClass(); - user->host = newipstr; - user->dhost = newipstr; - user->ident.assign("~cgiirc", 0, 8); - try - { - - bool cached; - CGIResolver* r = new CGIResolver(this, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached); - ServerInstance->AddResolver(r, cached); - } - catch (...) - { - user->InvalidateCache(); - - if(NotifyOpers) - 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; } 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++) @@ -393,50 +401,10 @@ 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() + Version GetVersion() CXX11_OVERRIDE { return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR); } - }; MODULE_INIT(ModuleCgiIRC)