X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=8d911a5b4c122e40435c40f1549925f14e603048;hb=de4e4860091fe5a9a530acdb25f9a17e22323acf;hp=65671632d9502aca3bb6213b93ecc3e6ee6dfd36;hpb=d24619c012b34d5a3d4cfb93e7bea3ff3d5721e7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 65671632d..8d911a5b4 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -24,402 +24,365 @@ #include "inspircd.h" -#include "xline.h" -#include "modules/dns.h" +#include "modules/ssl.h" +#include "modules/whois.h" -enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; +enum +{ + // InspIRCd-specific. + RPL_WHOISGATEWAY = 350 +}; +// We need this method up here so that it can be accessed from anywhere +static void ChangeIP(LocalUser* user, const irc::sockets::sockaddrs& sa) +{ + // Set the users IP address and make sure they are in the right clone pool. + ServerInstance->Users->RemoveCloneCounts(user); + user->SetClientIP(sa); + ServerInstance->Users->AddClone(user); + if (user->quitting) + return; + + // Recheck the connect class. + user->MyClass = NULL; + user->SetClass(); + user->CheckClass(); + if (user->quitting) + return; + + // Check if this user matches any XLines. + user->CheckLines(true); + if (user->quitting) + return; +} + +// Encapsulates information about an ident host. +class IdentHost +{ + private: + std::string hostmask; + std::string newident; -/** Holds a CGI site's details - */ -class CGIhost + public: + IdentHost(const std::string& mask, const std::string& ident) + : hostmask(mask) + , newident(ident) + { + } + + const std::string& GetIdent() const + { + return newident; + } + + bool Matches(LocalUser* user) const + { + if (!InspIRCd::Match(user->GetRealHost(), hostmask, ascii_case_insensitive_map)) + return false; + + return InspIRCd::MatchCIDR(user->GetIPString(), hostmask, ascii_case_insensitive_map); + } +}; + +// Encapsulates information about a WebIRC host. +class WebIRCHost { -public: + private: std::string hostmask; - CGItype type; + std::string fingerprint; std::string password; + std::string passhash; + + public: + WebIRCHost(const std::string& mask, const std::string& fp, const std::string& pass, const std::string& hash) + : hostmask(mask) + , fingerprint(fp) + , password(pass) + , passhash(hash) + { + } - CGIhost(const std::string &mask, CGItype t, const std::string &spassword) - : hostmask(mask), type(t), password(spassword) + bool Matches(LocalUser* user, const std::string& pass) const { + // Did the user send a valid password? + if (!password.empty() && !ServerInstance->PassCompare(user, password, pass, passhash)) + return false; + + // Does the user have a valid fingerprint? + const std::string fp = SSLClientCert::GetFingerprint(&user->eh); + if (!fingerprint.empty() && fp != fingerprint) + return false; + + // Does the user's hostname match our hostmask? + if (InspIRCd::Match(user->GetRealHost(), hostmask, ascii_case_insensitive_map)) + return true; + + // Does the user's IP address match our hostmask? + return InspIRCd::MatchCIDR(user->GetIPString(), hostmask, ascii_case_insensitive_map); } }; -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 + * Syntax: WEBIRC password gateway hostname ip + * Where password is a shared key, gateway is the name of the WebIRC gateway 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 +class CommandWebIRC : public SplitCommand { public: + std::vector hosts; bool notify; + StringExtItem gateway; StringExtItem realhost; StringExtItem realip; - LocalStringExt webirc_hostname; - LocalStringExt webirc_ip; - - CGIHostlist Hosts; - CommandWebirc(Module* Creator) - : Command(Creator, "WEBIRC", 4), - 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()); - - bool host_ok = (parameters[2].length() < 64); - 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(), newhost.c_str(), user->host.c_str()); - - // 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 - if (host_ok) - webirc_hostname.set(user, parameters[2]); - else - webirc_hostname.unset(user); - - 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 DNS::Request -{ - std::string typ; - std::string theiruid; - LocalIntExt& waiting; - bool notify; - public: - 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) + CommandWebIRC(Module* Creator) + : SplitCommand(Creator, "WEBIRC", 4) + , gateway("cgiirc_gateway", ExtensionItem::EXT_USER, Creator) + , realhost("cgiirc_realhost", ExtensionItem::EXT_USER, Creator) + , realip("cgiirc_realip", ExtensionItem::EXT_USER, Creator) { + allow_empty_last_param = false; + works_before_reg = true; + this->syntax = "password gateway hostname ip"; } - void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE { - /* Check the user still exists */ - User* them = ServerInstance->FindUUID(theiruid); - if ((them) && (!them->quitting)) + if (user->registered == REG_ALL || realhost.get(user)) + return CMD_FAILURE; + + irc::sockets::sockaddrs ipaddr; + if (!irc::sockets::aptosa(parameters[3], user->client_sa.port(), ipaddr)) { - LocalUser* lu = IS_LOCAL(them); - if (!lu) - return; + user->CommandFloodPenalty += 5000; + WriteLog("Connecting user %s (%s) tried to use WEBIRC but gave an invalid IP address.", + user->uuid.c_str(), user->GetIPString().c_str()); + return CMD_FAILURE; + } - const DNS::ResourceRecord &ans_record = r->answers[0]; - if (ans_record.rdata.empty() || ans_record.rdata.length() > 64) - return; + for (std::vector::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter) + { + // If we don't match the host then skip to the next host. + if (!iter->Matches(user, parameters[0])) + continue; - 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(), ans_record.rdata.c_str(), typ.c_str()); + // The user matched a WebIRC block! + gateway.set(user, parameters[1]); + realhost.set(user, user->GetRealHost()); + realip.set(user, user->GetIPString()); - them->host = them->dhost = ans_record.rdata; - them->InvalidateCache(); - lu->CheckLines(true); - } - } + WriteLog("Connecting user %s is using a WebIRC gateway; changing their IP from %s to %s.", + user->uuid.c_str(), user->GetIPString().c_str(), parameters[3].c_str()); - void OnError(const DNS::Query *r) CXX11_OVERRIDE - { - if (!notify) - return; - - User* them = ServerInstance->FindUUID(theiruid); - if ((them) && (!them->quitting)) - { - 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()); + // Set the IP address sent via WEBIRC. We ignore the hostname and lookup + // instead do our own DNS lookups because of unreliable gateways. + ChangeIP(user, ipaddr); + return CMD_SUCCESS; } + + user->CommandFloodPenalty += 5000; + WriteLog("Connecting user %s (%s) tried to use WEBIRC but didn't match any configured WebIRC hosts.", + user->uuid.c_str(), user->GetIPString().c_str()); + return CMD_FAILURE; } - ~CGIResolver() + void WriteLog(const char* message, ...) CUSTOM_PRINTF(2, 3) { - User* them = ServerInstance->FindUUID(theiruid); - if (!them) - return; - int count = waiting.get(them); - if (count) - waiting.set(them, count - 1); + std::string buffer; + VAFORMAT(buffer, message, message); + + // If we are sending a snotice then the message will already be + // written to the logfile. + if (notify) + ServerInstance->SNO->WriteGlobalSno('w', buffer); + else + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, buffer); } }; -class ModuleCgiIRC : public Module +class ModuleCgiIRC : public Module, public Whois::EventListener { - CommandWebirc cmd; - LocalIntExt waiting; - dynamic_reference DNS; - - static void RecheckClass(LocalUser* user) - { - user->MyClass = NULL; - user->SetClass(); - user->CheckClass(); - } + private: + CommandWebIRC cmd; + std::vector hosts; - static void ChangeIP(LocalUser* user, const std::string& newip) + static bool ParseIdent(LocalUser* user, irc::sockets::sockaddrs& out) { - ServerInstance->Users->RemoveCloneCounts(user); - user->SetClientIP(newip.c_str()); - ServerInstance->Users->AddLocalClone(user); - ServerInstance->Users->AddGlobalClone(user); - } - - 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); - - // 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->nouserdns) - return; - - CGIResolver* r = new CGIResolver(*this->DNS, this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), waiting); - try + const char* ident = NULL; + if (user->ident.length() == 8) + { + // The ident is an IPv4 address encoded in hexadecimal with two characters + // per address segment. + ident = user->ident.c_str(); + } + else if (user->ident.length() == 9 && user->ident[0] == '~') { - waiting.set(user, waiting.get(user) + 1); - this->DNS->Process(r); + // The same as above but m_ident got to this user before we did. Strip the + // ident prefix and continue as normal. + ident = user->ident.c_str() + 1; } - catch (DNS::Exception &ex) + else { - int count = waiting.get(user); - if (count) - waiting.set(user, count - 1); - delete r; - if (cmd.notify) - ServerInstance->SNO->WriteToSnoMask('a', "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()); + // The user either does not have an IPv4 in their ident or the gateway server + // is also running an identd. In the latter case there isn't really a lot we + // can do so we just assume that the client in question is not connecting via + // an ident gateway. + return false; } + + // Try to convert the IP address to a string. If this fails then the user + // does not have an IPv4 address in their ident. + errno = 0; + unsigned long address = strtoul(ident, NULL, 16); + if (errno) + return false; + + out.in4.sin_family = AF_INET; + out.in4.sin_addr.s_addr = htonl(address); + return true; } -public: + public: ModuleCgiIRC() - : cmd(this) - , waiting("cgiirc-delay", this) - , DNS(this, "DNS") + : Whois::EventListener(this) + , cmd(this) { } void init() CXX11_OVERRIDE { - OnRehash(NULL); - ServiceProvider* providerlist[] = { &cmd, &cmd.realhost, &cmd.realip, &cmd.webirc_hostname, &cmd.webirc_ip, &waiting }; - ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*)); + ServerInstance->SNO->EnableSnomask('w', "CGIIRC"); } - void OnRehash(User* user) CXX11_OVERRIDE + 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); + std::vector identhosts; + std::vector webirchosts; ConfigTagList tags = ServerInstance->Config->ConfTags("cgihost"); for (ConfigIter i = tags.first; i != tags.second; ++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()) + // Ensure that we have the parameter. + const std::string mask = tag->getString("mask"); + if (mask.empty()) + throw ModuleException(" is a mandatory field, at " + tag->getTagLocation()); + + // Determine what lookup type this host uses. + const std::string type = tag->getString("type"); + if (stdalgo::string::equalsci(type, "ident")) + { + // The IP address should be looked up from the hex IP address. + const std::string newident = tag->getString("newident", "gateway", ServerInstance->IsIdent); + identhosts.push_back(IdentHost(mask, newident)); + } + else if (stdalgo::string::equalsci(type, "webirc")) { - 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)); - } + // The IP address will be received via the WEBIRC command. + const std::string fingerprint = tag->getString("fingerprint"); + const std::string password = tag->getString("password"); + + // WebIRC blocks require a password. + if (fingerprint.empty() && password.empty()) + throw ModuleException("When using either the fingerprint or password field is required, at " + tag->getTagLocation()); + + webirchosts.push_back(WebIRCHost(mask, fingerprint, password, tag->getString("hash"))); } else { - ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "Invalid value in config: %s", hostmask.c_str()); - continue; + throw ModuleException(type + " is an invalid type, at " + tag->getTagLocation()); } } + + // The host configuration was valid so we can apply it. + hosts.swap(identhosts); + cmd.hosts.swap(webirchosts); + + // Do we send an oper notice when a m_cgiirc client has their IP changed? + cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true); } - ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE { - if (waiting.get(user)) - return MOD_RES_DENY; - - std::string *webirc_ip = cmd.webirc_ip.get(user); - if (!webirc_ip) + // If is not set then we have nothing to do. + const std::string webirc = myclass->config->getString("webirc"); + if (webirc.empty()) return MOD_RES_PASSTHRU; - ChangeIP(user, *webirc_ip); - - std::string* webirc_hostname = cmd.webirc_hostname.get(user); - user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString()); - - RecheckClass(user); - if (user->quitting) + // If the user is not connecting via a WebIRC gateway then they + // cannot match this connect class. + const std::string* gateway = cmd.gateway.get(user); + if (!gateway) return MOD_RES_DENY; - user->CheckLines(true); - if (user->quitting) - return MOD_RES_DENY; - - cmd.webirc_hostname.unset(user); - cmd.webirc_ip.unset(user); - - return MOD_RES_PASSTHRU; + // If the gateway matches the constraint then + // allow the check to continue. Otherwise, reject it. + return InspIRCd::Match(*gateway, webirc) ? MOD_RES_PASSTHRU : MOD_RES_DENY; } ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE { - for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++) - { - if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map)) - { - // Deal with it... - 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); - } - else if(iter->type == WEBIRC) - { - // We don't need to do anything here - } - return MOD_RES_PASSTHRU; - } - } - return MOD_RES_PASSTHRU; - } + // There is no need to check for gateways if one is already being used. + if (cmd.realhost.get(user)) + return MOD_RES_PASSTHRU; - bool CheckPass(LocalUser* user) - { - if(IsValidHost(user->password)) + for (std::vector::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter) { - HandleIdentOrPass(user, user->password, true); - user->password.clear(); - return true; - } + // If we don't match the host then skip to the next host. + if (!iter->Matches(user)) + continue; - return false; - } + // We have matched an block! Try to parse the encoded IPv4 address + // out of the ident. + irc::sockets::sockaddrs address(user->client_sa); + if (!ParseIdent(user, address)) + return MOD_RES_PASSTHRU; - bool CheckIdent(LocalUser* user) - { - const char* ident; - in_addr newip; + // Store the hostname and IP of the gateway for later use. + cmd.realhost.set(user, user->GetRealHost()); + cmd.realip.set(user, user->GetIPString()); - 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; + const std::string& newident = iter->GetIdent(); + cmd.WriteLog("Connecting user %s is using an ident gateway; changing their IP from %s to %s and their ident from %s to %s.", + user->uuid.c_str(), user->GetIPString().c_str(), address.addr().c_str(), user->ident.c_str(), newident.c_str()); - errno = 0; - unsigned long ipaddr = strtoul(ident, NULL, 16); - if (errno) - return false; - newip.s_addr = htonl(ipaddr); - std::string newipstr(inet_ntoa(newip)); - - user->ident = "~cgiirc"; - HandleIdentOrPass(user, newipstr, false); - - return true; + user->ChangeIdent(newident); + ChangeIP(user, address); + break; + } + return MOD_RES_PASSTHRU; } - bool IsValidHost(const std::string &host) + void OnWhois(Whois::Context& whois) CXX11_OVERRIDE { - if(!host.size() || host.size() > 64) - return false; - - for(unsigned int i = 0; i < host.size(); i++) - { - if( ((host[i] >= '0') && (host[i] <= '9')) || - ((host[i] >= 'A') && (host[i] <= 'Z')) || - ((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())) ) + if (!whois.IsSelfWhois() && !whois.GetSource()->HasPrivPermission("users/auspex")) + return; - continue; - else - return false; - } + // If these fields are not set then the client is not using a gateway. + const std::string* realhost = cmd.realhost.get(whois.GetTarget()); + const std::string* realip = cmd.realip.get(whois.GetTarget()); + if (!realhost || !realip) + return; - return true; + const std::string* gateway = cmd.gateway.get(whois.GetTarget()); + if (gateway) + whois.SendLine(RPL_WHOISGATEWAY, *realhost, *realip, "is connected via the " + *gateway + " WebIRC gateway"); + else + whois.SendLine(RPL_WHOISGATEWAY, *realhost, *realip, "is connected via an ident gateway"); } Version GetVersion() CXX11_OVERRIDE { - return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR); + return Version("Enables forwarding the real IP address of a user from a gateway to the IRC server", VF_VENDOR); } - }; MODULE_INIT(ModuleCgiIRC)