X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=d74873e00770d9aaeb3b8c93552f5a7babff61ff;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=723b30c870e35df2ffbd80c75fe8a960e1be0984;hpb=8b41eadd920668bc17f543e39bb40f9ee96c098b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 723b30c87..d74873e00 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,140 +12,146 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" /* $ModDesc: Provides support for RFC1413 ident lookups */ +/* -------------------------------------------------------------- + * Note that this is the third incarnation of m_ident. The first + * two attempts were pretty crashy, mainly due to the fact we tried + * to use InspSocket/BufferedSocket to make them work. This class + * is ok for more heavyweight tasks, it does a lot of things behind + * the scenes that are not good for ident sockets and it has a huge + * memory footprint! + * + * To fix all the issues that we had in the old ident modules (many + * nasty race conditions that would cause segfaults etc) we have + * rewritten this module to use a simplified socket object based + * directly off EventHandler. As EventHandler only has low level + * readability, writeability and error events tied directly to the + * socket engine, this makes our lives easier as nothing happens to + * 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! + * + * 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 + * no possibility that the socket may ever try to delete + * itself. + * + * 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 + * inactive socket in the socket engine. + * + * O Timeouts are handled in OnCheckReaady at the same time as + * checking if the ident socket has a result. This is done + * by checking if the age the of the class (its instantiation + * time) plus the timeout value is greater than the current time. + * + * O The ident socket is able to but should not modify its + * 'parent' user directly. Instead the ident socket class sets + * a completion flag and during the next call to OnCheckReady, + * the completion flag will be checked and any result copied to + * that user's class. This again ensures a single point of socket + * deletion for safer, neater code. + * + * O The code in the constructor of the ident socket is taken from + * BufferedSocket but majorly thinned down. It works for both + * IPv4 and IPv6. + * + * O In the event that the ident socket throws a ModuleException, + * nothing is done. This is counted as total and complete + * failure to create a connection. + * -------------------------------------------------------------- + */ + class IdentRequestSocket : public EventHandler { private: - - User *user; - InspIRCd* ServerInstance; - bool done; - std::string result; - + User *user; /* User we are attached to */ + bool done; /* True if lookup is finished */ + std::string result; /* Holds the ident string if done */ public: + time_t age; - IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident) + IdentRequestSocket(User* u) : user(u), result(u->ident) { - /* connect here on instantiation, throw on immediate failure */ - + age = ServerInstance->Time(); socklen_t size = 0; -#ifdef IPV6 - 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)); + SetFd(socket(user->server_sa.sa.sa_family, SOCK_STREAM, 0)); if (GetFd() == -1) throw ModuleException("Could not create socket"); - sockaddr* s = new sockaddr[2]; - sockaddr* addr = new sockaddr[2]; - -#ifdef IPV6 - 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.sa.sa_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, IP.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); } - if (ServerInstance->SE->Bind(GetFd(), s, size) < 0) + /* Attempt to bind (ident requests must come from the ip the query is referring to */ + if (ServerInstance->SE->Bind(GetFd(), &bindaddr.sa, size) < 0) { this->Close(); - delete[] s; throw ModuleException("failed to bind()"); } - delete[] s; ServerInstance->SE->NonBlocking(GetFd()); - if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1 && errno != EINPROGRESS) + /* Attempt connection (nonblocking) */ + if (ServerInstance->SE->Connect(this, &connaddr.sa, size) == -1 && errno != EINPROGRESS) { this->Close(); - delete[] addr; throw ModuleException("connect() failed"); } - delete[] addr; - - if (!ServerInstance->SE->AddFd(this)) + /* Add fd to socket engine */ + if (!ServerInstance->SE->AddFd(this, FD_WANT_NO_READ | FD_WANT_POLL_WRITE)) { this->Close(); throw ModuleException("out of fds"); } - - ServerInstance->SE->WantWrite(this); } virtual void OnConnected() { - 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; - } + ServerInstance->Logs->Log("m_ident",DEBUG,"OnConnected()"); + ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); char req[32]; - #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 - + /* Build request in the form 'localport,remoteport\r\n' */ + int req_size; + if (user->client_sa.sa.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) done = true; } @@ -164,7 +170,10 @@ class IdentRequestSocket : public EventHandler break; case EVENT_ERROR: /* fd error event, ohshi- */ - ServerInstance->Log(DEBUG,"EVENT_ERROR"); + ServerInstance->Logs->Log("m_ident",DEBUG,"EVENT_ERROR"); + /* We *must* Close() here immediately or we get a + * huge storm of EVENT_ERROR events! + */ Close(); done = true; break; @@ -173,11 +182,15 @@ class IdentRequestSocket : public EventHandler void Close() { + /* Remove ident socket from engine, and close it, but dont detatch it + * from its parent user class, or attempt to delete its memory. + */ if (GetFd() > -1) { + ServerInstance->Logs->Log("m_ident",DEBUG,"Close ident socket %d", GetFd()); + ServerInstance->SE->DelFd(this); ServerInstance->SE->Close(GetFd()); ServerInstance->SE->Shutdown(GetFd(), SHUT_WR); - ServerInstance->SE->DelFd(this); this->SetFd(-1); } } @@ -187,6 +200,9 @@ 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(); @@ -194,60 +210,63 @@ class IdentRequestSocket : public EventHandler void ReadResponse() { - ServerInstance->Log(DEBUG,"ReadResponse()"); - - // 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 - + /* 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); - /* Cant possibly be a valid response shorter than 3 chars */ + /* 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->Logs->Log("m_ident",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 + /* We only really care about the 4th portion */ if (i < 3) continue; - char ident[IDENTMAX + 2]; + std::string ident; - // 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++) + /* Truncate the ident at any characters we don't like, skip leading spaces */ + size_t k = 0; + for (const char *j = token.c_str(); *j && (k < ServerInstance->Config->Limits.IdentMax + 1); j++) { if (*j == ' ') continue; - // Rules taken from InspIRCd::IsIdent + /* Rules taken from InspIRCd::IsIdent */ if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.')) { - ident[k++] = *j; + ident += *j; continue; } break; } - ident[k] = '\0'; - - // Redundant check with IsIdent, in case that changes and this doesn't (paranoia!) - if (*ident && ServerInstance->IsIdent(ident)) + /* Re-check with IsIdent, in case that changes and this doesn't (paranoia!) */ + if (!ident.empty() && ServerInstance->IsIdent(ident.c_str())) { result = ident; - ServerInstance->next_call = ServerInstance->Time(); } break; } + /* Close (but dont delete from memory) our socket + * and flag as done + */ Close(); done = true; return; @@ -256,122 +275,127 @@ class IdentRequestSocket : public EventHandler class ModuleIdent : public Module { - private: int RequestTimeout; + ConfigReader *Conf; + SimpleExtItem ext; public: - ModuleIdent(InspIRCd *Me) - : Module(Me) + ModuleIdent() : ext("ident_socket", this) { - OnRehash(NULL, ""); + Conf = new ConfigReader; + OnRehash(NULL); + Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect }; + ServerInstance->Modules->Attach(eventlist, this, 5); } - - virtual Version GetVersion() + + ~ModuleIdent() { - return Version(1, 1, 1, 0, VF_VENDOR, API_VERSION); + delete Conf; } - - virtual void Implements(char *List) + + virtual Version GetVersion() { - List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnCleanup] = List[I_OnUserDisconnect] = 1; + return Version("Provides support for RFC1413 ident lookups", VF_VENDOR, API_VERSION); } - - virtual void OnRehash(User *user, const std::string ¶m) + + virtual void OnRehash(User *user) { - ConfigReader MyConf(ServerInstance); - - RequestTimeout = MyConf.ReadInteger("ident", "timeout", 0, true); + delete Conf; + Conf = new ConfigReader; + + RequestTimeout = Conf->ReadInteger("ident", "timeout", 0, true); if (!RequestTimeout) RequestTimeout = 5; } - - virtual int OnUserRegister(User *user) - { - /* 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) + virtual ModResult OnUserRegister(User *user) + { + for (int j = 0; j < Conf->Enumerate("connect"); j++) { - user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident); - return 0; + std::string hostn = Conf->ReadValue("connect","allow",j); + /* XXX: Fixme: does not respect port, limit, etc */ + if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map))) + { + bool useident = Conf->ReadFlag("connect", "useident", "yes", j); + + if (!useident) + return MOD_RES_PASSTHRU; + } } - #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 + /* 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. */ + if (user->ident.length() > ServerInstance->Config->Limits.IdentMax + 1) + user->ident.assign(user->ident, 0, ServerInstance->Config->Limits.IdentMax); + user->ident.insert(0, "~"); + + user->WriteServ("NOTICE Auth :*** Looking up your ident..."); - IdentRequestSocket *isock = NULL; try { - isock = new IdentRequestSocket(ServerInstance, user, ip); + IdentRequestSocket *isock = new IdentRequestSocket(user); + ext.set(user, isock); } catch (ModuleException &e) { - ServerInstance->Log(DEBUG,"Ident exception: %s", e.GetReason()); - return 0; + ServerInstance->Logs->Log("m_ident",DEBUG,"Ident exception: %s", e.GetReason()); } - user->Extend("ident_socket", isock); - return 0; + return MOD_RES_PASSTHRU; } - virtual bool OnCheckReady(User *user) + /* 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 ModResult OnCheckReady(User *user) { - 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 = ext.get(user); + if (!isock) { - ServerInstance->Log(DEBUG, "No ident socket :("); - return true; + ServerInstance->Logs->Log("m_ident",DEBUG, "No ident socket :("); + return MOD_RES_PASSTHRU; } - ServerInstance->Log(DEBUG, "Has ident_socket"); + ServerInstance->Logs->Log("m_ident",DEBUG, "Has ident_socket"); + + time_t compare = isock->age; + compare += RequestTimeout; - if (isock->age + RequestTimeout > ServerInstance->Time() && !isock->HasResult()) + /* Check for timeout of the socket */ + if (ServerInstance->Time() >= compare) { /* Ident timeout */ user->WriteServ("NOTICE Auth :*** Ident request timed out."); - ServerInstance->Log(DEBUG, "Timeout"); + ServerInstance->Logs->Log("m_ident",DEBUG, "Timeout"); + /* The user isnt actually disconnecting, + * we call this to clean up the user + */ OnUserDisconnect(user); - return true; + return MOD_RES_PASSTHRU; } /* Got a result yet? */ if (!isock->HasResult()) { - ServerInstance->Log(DEBUG, "No result yet"); - return false; + ServerInstance->Logs->Log("m_ident",DEBUG, "No result yet"); + return MOD_RES_DENY; } - ServerInstance->Log(DEBUG, "Yay, result!"); + ServerInstance->Logs->Log("m_ident",DEBUG, "Yay, result!"); - /* wooo, got a 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 user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", isock->GetResult()); - strlcpy(user->ident, isock->GetResult(), IDENTMAX+1); + /* Copy the ident string to the user */ + user->ChangeIdent(isock->GetResult()); + + /* The user isnt actually disconnecting, we call this to clean up the user */ OnUserDisconnect(user); - return true; + return MOD_RES_PASSTHRU; } virtual void OnCleanup(int target_type, void *item) @@ -384,16 +408,14 @@ class ModuleIdent : public Module virtual void OnUserDisconnect(User *user) { /* User disconnect (generic socket detatch event) */ - IdentRequestSocket *isock = NULL; - if (user->GetExt("ident_socket", isock)) + IdentRequestSocket *isock = ext.get(user); + if (isock) { isock->Close(); - delete isock; - user->Shrink("ident_socket"); - ServerInstance->Log(DEBUG, "Removed ident socket from %s", user->nick); + ext.unset(user); } } }; -MODULE_INIT(ModuleIdent); +MODULE_INIT(ModuleIdent)