X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=9ad25e6fbaec626573fe9402a8f08a3bf1f81b02;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=251773643d4de23ff65ea9b490a9fb19d88aba9c;hpb=62fe5b32bcdc86aa4eb67bbe8dee214066382eeb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 251773643..9ad25e6fb 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -1,13 +1,18 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014 md_5 + * Copyright (C) 2014 Googolplexed + * Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2013, 2015 Attila Molnar + * Copyright (C) 2012, 2019 Robby * 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) 2009 Uli Schlachter + * Copyright (C) 2007-2009 Robin Burchell * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2006-2007, 2010 Craig Edwards * * 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 @@ -24,213 +29,301 @@ #include "inspircd.h" -#include "xline.h" -#include "modules/dns.h" +#include "modules/ssl.h" +#include "modules/webirc.h" +#include "modules/whois.h" -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) +enum { - ServerInstance->Users->RemoveCloneCounts(user); - user->SetClientIP(newip.c_str()); - ServerInstance->Users->AddClone(user); -} + // InspIRCd-specific. + RPL_WHOISGATEWAY = 350 +}; -/** Holds a CGI site's details - */ -class CGIhost +// One or more hostmask globs or CIDR ranges. +typedef std::vector MaskList; + +// Encapsulates information about an ident host. +class IdentHost { -public: - std::string hostmask; - CGItype type; - std::string password; + private: + MaskList hostmasks; + std::string newident; - CGIhost(const std::string &mask, CGItype t, const std::string &spassword) - : hostmask(mask), type(t), password(spassword) + public: + IdentHost(const MaskList& masks, const std::string& ident) + : hostmasks(masks) + , newident(ident) { } -}; -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 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 -{ - public: - bool notify; - StringExtItem gateway; - StringExtItem realhost; - StringExtItem realip; + const std::string& GetIdent() const + { + return newident; + } - CGIHostlist Hosts; - CommandWebirc(Module* Creator) - : Command(Creator, "WEBIRC", 4) - , gateway("cgiirc_gateway", ExtensionItem::EXT_USER, Creator) - , realhost("cgiirc_realhost", ExtensionItem::EXT_USER, Creator) - , realip("cgiirc_realip", ExtensionItem::EXT_USER, Creator) + bool Matches(LocalUser* user) const + { + for (MaskList::const_iterator iter = hostmasks.begin(); iter != hostmasks.end(); ++iter) { - works_before_reg = true; - this->syntax = "password gateway hostname ip"; + // Does the user's hostname match this hostmask? + if (InspIRCd::Match(user->GetRealHost(), *iter, ascii_case_insensitive_map)) + return true; + + // Does the user's IP address match this hostmask? + if (InspIRCd::MatchCIDR(user->GetIPString(), *iter, ascii_case_insensitive_map)) + return true; } - 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) - { - gateway.set(user, parameters[1]); - realhost.set(user, user->host); - realip.set(user, user->GetIPString()); + // The user didn't match any hostmasks. + return false; + } +}; - // 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]); +// Encapsulates information about a WebIRC host. +class WebIRCHost +{ + private: + MaskList hostmasks; + std::string fingerprint; + std::string password; + std::string passhash; - 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()); + public: + WebIRCHost(const MaskList& masks, const std::string& fp, const std::string& pass, const std::string& hash) + : hostmasks(masks) + , fingerprint(fp) + , password(pass) + , passhash(hash) + { + } - // 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(); + bool Matches(LocalUser* user, const std::string& pass, UserCertificateAPI& sslapi) const + { + // Did the user send a valid password? + if (!password.empty() && !ServerInstance->PassCompare(user, password, pass, passhash)) + return false; - return CMD_SUCCESS; - } - } - } + // Does the user have a valid fingerprint? + const std::string fp = sslapi ? sslapi->GetFingerprint(user) : ""; + if (!fingerprint.empty() && !InspIRCd::TimingSafeCompare(fp, fingerprint)) + return false; - 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; + for (MaskList::const_iterator iter = hostmasks.begin(); iter != hostmasks.end(); ++iter) + { + // Does the user's hostname match this hostmask? + if (InspIRCd::Match(user->GetRealHost(), *iter, ascii_case_insensitive_map)) + return true; + + // Does the user's IP address match this hostmask? + if (InspIRCd::MatchCIDR(user->GetIPString(), *iter, ascii_case_insensitive_map)) + return true; } -}; + // The user didn't match any hostmasks. + return false; + } +}; -/** Resolver for CGI:IRC hostnames encoded in ident/GECOS - */ -class CGIResolver : public DNS::Request +class CommandHexIP : public SplitCommand { - 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) + CommandHexIP(Module* Creator) + : SplitCommand(Creator, "HEXIP", 1) { + allow_empty_last_param = false; + Penalty = 2; + syntax = ""; } - 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)) + irc::sockets::sockaddrs sa; + if (irc::sockets::aptosa(parameters[0], 0, sa)) { - 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 (sa.family() != AF_INET) + { + user->WriteNotice("*** HEXIP: You can only hex encode an IPv4 address!"); + return CMD_FAILURE; + } - if (notify) - 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()); + uint32_t addr = sa.in4.sin_addr.s_addr; + user->WriteNotice(InspIRCd::Format("*** HEXIP: %s encodes to %02x%02x%02x%02x.", + sa.addr().c_str(), (addr & 0xFF), ((addr >> 8) & 0xFF), ((addr >> 16) & 0xFF), + ((addr >> 24) & 0xFF))); + return CMD_SUCCESS; + } - them->host = them->dhost = ans_record.rdata; - them->InvalidateCache(); - lu->CheckLines(true); + if (ParseIP(parameters[0], sa)) + { + user->WriteNotice(InspIRCd::Format("*** HEXIP: %s decodes to %s.", + parameters[0].c_str(), sa.addr().c_str())); + return CMD_SUCCESS; } + + user->WriteNotice(InspIRCd::Format("*** HEXIP: %s is not a valid raw or hex encoded IPv4 address.", + parameters[0].c_str())); + return CMD_FAILURE; } - void OnError(const DNS::Query *r) CXX11_OVERRIDE + static bool ParseIP(const std::string& in, irc::sockets::sockaddrs& out) { - if (!notify) - return; - - User* them = ServerInstance->FindUUID(theiruid); - if ((them) && (!them->quitting)) + const char* ident = NULL; + if (in.length() == 8) { - 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()); + // The ident is an IPv4 address encoded in hexadecimal with two characters + // per address segment. + ident = in.c_str(); + } + else if (in.length() == 9 && in[0] == '~') + { + // The same as above but m_ident got to this user before we did. Strip the + // ident prefix and continue as normal. + ident = in.c_str() + 1; + } + else + { + // 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; } - } - ~CGIResolver() - { - User* them = ServerInstance->FindUUID(theiruid); - if (!them) - return; - int count = waiting.get(them); - if (count) - waiting.set(them, count - 1); + // 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; } }; -class ModuleCgiIRC : public Module +class CommandWebIRC : public SplitCommand { - CommandWebirc cmd; - LocalIntExt waiting; - dynamic_reference DNS; + public: + std::vector hosts; + bool notify; + StringExtItem gateway; + StringExtItem realhost; + StringExtItem realip; + UserCertificateAPI sslapi; + Events::ModuleEventProvider webircevprov; - static void RecheckClass(LocalUser* user) + 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) + , sslapi(Creator) + , webircevprov(Creator, "event/webirc") { - user->MyClass = NULL; - user->SetClass(); - user->CheckClass(); + allow_empty_last_param = false; + works_before_reg = true; + this->syntax = " []"; } - void HandleIdentOrPass(LocalUser* user, const std::string& newip, bool was_pass) + CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE { - 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; + if (user->registered == REG_ALL || realhost.get(user)) + return CMD_FAILURE; - CGIResolver* r = new CGIResolver(*this->DNS, this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), waiting); - try + for (std::vector::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter) { - 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()); + // If we don't match the host then skip to the next host. + if (!iter->Matches(user, parameters[0], sslapi)) + continue; + + irc::sockets::sockaddrs ipaddr; + if (!irc::sockets::aptosa(parameters[3], user->client_sa.port(), ipaddr)) + { + WriteLog("Connecting user %s (%s) tried to use WEBIRC but gave an invalid IP address.", + user->uuid.c_str(), user->GetIPString().c_str()); + ServerInstance->Users->QuitUser(user, "WEBIRC: IP address is invalid: " + parameters[3]); + return CMD_FAILURE; + } + + // The user matched a WebIRC block! + gateway.set(user, parameters[1]); + realhost.set(user, user->GetRealHost()); + realip.set(user, user->GetIPString()); + + WriteLog("Connecting user %s is using the %s WebIRC gateway; changing their IP from %s to %s.", + user->uuid.c_str(), parameters[1].c_str(), + user->GetIPString().c_str(), parameters[3].c_str()); + + // If we have custom flags then deal with them. + WebIRC::FlagMap flags; + const bool hasflags = (parameters.size() > 4); + if (hasflags) + { + // Parse the flags. + irc::spacesepstream flagstream(parameters[4]); + for (std::string flag; flagstream.GetToken(flag); ) + { + // Does this flag have a value? + const size_t separator = flag.find('='); + if (separator == std::string::npos) + { + flags[flag]; + continue; + } + + // The flag has a value! + const std::string key = flag.substr(0, separator); + const std::string value = flag.substr(separator + 1); + flags[key] = value; + } + } + + // Inform modules about the WebIRC attempt. + FOREACH_MOD_CUSTOM(webircevprov, WebIRC::EventListener, OnWebIRCAuth, (user, (hasflags ? &flags : NULL))); + + // Set the IP address sent via WEBIRC. We ignore the hostname and lookup + // instead do our own DNS lookups because of unreliable gateways. + user->SetClientIP(ipaddr); + return CMD_SUCCESS; } + + 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()); + ServerInstance->Users->QuitUser(user, "WEBIRC: you don't match any configured WebIRC hosts."); + return CMD_FAILURE; } -public: + void WriteLog(const char* message, ...) CUSTOM_PRINTF(2, 3) + { + 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 + , public WebIRC::EventListener + , public Whois::EventListener +{ + private: + CommandHexIP cmdhexip; + CommandWebIRC cmdwebirc; + std::vector hosts; + + public: ModuleCgiIRC() - : cmd(this) - , waiting("cgiirc-delay", ExtensionItem::EXT_USER, this) - , DNS(this, "DNS") + : WebIRC::EventListener(this) + , Whois::EventListener(this) + , cmdhexip(this) + , cmdwebirc(this) { } @@ -241,70 +334,62 @@ public: 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()) + MaskList masks; + irc::spacesepstream maskstream(tag->getString("mask")); + for (std::string mask; maskstream.GetToken(mask); ) + masks.push_back(mask); + + // Ensure that we have the parameter. + if (masks.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(masks, newident)); + } + else if (stdalgo::string::equalsci(type, "webirc")) { - if (type == "webirc" && password.empty()) + // The IP address will be received via the WEBIRC command. + const std::string fingerprint = tag->getString("fingerprint"); + const std::string password = tag->getString("password"); + const std::string passwordhash = tag->getString("hash", "plaintext", 1); + + // 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()); + + if (!password.empty() && stdalgo::string::equalsci(passwordhash, "plaintext")) { - ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Missing password in config: %s", hostmask.c_str()); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, " tag at %s contains an plain text password, this is insecure!", + tag->getTagLocation().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(MODNAME, LOG_DEFAULT, "Invalid value in config: %s, setting it to \"pass\"", type.c_str()); - } - cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password)); - } + webirchosts.push_back(WebIRCHost(masks, fingerprint, password, passwordhash)); } else { - ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Invalid value in config: %s", hostmask.c_str()); - continue; + throw ModuleException(type + " is an invalid type, at " + tag->getTagLocation()); } } - } - - 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; + // The host configuration was valid so we can apply it. + hosts.swap(identhosts); + cmdwebirc.hosts.swap(webirchosts); - return MOD_RES_PASSTHRU; + // Do we send an oper notice when a m_cgiirc client has their IP changed? + cmdwebirc.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true); } ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE @@ -316,115 +401,140 @@ public: // 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); + const std::string* gateway = cmdwebirc.gateway.get(user); if (!gateway) + { + ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires a connection via a WebIRC gateway", + myclass->GetName().c_str()); return MOD_RES_DENY; + } // 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(*gateway, webirc)) { - 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; - } + ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as the WebIRC gateway name (%s) does not match %s", + myclass->GetName().c_str(), gateway->c_str(), webirc.c_str()); + return MOD_RES_DENY; } + return MOD_RES_PASSTHRU; } - bool CheckPass(LocalUser* user) + ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE { - if(IsValidHost(user->password)) - { - HandleIdentOrPass(user, user->password, true); - user->password.clear(); - return true; - } - - return false; - } + // There is no need to check for gateways if one is already being used. + if (cmdwebirc.realhost.get(user)) + return MOD_RES_PASSTHRU; - bool CheckIdent(LocalUser* user) - { - const char* ident; - in_addr newip; + 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)) + continue; - 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; + // We have matched an block! Try to parse the encoded IPv4 address + // out of the ident. + irc::sockets::sockaddrs address(user->client_sa); + if (!CommandHexIP::ParseIP(user->ident, address)) + return MOD_RES_PASSTHRU; - errno = 0; - unsigned long ipaddr = strtoul(ident, NULL, 16); - if (errno) - return false; - newip.s_addr = htonl(ipaddr); - std::string newipstr(inet_ntoa(newip)); + // Store the hostname and IP of the gateway for later use. + cmdwebirc.realhost.set(user, user->GetRealHost()); + cmdwebirc.realip.set(user, user->GetIPString()); - user->ident = "~cgiirc"; - HandleIdentOrPass(user, newipstr, false); + const std::string& newident = iter->GetIdent(); + cmdwebirc.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()); - return true; + user->ChangeIdent(newident); + user->SetClientIP(address); + break; + } + return MOD_RES_PASSTHRU; } - bool IsValidHost(const std::string &host) + void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE { - if(!host.size() || host.size() > ServerInstance->Config->Limits.MaxHost) - return false; + // We are only interested in connection flags. If none have been + // given then we have nothing to do. + if (!flags) + return; - for(unsigned int i = 0; i < host.size(); i++) + WebIRC::FlagMap::const_iterator cport = flags->find("remote-port"); + if (cport != flags->end()) { - 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 we can't parse the port then just give up. + uint16_t port = ConvToNum(cport->second); + if (port) + { + switch (user->client_sa.family()) + { + case AF_INET: + user->client_sa.in4.sin_port = htons(port); + break; + + case AF_INET6: + user->client_sa.in6.sin6_port = htons(port); + break; + + default: + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BUG: OnWebIRCAuth(%s): socket type %d is unknown!", + user->uuid.c_str(), user->client_sa.family()); + return; + } + } + } - continue; - else - return false; + WebIRC::FlagMap::const_iterator sport = flags->find("local-port"); + if (sport != flags->end()) + { + // If we can't parse the port then just give up. + uint16_t port = ConvToNum(sport->second); + if (port) + { + switch (user->server_sa.family()) + { + case AF_INET: + user->server_sa.in4.sin_port = htons(port); + break; + + case AF_INET6: + user->server_sa.in6.sin6_port = htons(port); + break; + + default: + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BUG: OnWebIRCAuth(%s): socket type %d is unknown!", + user->uuid.c_str(), user->server_sa.family()); + return; + } + } } + } - return true; + void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + { + if (!whois.IsSelfWhois() && !whois.GetSource()->HasPrivPermission("users/auspex")) + return; + + // If these fields are not set then the client is not using a gateway. + const std::string* realhost = cmdwebirc.realhost.get(whois.GetTarget()); + const std::string* realip = cmdwebirc.realip.get(whois.GetTarget()); + if (!realhost || !realip) + return; + + const std::string* gateway = cmdwebirc.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("Adds the ability for IRC gateways to forward the real IP address of users connecting through them.", VF_VENDOR); } };