X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=ecb07f96ecbce661d673fcf36bed135106541991;hb=abbf70b2a35edaf17631e43027828011296924ad;hp=87cd8600070a656c8baf1b739c6c0f2215d2cc5e;hpb=52727673077afcb7377cef7491d3bdf9ab1c372e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 87cd86000..ecb07f96e 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -24,14 +24,20 @@ #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) { ServerInstance->Users->RemoveCloneCounts(user); - user->SetClientIP(newip.c_str()); + user->SetClientIP(newip); ServerInstance->Users->AddClone(user); } @@ -39,13 +45,15 @@ static void ChangeIP(User* user, const std::string& newip) 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) { @@ -54,11 +62,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? @@ -97,7 +110,7 @@ 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) return CMD_FAILURE; @@ -106,14 +119,11 @@ class CommandWebIRC : public SplitCommand if (!irc::sockets::aptosa(parameters[3], 0, 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. @@ -122,94 +132,41 @@ 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. + // 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, parameters[3]); - user->host = user->dhost = newhost; - user->InvalidateCache(); 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 WriteLog(const char* message, ...) CUSTOM_PRINTF(2, 3) { - } + std::string buffer; + VAFORMAT(buffer, message, message); - void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE - { - /* 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; - - 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 +class ModuleCgiIRC : public Module, public Whois::EventListener { CommandWebIRC cmd; - LocalIntExt waiting; - dynamic_reference DNS; std::vector hosts; static void RecheckClass(LocalUser* user) @@ -221,39 +178,19 @@ class ModuleCgiIRC : public Module void HandleIdent(LocalUser* user, const std::string& newip) { - cmd.realhost.set(user, user->host); + cmd.realhost.set(user, user->GetRealHost()); cmd.realip.set(user, user->GetIPString()); + + cmd.WriteLog("Connecting user %s is using an ident gateway; changing their IP from %s to %s.", + user->uuid.c_str(), user->GetIPString().c_str(), newip.c_str()); 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 - { - 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") + : Whois::EventListener(this) + , cmd(this) { } @@ -287,13 +224,14 @@ public: 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 { @@ -305,15 +243,12 @@ 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; @@ -350,7 +285,7 @@ public: { 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 (!InspIRCd::Match(user->GetRealHost(), *iter, ascii_case_insensitive_map) && !InspIRCd::MatchCIDR(user->GetIPString(), *iter, ascii_case_insensitive_map)) continue; CheckIdent(user); // Nothing on failure. @@ -360,6 +295,24 @@ public: return MOD_RES_PASSTHRU; } + 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 = cmd.realhost.get(whois.GetTarget()); + const std::string* realip = cmd.realip.get(whois.GetTarget()); + if (!realhost || !realip) + return; + + 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"); + } + bool CheckIdent(LocalUser* user) { const char* ident; @@ -387,7 +340,7 @@ public: 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); } };