X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=0f746b05b1e0340f4f863c3260f8233fa7b0796f;hb=HEAD;hp=473de3417e98cc7568c8772facc8775780a1ddfd;hpb=d3c7457dda8555e410f4fbc36bb1b1b4cb0ae3f2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 473de3417..0f746b05b 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -1,22 +1,48 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2013, 2018-2020 Sadie Powell + * Copyright (C) 2012-2015 Attila Molnar + * Copyright (C) 2012-2013 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 John Brooks + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005, 2007, 2010 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -/* $ModDesc: Provides support for RFC1413 ident lookups */ +enum +{ + // Either the ident looup has not started yet or the user is registered. + IDENT_UNKNOWN = 0, + + // Ident lookups are not enabled and a user has been marked as being skipped. + IDENT_SKIPPED, + + // Ident looups are not enabled and a user has been an insecure ident prefix. + IDENT_PREFIXED, + + // An ident lookup was done and an ident was found. + IDENT_FOUND, + + // An ident lookup was done but no ident was found + IDENT_MISSING +}; /* -------------------------------------------------------------- * Note that this is the third incarnation of m_ident. The first @@ -35,12 +61,12 @@ * our ident lookup class that is outside of this module, or out- * side of the control of the class. There are no timers, internal * events, or such, which will cause the socket to be deleted, - * queued for deletion, etc. In fact, theres not even any queueing! + * queued for deletion, etc. In fact, there's not even any queueing! * * Using this framework we have a much more stable module. * * A few things to note: - * + * * O The only place that may *delete* an active or inactive * ident socket is OnUserDisconnect in the module class. * Because this is out of scope of the socket class there is @@ -49,7 +75,7 @@ * * O Closure of the ident socket with the Close() method will * not cause removal of the socket from memory or detatchment - * from its 'parent' User class. It will only flag it as an + * from its 'parent' User class. It will only flag it as an * inactive socket in the socket engine. * * O Timeouts are handled in OnCheckReaady at the same time as @@ -76,182 +102,94 @@ class IdentRequestSocket : public EventHandler { - private: - - User *user; /* User we are attached to */ - InspIRCd* ServerInstance; /* Server instance */ - bool done; /* True if lookup is finished */ - std::string result; /* Holds the ident string if done */ - public: + LocalUser *user; /* User we are attached to */ + std::string result; /* Holds the ident string if done */ + time_t age; + bool done; /* True if lookup is finished */ - IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident) + IdentRequestSocket(LocalUser* u) : user(u) { - socklen_t size = 0; -#ifdef IPV6 - /* Does this look like a v6 ip address? */ - bool v6 = false; - if ((bindip.empty()) || bindip.find(':') != std::string::npos) - v6 = true; - - if (v6) - SetFd(socket(AF_INET6, SOCK_STREAM, 0)); - else -#endif - SetFd(socket(AF_INET, SOCK_STREAM, 0)); + age = ServerInstance->Time(); - if (GetFd() == -1) + SetFd(socket(user->server_sa.family(), SOCK_STREAM, 0)); + if (!HasFd()) throw ModuleException("Could not create socket"); - /* We allocate two of these because sizeof(sockaddr_in6) > sizeof(sockaddr_in) */ - sockaddr* s = new sockaddr[2]; - sockaddr* addr = new sockaddr[2]; - -#ifdef IPV6 - /* Horrid icky nasty ugly berkely socket crap. */ - if (v6) + done = false; + + irc::sockets::sockaddrs bindaddr; + irc::sockets::sockaddrs connaddr; + + memcpy(&bindaddr, &user->server_sa, sizeof(bindaddr)); + memcpy(&connaddr, &user->client_sa, sizeof(connaddr)); + + if (connaddr.family() == AF_INET6) { - in6_addr addy; - in6_addr n; - if (inet_pton(AF_INET6, user->GetIPString(), &addy) > 0) - { - ((sockaddr_in6*)addr)->sin6_family = AF_INET6; - memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy)); - ((sockaddr_in6*)addr)->sin6_port = htons(113); - size = sizeof(sockaddr_in6); - inet_pton(AF_INET6, bindip.c_str(), &n); - memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(sockaddr_in6)); - ((sockaddr_in6*)s)->sin6_port = 0; - ((sockaddr_in6*)s)->sin6_family = AF_INET6; - } + bindaddr.in6.sin6_port = 0; + connaddr.in6.sin6_port = htons(113); } else -#endif { - in_addr addy; - in_addr n; - if (inet_aton(user->GetIPString(), &addy) > 0) - { - ((sockaddr_in*)addr)->sin_family = AF_INET; - ((sockaddr_in*)addr)->sin_addr = addy; - ((sockaddr_in*)addr)->sin_port = htons(113); - size = sizeof(sockaddr_in); - inet_aton(bindip.c_str(), &n); - ((sockaddr_in*)s)->sin_addr = n; - ((sockaddr_in*)s)->sin_port = 0; - ((sockaddr_in*)s)->sin_family = AF_INET; - } + bindaddr.in4.sin_port = 0; + connaddr.in4.sin_port = htons(113); } /* Attempt to bind (ident requests must come from the ip the query is referring to */ - if (ServerInstance->SE->Bind(GetFd(), s, size) < 0) + if (SocketEngine::Bind(GetFd(), bindaddr) < 0) { this->Close(); - delete[] s; - delete[] addr; throw ModuleException("failed to bind()"); } - delete[] s; - ServerInstance->SE->NonBlocking(GetFd()); + SocketEngine::NonBlocking(GetFd()); /* Attempt connection (nonblocking) */ - if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1 && errno != EINPROGRESS) + if (SocketEngine::Connect(this, connaddr) == -1 && errno != EINPROGRESS) { this->Close(); - delete[] addr; throw ModuleException("connect() failed"); } - delete[] addr; - /* Add fd to socket engine */ - if (!ServerInstance->SE->AddFd(this)) + if (!SocketEngine::AddFd(this, FD_WANT_NO_READ | FD_WANT_POLL_WRITE)) { this->Close(); throw ModuleException("out of fds"); } - - /* Important: We set WantWrite immediately after connect() - * because a successful connection will trigger a writability event - */ - ServerInstance->SE->WantWrite(this); } - virtual void OnConnected() + void OnEventHandlerWrite() CXX11_OVERRIDE { - ServerInstance->Log(DEBUG,"OnConnected()"); - - /* Both sockaddr_in and sockaddr_in6 can be safely casted to sockaddr, especially since the - * only members we use are in a part of the struct that should always be identical (at the - * byte level). */ - #ifndef IPV6 - sockaddr_in laddr, raddr; - #else - sockaddr_in6 laddr, raddr; - #endif - - socklen_t laddrsz = sizeof(laddr); - socklen_t raddrsz = sizeof(raddr); - - if ((getsockname(user->GetFd(), (sockaddr*) &laddr, &laddrsz) != 0) || (getpeername(user->GetFd(), (sockaddr*) &raddr, &raddrsz) != 0)) - { - done = true; - return; - } + SocketEngine::ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); char req[32]; /* Build request in the form 'localport,remoteport\r\n' */ - #ifndef IPV6 - int req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.sin_port), ntohs(laddr.sin_port)); - #else - int req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.sin6_port), ntohs(laddr.sin6_port)); - #endif - + int req_size; + if (user->client_sa.family() == AF_INET6) + req_size = snprintf(req, sizeof(req), "%d,%d\r\n", + ntohs(user->client_sa.in6.sin6_port), ntohs(user->server_sa.in6.sin6_port)); + else + req_size = snprintf(req, sizeof(req), "%d,%d\r\n", + ntohs(user->client_sa.in4.sin_port), ntohs(user->server_sa.in4.sin_port)); + /* Send failed if we didnt write the whole ident request -- * might as well give up if this happens! */ - if (ServerInstance->SE->Send(this, req, req_size, 0) < req_size) + if (SocketEngine::Send(this, req, req_size, 0) < req_size) done = true; } - virtual void HandleEvent(EventType et, int errornum = 0) - { - switch (et) - { - case EVENT_READ: - /* fd readable event, received ident response */ - ReadResponse(); - break; - case EVENT_WRITE: - /* fd writeable event, successfully connected! */ - OnConnected(); - break; - case EVENT_ERROR: - /* fd error event, ohshi- */ - ServerInstance->Log(DEBUG,"EVENT_ERROR"); - /* We *must* Close() here immediately or we get a - * huge storm of EVENT_ERROR events! - */ - Close(); - done = true; - break; - } - } - void Close() { - /* Remove ident socket from engine, and close it, but dont detatch it + /* Remove ident socket from engine, and close it, but dont detach it * from its parent user class, or attempt to delete its memory. */ - if (GetFd() > -1) + if (HasFd()) { - ServerInstance->Log(DEBUG,"Close ident socket %d", GetFd()); - ServerInstance->SE->DelFd(this); - ServerInstance->SE->Close(GetFd()); - ServerInstance->SE->Shutdown(GetFd(), SHUT_WR); - this->SetFd(-1); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Close ident socket %d", GetFd()); + SocketEngine::Close(this); } } @@ -260,235 +198,231 @@ class IdentRequestSocket : public EventHandler return done; } - /* Note: if the lookup succeeded, will contain 'ident', otherwise - * will contain '~ident'. Use *GetResult() to determine lookup success. - */ - const char* GetResult() - { - return result.c_str(); - } - - void ReadResponse() + void OnEventHandlerRead() CXX11_OVERRIDE { /* We don't really need to buffer for incomplete replies here, since IDENT replies are * extremely short - there is *no* sane reason it'd be in more than one packet */ - char ibuf[MAXBUF]; - int recvresult = ServerInstance->SE->Recv(this, ibuf, MAXBUF-1, 0); + char ibuf[256]; + int recvresult = SocketEngine::Recv(this, ibuf, sizeof(ibuf)-1, 0); + + /* Close (but don't delete from memory) our socket + * and flag as done since the ident lookup has finished + */ + Close(); + done = true; /* Cant possibly be a valid response shorter than 3 chars, * because the shortest possible response would look like: '1,1' */ if (recvresult < 3) - { - Close(); - done = true; return; - } - ServerInstance->Log(DEBUG,"ReadResponse()"); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "ReadResponse()"); - irc::sepstream sep(ibuf, ':'); - std::string token; - for (int i = 0; sep.GetToken(token); i++) - { - /* We only really care about the 4th portion */ - if (i < 3) - continue; - - char ident[IDENTMAX + 2]; + /* Truncate at the first null character, but first make sure + * there is at least one null char (at the end of the buffer). + */ + ibuf[recvresult] = '\0'; + std::string buf(ibuf); - /* Truncate the ident at any characters we don't like, skip leading spaces */ - int k = 0; - for (const char *j = token.c_str(); *j && (k < IDENTMAX + 1); j++) - { - if (*j == ' ') - continue; + /* <2 colons: invalid + * 2 colons: reply is an error + * >3 colons: there is a colon in the ident + */ + if (std::count(buf.begin(), buf.end(), ':') != 3) + return; - /* Rules taken from InspIRCd::IsIdent */ - if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.')) - { - ident[k++] = *j; - continue; - } + std::string::size_type lastcolon = buf.rfind(':'); + /* Truncate the ident at any characters we don't like, skip leading spaces */ + for (std::string::const_iterator i = buf.begin()+lastcolon+1; i != buf.end(); ++i) + { + if (result.size() == ServerInstance->Config->Limits.IdentMax) + /* Ident is getting too long */ break; - } - ident[k] = '\0'; + if (*i == ' ') + continue; - /* Re-check with IsIdent, in case that changes and this doesn't (paranoia!) */ - if (*ident && ServerInstance->IsIdent(ident)) + /* Add the next char to the result and see if it's still a valid ident, + * according to IsIdent(). If it isn't, then erase what we just added and + * we're done. + */ + result += *i; + if (!ServerInstance->IsIdent(result)) { - result = ident; + result.erase(result.end()-1); + break; } - - break; } + } - /* Close (but dont delete from memory) our socket - * and flag as done - */ + void OnEventHandlerError(int errornum) CXX11_OVERRIDE + { Close(); done = true; - return; + } + + CullResult cull() CXX11_OVERRIDE + { + Close(); + return EventHandler::cull(); } }; class ModuleIdent : public Module { private: - int RequestTimeout; - public: - ModuleIdent(InspIRCd *Me) - : Module(Me) + unsigned int timeout; + bool prefixunqueried; + SimpleExtItem socket; + LocalIntExt state; + + static void PrefixIdent(LocalUser* user) { - OnRehash(NULL, ""); + // Check that they haven't been prefixed already. + if (user->ident[0] == '~') + return; + + // All invalid usernames are prefixed with a tilde. + std::string newident(user->ident); + newident.insert(newident.begin(), '~'); + + // If the username is too long then truncate it. + if (newident.length() > ServerInstance->Config->Limits.IdentMax) + newident.erase(ServerInstance->Config->Limits.IdentMax); + + // Apply the new username. + user->ChangeIdent(newident); } - - virtual Version GetVersion() + + public: + ModuleIdent() + : socket("ident_socket", ExtensionItem::EXT_USER, this) + , state("ident_state", ExtensionItem::EXT_USER, this) { - return Version(1, 1, 1, 0, VF_VENDOR, API_VERSION); } - - virtual void Implements(char *List) + + Version GetVersion() CXX11_OVERRIDE { - List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnCleanup] = List[I_OnUserDisconnect] = 1; + return Version("Allows the usernames (idents) of users to be looked up using the RFC 1413 Identification Protocol.", VF_VENDOR); } - - virtual void OnRehash(User *user, const std::string ¶m) + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader MyConf(ServerInstance); - - RequestTimeout = MyConf.ReadInteger("ident", "timeout", 0, true); - if (!RequestTimeout) - RequestTimeout = 5; + ConfigTag* tag = ServerInstance->Config->ConfValue("ident"); + timeout = tag->getDuration("timeout", 5, 1, 60); + prefixunqueried = tag->getBool("prefixunqueried"); } - - virtual int OnUserRegister(User *user) + + void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE { - /* User::ident is currently the username field from USER; with m_ident loaded, that - * should be preceded by a ~. The field is actually IDENTMAX+2 characters wide. */ - memmove(user->ident + 1, user->ident, IDENTMAX); - user->ident[0] = '~'; - /* Ensure that it is null terminated */ - user->ident[IDENTMAX + 1] = '\0'; - - user->WriteServ("NOTICE Auth :*** Looking up your ident..."); - - // Get the IP that the user is connected to, and bind to that for the outgoing connection - #ifndef IPV6 - sockaddr_in laddr; - #else - sockaddr_in6 laddr; - #endif - socklen_t laddrsz = sizeof(laddr); - - if (getsockname(user->GetFd(), (sockaddr*) &laddr, &laddrsz) != 0) + IdentRequestSocket* isock = socket.get(user); + if (isock) { - user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident); - return 0; + // If an ident lookup request was in progress then cancel it. + isock->Close(); + socket.unset(user); } - #ifndef IPV6 - const char *ip = inet_ntoa(laddr.sin_addr); - #else - char ip[INET6_ADDRSTRLEN + 1]; - inet_ntop(laddr.sin6_family, &laddr.sin6_addr, ip, INET6_ADDRSTRLEN); - #endif + // The ident protocol requires that clients are connecting over a protocol with ports. + if (user->client_sa.family() != AF_INET && user->client_sa.family() != AF_INET6) + return; + + // We don't want to look this up once the user has connected. + if (user->registered == REG_ALL || user->quitting) + return; + + ConfigTag* tag = user->MyClass->config; + if (!tag->getBool("useident", true)) + { + state.set(user, IDENT_SKIPPED); + return; + } + + user->WriteNotice("*** Looking up your ident..."); - IdentRequestSocket *isock = NULL; try { - isock = new IdentRequestSocket(ServerInstance, user, ip); + isock = new IdentRequestSocket(user); + socket.set(user, isock); } catch (ModuleException &e) { - ServerInstance->Log(DEBUG,"Ident exception: %s", e.GetReason()); - return 0; + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Ident exception: " + e.GetReason()); } - - user->Extend("ident_socket", isock); - return 0; } /* This triggers pretty regularly, we can use it in preference to * creating a Timer object and especially better than creating a * Timer per ident lookup! */ - virtual bool OnCheckReady(User *user) + ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE { - ServerInstance->Log(DEBUG,"OnCheckReady %s", user->nick); - /* Does user have an ident socket attached at all? */ - IdentRequestSocket *isock = NULL; - if (!user->GetExt("ident_socket", isock)) + IdentRequestSocket* isock = socket.get(user); + if (!isock) { - ServerInstance->Log(DEBUG, "No ident socket :("); - return true; + if (prefixunqueried && state.get(user) == IDENT_SKIPPED) + { + PrefixIdent(user); + state.set(user, IDENT_PREFIXED); + } + return MOD_RES_PASSTHRU; } - ServerInstance->Log(DEBUG, "Has ident_socket"); - - time_t compare = isock->age; - compare += RequestTimeout; + time_t compare = isock->age + timeout; /* Check for timeout of the socket */ if (ServerInstance->Time() >= compare) { /* Ident timeout */ - user->WriteServ("NOTICE Auth :*** Ident request timed out."); - ServerInstance->Log(DEBUG, "Timeout"); - /* The user isnt actually disconnecting, - * we call this to clean up the user - */ - OnUserDisconnect(user); - return true; + state.set(user, IDENT_MISSING); + PrefixIdent(user); + user->WriteNotice("*** Ident lookup timed out, using " + user->ident + " instead."); } - - /* Got a result yet? */ - if (!isock->HasResult()) + else if (!isock->HasResult()) { - ServerInstance->Log(DEBUG, "No result yet"); - return false; + // time still good, no result yet... hold the registration + return MOD_RES_DENY; } - ServerInstance->Log(DEBUG, "Yay, result!"); - /* wooo, got a result (it will be good, or bad) */ - if (*(isock->GetResult()) != '~') - user->WriteServ("NOTICE Auth :*** Found your ident, '%s'", isock->GetResult()); + else if (isock->result.empty()) + { + state.set(user, IDENT_MISSING); + PrefixIdent(user); + user->WriteNotice("*** Could not find your ident, using " + user->ident + " instead."); + } else - user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", isock->GetResult()); - - /* Copy the ident string to the user */ - strlcpy(user->ident, isock->GetResult(), IDENTMAX+1); + { + state.set(user, IDENT_FOUND); + user->ChangeIdent(isock->result); + user->WriteNotice("*** Found your ident, '" + user->ident + "'"); + } - /* The user isnt actually disconnecting, we call this to clean up the user */ - OnUserDisconnect(user); - return true; + isock->Close(); + socket.unset(user); + return MOD_RES_PASSTHRU; } - virtual void OnCleanup(int target_type, void *item) + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE { - /* Module unloading, tidy up users */ - if (target_type == TYPE_USER) - OnUserDisconnect((User*)item); + if (myclass->config->getBool("requireident") && state.get(user) != IDENT_FOUND) + { + ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires an identd response", + myclass->GetName().c_str()); + return MOD_RES_DENY; + } + return MOD_RES_PASSTHRU; } - virtual void OnUserDisconnect(User *user) + void OnUserConnect(LocalUser* user) CXX11_OVERRIDE { - /* User disconnect (generic socket detatch event) */ - IdentRequestSocket *isock = NULL; - if (user->GetExt("ident_socket", isock)) - { - isock->Close(); - delete isock; - user->Shrink("ident_socket"); - ServerInstance->Log(DEBUG, "Removed ident socket from %s", user->nick); - } + // Clear this as it is no longer necessary. + state.unset(user); } }; MODULE_INIT(ModuleIdent) -