X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=52c24e50ad89eb815173d9abbc46b72efbbf09d2;hb=0a6b1e1a7de92e078a98f0b955d2624e5b85e4c1;hp=09f6a4659d88e0d760a85d48166514ed825b68d8;hpb=df8015951b622363ec34a3ddc002199bd588551c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 09f6a4659..52c24e50a 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 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,404 +29,456 @@ #include "inspircd.h" -#include "xline.h" +#include "modules/ssl.h" +#include "modules/webirc.h" +#include "modules/whois.h" -/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */ +enum +{ + // InspIRCd-specific. + RPL_WHOISGATEWAY = 350 +}; -enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC }; +// 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) + { + } -/** Holds a CGI site's details - */ -class CGIhost + 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; - CGIhost(const std::string &mask, CGItype t, const std::string &spassword) - : hostmask(mask), type(t), password(spassword) + 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) { } + + 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; + + // Does the user have a valid fingerprint? + const std::string fp = sslapi ? sslapi->GetFingerprint(user) : ""; + if (!fingerprint.empty() && !InspIRCd::TimingSafeCompare(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) - { - allow_empty_last_param = false; - works_before_reg = true; - this->syntax = "password client hostname ip"; - } - CmdResult Handle(const std::vector ¶meters, User *user) + UserCertificateAPI sslapi; + Events::ModuleEventProvider webircevprov; + + 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") + { + allow_empty_last_param = false; + works_before_reg = true; + this->syntax = " []"; + } + + CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + { + if (user->registered == REG_ALL || realhost.get(user)) + return CMD_FAILURE; + + for (std::vector::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter) { - if(user->registered == REG_ALL) - return CMD_FAILURE; + // 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], 0, ipaddr)) + if (!irc::sockets::aptosa(parameters[3], user->client_sa.port(), ipaddr)) { - IS_LOCAL(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()); + ServerInstance->Users->QuitUser(user, "WEBIRC: IP address is invalid: " + parameters[3]); return CMD_FAILURE; } - for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++) + // 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 a WebIRC gateway; changing their IP from %s to %s.", + user->uuid.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) { - if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map)) + // Parse the flags. + irc::spacesepstream flagstream(parameters[4]); + for (std::string flag; flagstream.GetToken(flag); ) { - if(iter->type == WEBIRC && parameters[0] == iter->password) + // Does this flag have a value? + const size_t separator = flag.find('='); + if (separator == std::string::npos) { - 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; + 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; } } - IS_LOCAL(user)->CommandFloodPenalty += 5000; - 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 Resolver -{ - std::string typ; - std::string theiruid; - LocalIntExt& waiting; - bool notify; - public: - CGIResolver(Module* me, bool NotifyOpers, const std::string &source, LocalUser* u, - const std::string &type, bool &cached, LocalIntExt& ext) - : Resolver(source, DNS_QUERY_PTR4, cached, me), typ(type), theiruid(u->uuid), - waiting(ext), notify(NotifyOpers) - { - } + // Inform modules about the WebIRC attempt. + FOREACH_MOD_CUSTOM(webircevprov, WebIRC::EventListener, OnWebIRCAuth, (user, (hasflags ? &flags : NULL))); - virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) - { - /* Check the user still exists */ - User* them = ServerInstance->FindUUID(theiruid); - if ((them) && (!them->quitting)) - { - 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()); - - if (result.length() > 64) - return; - them->host = result; - them->dhost = result; - them->InvalidateCache(); - them->CheckLines(true); + // 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; } - } - virtual void OnError(ResolverError e, const std::string &errormessage) - { - 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()); - } + 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; } - virtual ~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 WebIRC::EventListener + , public Whois::EventListener { - CommandWebirc cmd; - LocalIntExt waiting; - - 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 || ServerInstance->Config->NoUserDns) - return; - - try + const char* ident = NULL; + if (user->ident.length() == 8) { - bool cached; - CGIResolver* r = new CGIResolver(this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), cached, waiting); - waiting.set(user, waiting.get(user) + 1); - ServerInstance->AddResolver(r, cached); + // The ident is an IPv4 address encoded in hexadecimal with two characters + // per address segment. + ident = user->ident.c_str(); } - catch (...) + else if (user->ident.length() == 9 && user->ident[0] == '~') + { + // 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 { - if (cmd.notify) - 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()); + // 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: - ModuleCgiIRC() : cmd(this), waiting("cgiirc-delay", this) + public: + ModuleCgiIRC() + : WebIRC::EventListener(this) + , Whois::EventListener(this) + , cmd(this) { } - void init() + 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*)); - - Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady }; - ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + ServerInstance->SNO->EnableSnomask('w', "CGIIRC"); } - void OnRehash(User* user) + 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()) + // 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("CONFIG",DEFAULT, "m_cgiirc: 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("CONFIG",DEFAULT, "m_cgiirc.so: Invalid value in config: %s, setting it to \"pass\"", type.c_str()); - } - cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password)); - } + webirchosts.push_back(WebIRCHost(mask, fingerprint, password, passwordhash)); } else { - ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: 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) + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE { - if (waiting.get(user)) + // 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; + + // 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) + { + 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; + } - std::string *webirc_ip = cmd.webirc_ip.get(user); - if (!webirc_ip) - return MOD_RES_PASSTHRU; + // If the gateway matches the constraint then + // allow the check to continue. Otherwise, reject it. + if (!InspIRCd::Match(*gateway, webirc)) + { + 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; + } - ChangeIP(user, *webirc_ip); + return MOD_RES_PASSTHRU; + } - std::string* webirc_hostname = cmd.webirc_hostname.get(user); - user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString()); - user->InvalidateCache(); + ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + { + // There is no need to check for gateways if one is already being used. + if (cmd.realhost.get(user)) + return MOD_RES_PASSTHRU; - RecheckClass(user); - if (user->quitting) - return MOD_RES_DENY; + 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; - user->CheckLines(true); - if (user->quitting) - return MOD_RES_DENY; + // 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; - cmd.webirc_hostname.unset(user); - cmd.webirc_ip.unset(user); + // 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); + user->SetClientIP(address); + break; + } return MOD_RES_PASSTHRU; } - ModResult OnUserRegister(LocalUser* user) + void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE { - for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++) + // We are only interested in connection flags. If none have been + // given then we have nothing to do. + if (!flags) + return; + + WebIRC::FlagMap::const_iterator cport = flags->find("remote-port"); + if (cport != flags->end()) { - if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map)) + // If we can't parse the port then just give up. + uint16_t port = ConvToNum(cport->second); + if (port) { - // 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)) + switch (user->client_sa.family()) { - // If the ident lookup fails, try the password. - CheckPass(user); - user->CheckLines(true); + 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; } - else if(iter->type == WEBIRC) - { - // We don't need to do anything here - } - return MOD_RES_PASSTHRU; } } - return MOD_RES_PASSTHRU; - } - bool CheckPass(LocalUser* user) - { - if(IsValidHost(user->password)) + WebIRC::FlagMap::const_iterator sport = flags->find("local-port"); + if (sport != flags->end()) { - HandleIdentOrPass(user, user->password, true); - user->password.clear(); - return true; + // 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 false; } - bool CheckIdent(LocalUser* user) + void OnWhois(Whois::Context& whois) CXX11_OVERRIDE { - 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"; - HandleIdentOrPass(user, newipstr, false); - - return true; - } - - bool IsValidHost(const std::string &host) - { - 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"); } - virtual Version GetVersion() + 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); } - }; MODULE_INIT(ModuleCgiIRC)