X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=8d911a5b4c122e40435c40f1549925f14e603048;hb=dccf47d0a091be2395257d401f8ed55eaa258bc7;hp=51638855c6f02db71f3533ba80b10bf806132319;hpb=8fb067d2cca22c3568c352a2b6f98084916fafb3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 51638855c..8d911a5b4 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -24,33 +24,79 @@ #include "inspircd.h" -#include "xline.h" -#include "modules/dns.h" +#include "modules/ssl.h" +#include "modules/whois.h" enum { + // InspIRCd-specific. RPL_WHOISGATEWAY = 350 }; // We need this method up here so that it can be accessed from anywhere -static void ChangeIP(User* user, const std::string& newip) +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(newip.c_str()); + 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; + + 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 { private: - const std::string hostmask; - const std::string password; - const std::string passhash; + std::string hostmask; + std::string fingerprint; + std::string password; + std::string passhash; public: - WebIRCHost(const std::string& mask, const std::string& pass, const std::string& hash) + 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) { @@ -59,11 +105,16 @@ class WebIRCHost bool Matches(LocalUser* user, const std::string& pass) const { // Did the user send a valid password? - if (!ServerInstance->PassCompare(user, password, pass, passhash)) + 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->host, hostmask, ascii_case_insensitive_map)) + if (InspIRCd::Match(user->GetRealHost(), hostmask, ascii_case_insensitive_map)) return true; // Does the user's IP address match our hostmask? @@ -102,23 +153,20 @@ class CommandWebIRC : public SplitCommand this->syntax = "password gateway hostname ip"; } - CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE { - if (user->registered == REG_ALL) + if (user->registered == REG_ALL || realhost.get(user)) return CMD_FAILURE; irc::sockets::sockaddrs ipaddr; - if (!irc::sockets::aptosa(parameters[3], 0, ipaddr)) + if (!irc::sockets::aptosa(parameters[3], user->client_sa.port(), ipaddr)) { user->CommandFloodPenalty += 5000; - ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s tried to use WEBIRC but gave an invalid IP address.", user->GetFullRealHost().c_str()); + 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; } - // If the hostname is malformed then we use the IP address instead. - bool host_ok = (parameters[2].length() <= ServerInstance->Config->Limits.MaxHost) && (parameters[2].find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-") == std::string::npos); - const std::string& newhost = (host_ok ? parameters[2] : parameters[3]); - 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. @@ -127,139 +175,84 @@ class CommandWebIRC : public SplitCommand // The user matched a WebIRC block! gateway.set(user, parameters[1]); - realhost.set(user, user->host); + realhost.set(user, user->GetRealHost()); realip.set(user, user->GetIPString()); - if (notify) - ServerInstance->SNO->WriteGlobalSno('w', "Connecting user %s is using a WebIRC gateway; changing their IP/host from %s/%s to %s/%s.", - user->nick.c_str(), user->GetIPString().c_str(), user->host.c_str(), parameters[3].c_str(), newhost.c_str()); + 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()); - // Set the IP address and hostname sent via WEBIRC. - ChangeIP(user, parameters[3]); - user->host = user->dhost = newhost; - user->InvalidateCache(); + // 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; - ServerInstance->SNO->WriteGlobalSno('w', "Connecting user %s tried to use WEBIRC but didn't match any configured WebIRC hosts.", user->GetFullRealHost().c_str()); + 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; } -}; - -/** Resolver for CGI:IRC hostnames encoded in ident/GECOS - */ -class CGIResolver : public DNS::Request -{ - std::string theiruid; - LocalIntExt& waiting; - bool notify; - public: - CGIResolver(DNS::Manager* mgr, Module* me, bool NotifyOpers, const std::string &source, LocalUser* u, LocalIntExt& ext) - : DNS::Request(mgr, me, source, DNS::QUERY_PTR) - , theiruid(u->uuid) - , waiting(ext) - , notify(NotifyOpers) - { - } - - void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE + void WriteLog(const char* message, ...) CUSTOM_PRINTF(2, 3) { - /* Check the user still exists */ - 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('w', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s", them->nick.c_str(), them->host.c_str(), ans_record.rdata.c_str()); - - them->host = them->dhost = ans_record.rdata; - them->InvalidateCache(); - lu->CheckLines(true); - } - } - - void OnError(const DNS::Query *r) CXX11_OVERRIDE - { - if (!notify) - return; + std::string buffer; + VAFORMAT(buffer, message, message); - User* them = ServerInstance->FindUUID(theiruid); - if ((them) && (!them->quitting)) - { - ServerInstance->SNO->WriteToSnoMask('w', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved!", them->nick.c_str(), them->host.c_str()); - } - } - - ~CGIResolver() - { - User* them = ServerInstance->FindUUID(theiruid); - if (!them) - return; - int count = waiting.get(them); - if (count) - waiting.set(them, count - 1); + // 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 Whois::EventListener { + private: CommandWebIRC cmd; - LocalIntExt waiting; - dynamic_reference DNS; - std::vector hosts; - - static void RecheckClass(LocalUser* user) - { - user->MyClass = NULL; - user->SetClass(); - user->CheckClass(); - } + std::vector hosts; - void HandleIdent(LocalUser* user, const std::string& newip) + static bool ParseIdent(LocalUser* user, irc::sockets::sockaddrs& out) { - 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, waiting); - try + const char* ident = NULL; + if (user->ident.length() == 8) { - waiting.set(user, waiting.get(user) + 1); - this->DNS->Process(r); + // The ident is an IPv4 address encoded in hexadecimal with two characters + // per address segment. + ident = user->ident.c_str(); } - catch (DNS::Exception &ex) + else if (user->ident.length() == 9 && user->ident[0] == '~') { - 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()); + // 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; } + 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; + } + + // 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() : Whois::EventListener(this) , cmd(this) - , waiting("cgiirc-delay", ExtensionItem::EXT_USER, this) - , DNS(this, "DNS") { } @@ -270,7 +263,7 @@ public: void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - std::vector identhosts; + std::vector identhosts; std::vector webirchosts; ConfigTagList tags = ServerInstance->Config->ConfTags("cgihost"); @@ -288,18 +281,20 @@ public: if (stdalgo::string::equalsci(type, "ident")) { // The IP address should be looked up from the hex IP address. - identhosts.push_back(mask); + const std::string newident = tag->getString("newident", "gateway", ServerInstance->IsIdent); + identhosts.push_back(IdentHost(mask, newident)); } else if (stdalgo::string::equalsci(type, "webirc")) { // 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 (password.empty()) - throw ModuleException("When using the password field is required, at " + tag->getTagLocation()); + 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, password, tag->getString("hash"))); + webirchosts.push_back(WebIRCHost(mask, fingerprint, password, tag->getString("hash"))); } else { @@ -311,29 +306,10 @@ public: hosts.swap(identhosts); cmd.hosts.swap(webirchosts); - // Do we send an oper notice when a m_cgiirc client has their IP/host changed? + // 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 - { - 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 OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE { // If is not set then we have nothing to do. @@ -354,14 +330,33 @@ public: ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE { - for (std::vector::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter) + // There is no need to check for gateways if one is already being used. + if (cmd.realhost.get(user)) + return MOD_RES_PASSTHRU; + + for (std::vector::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter) { - if (!InspIRCd::Match(user->host, *iter, ascii_case_insensitive_map) && !InspIRCd::MatchCIDR(user->GetIPString(), *iter, ascii_case_insensitive_map)) + // If we don't match the host then skip to the next host. + if (!iter->Matches(user)) continue; - CheckIdent(user); // Nothing on failure. - user->CheckLines(true); - break; + // 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; + + // Store the hostname and IP of the gateway for later use. + cmd.realhost.set(user, user->GetRealHost()); + cmd.realip.set(user, user->GetIPString()); + + 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()); + + user->ChangeIdent(newident); + ChangeIP(user, address); + break; } return MOD_RES_PASSTHRU; } @@ -384,34 +379,9 @@ public: whois.SendLine(RPL_WHOISGATEWAY, *realhost, *realip, "is connected via an ident gateway"); } - bool CheckIdent(LocalUser* user) - { - 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; - - 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"; - HandleIdent(user, newipstr); - - return true; - } - 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); } };