X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=dc59adcead13a766a2cb569211724650806b69ca;hb=2e52ff280dca14d1598b84fab7a8c2e93fa30910;hp=cc25a484c5ce80a6219913225e99b8b1fad4f26d;hpb=63f564447cf22a7caf18ae8a1297a5ab0ad873a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index cc25a484c..dc59adcea 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -14,18 +14,10 @@ * --------------------------------------------------- */ +using namespace std; + #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "users.h" #include "channels.h" #include "modules.h" @@ -33,158 +25,152 @@ /* $ModDesc: Provides support for RFC 1413 ident lookups */ -Server *Srv; +// Version 1.5.0.0 - Updated to use InspSocket, faster and neater. -class RFC1413 +/** Handles RFC1413 ident connections to users + */ +class RFC1413 : public InspSocket { protected: - int fd; - userrec* u; - sockaddr_in addr; - in_addr addy; - int state; - char ibuf[MAXBUF]; - sockaddr_in sock_us; - sockaddr_in sock_them; - socklen_t uslen; - socklen_t themlen; - int nrecv; - time_t timeout_end; - bool timeout; + // Server* class used for core communications + insp_sockaddr sock_us; // our port number + insp_sockaddr sock_them; // their port number + socklen_t uslen; // length of our port number + socklen_t themlen; // length of their port number + char ident_request[128]; // buffer used to make up the request string public: - bool Connect(userrec* user, int maxtime) - { - timeout_end = time(NULL)+maxtime; - timeout = false; - if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) - { - Srv->Log(DEBUG,"Ident: socket failed for: "+std::string(user->ip)); - return false; - } - inet_aton(user->ip,&addy); - addr.sin_family = AF_INET; - addr.sin_addr = addy; - addr.sin_port = htons(113); - int flags; - flags = fcntl(this->fd, F_GETFL, 0); - fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); + userrec* u; // user record that the lookup is associated with + int ufd; - if(connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1) - { - if (errno != EINPROGRESS) - { - Srv->Log(DEBUG,"Ident: connect failed for: "+std::string(user->ip)); - return false; - } - } - Srv->Log(DEBUG,"Ident: successful connect associated with user "+std::string(user->nick)); - this->u = user; - this->state = 1; - return true; + RFC1413(InspIRCd* SI, userrec* user, int maxtime) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), u(user) + { + ufd = user->GetFd(); } - bool Poll() + virtual void OnTimeout() { - if (time(NULL) > timeout_end) - { - timeout = true; - Srv->SendServ(u->fd,"NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead."); - return false; - } - pollfd polls; - polls.fd = this->fd; - if (state == 1) - { - polls.events = POLLOUT; - } - else + // When we timeout, the connection failed within the allowed timeframe, + // so we just display a notice, and tidy off the ident_data. + if (u && (Instance->SE->GetRef(ufd) == u)) { - polls.events = POLLIN; + char newident[MAXBUF]; + u->Shrink("ident_data"); + u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using ~"+std::string(u->ident)+" instead."); + strcpy(newident,"~"); + strlcat(newident,u->ident,IDENTMAX); + strlcpy(u->ident,newident,IDENTMAX); } - int ret = poll(&polls,1,1); + } - if (ret > 0) + virtual bool OnDataReady() + { + char* ibuf = this->Read(); + if (ibuf) { - switch (this->state) + char* savept; + char* section = strtok_r(ibuf,":",&savept); + while (section) { - case 1: - Srv->Log(DEBUG,"*** IDENT IN STATE 1"); - uslen = sizeof(sock_us); - themlen = sizeof(sock_them); - if ((getsockname(this->u->fd,(sockaddr*)&sock_us,&uslen) || getpeername(this->u->fd, (sockaddr*)&sock_them, &themlen))) - { - Srv->Log(DEBUG,"Ident: failed to get socket names, bailing to state 3"); - state = 3; - } - else + if (strstr(section,"USERID")) + { + section = strtok_r(NULL,":",&savept); + if (section) { - // send the request in the following format: theirsocket,oursocket - Write(this->fd,"%d,%d",ntohs(sock_them.sin_port),ntohs(sock_us.sin_port)); - Srv->Log(DEBUG,"Sent ident request, moving to state 2"); - state = 2; - } - break; - case 2: - Srv->Log(DEBUG,"*** IDENT IN STATE 2"); - nrecv = recv(this->fd,ibuf,sizeof(ibuf),0); - if (nrecv > 0) - { - // we have the response line in the following format: - // 6193, 23 : USERID : UNIX : stjohns - // 6195, 23 : ERROR : NO-USER - ibuf[nrecv] = '\0'; - Srv->Log(DEBUG,"Received ident response: "+std::string(ibuf)); - close(this->fd); - shutdown(this->fd,2); - char* savept; - char* section = strtok_r(ibuf,":",&savept); - while (section) + // ID type, usually UNIX or OTHER... we dont want it, so read the next token + section = strtok_r(NULL,":",&savept); + if (section) { - if (strstr(section,"USERID")) + while (*section == ' ') section++; // strip leading spaces + for (char* j = section; *j; j++) + if ((*j < 33) || (*j > 126)) + *j = '\0'; // truncate at invalid chars + if (*section) { - section = strtok_r(NULL,":",&savept); - if (section) + if (u && (Instance->SE->GetRef(ufd) == u)) { - // ID type, usually UNIX or OTHER... we dont want it, so read the next token - section = strtok_r(NULL,":",&savept); - if (section) + if (this->Instance->IsIdent(section)) { - while ((*section == ' ') && (strlen(section)>0)) section++; // strip leading spaces - if ((section[strlen(section)-1] == 13) || (section[strlen(section)-1] == 10)) - section[strlen(section)-1] = '\0'; // strip carriage returns - if ((section[strlen(section)-1] == 13) || (section[strlen(section)-1] == 10)) - section[strlen(section)-1] = '\0'; // strip linefeeds - while ((section[strlen(section)-1] == ' ') && (strlen(section)>0)) // strip trailing spaces - section[strlen(section)-1] = '\0'; - if (strlen(section)) - { - strlcpy(u->ident,section,IDENTMAX); - Srv->Log(DEBUG,"IDENT SET: "+std::string(u->ident)); - Srv->SendServ(u->fd,"NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident)); - } - break; + strlcpy(u->ident,section,IDENTMAX); + Instance->Log(DEBUG,"IDENT SET: "+std::string(u->ident)); + u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident)); } } } - section = strtok_r(NULL,":",&savept); + return false; } - state = 3; } - break; - case 3: - Srv->Log(DEBUG,"Ident lookup is complete!"); - break; - default: - Srv->Log(DEBUG,"Ident: invalid ident state!!!"); - break; + } + section = strtok_r(NULL,":",&savept); } } + return false; + } + + virtual void OnClose() + { + // tidy up after ourselves when the connection is done. + // We receive this event straight after a timeout, too. + // + // + // OK, now listen up. The weird looking check here is + // REQUIRED. Don't try and optimize it away. + // + // When a socket is closed, it is not immediately removed + // from the socket list, there can be a short delay + // before it is culled from the list. This means that + // without this check, there is a chance that a user + // may not exist when we come to ::Shrink them, which + // results in a segfault. The value of "u" may not + // always be NULL at this point, so, what we do is + // check against the fd_ref_table, to see if (1) the user + // exists, and (2) its the SAME user, on the same file + // descriptor that they were when the lookup began. + // + // Fixes issue reported by webs, 7 Jun 2006 + if (u && (Instance->SE->GetRef(ufd) == u)) + { + u->Shrink("ident_data"); + } } - bool Done() + virtual void OnError(InspSocketError e) { - return ((state == 3) || (timeout == true)); + if (u && (Instance->SE->GetRef(ufd) == u)) + { + u->Shrink("ident_data"); + } + } + + virtual bool OnConnected() + { + Instance->Log(DEBUG,"Ident: connected"); + if (u && (Instance->SE->GetRef(ufd) == u)) + { + uslen = sizeof(sock_us); + themlen = sizeof(sock_them); + if ((getsockname(this->u->GetFd(),(sockaddr*)&sock_us,&uslen) || getpeername(this->u->GetFd(), (sockaddr*)&sock_them, &themlen))) + { + Instance->Log(DEBUG,"Ident: failed to get socket names, bailing"); + return false; + } + else + { + // send the request in the following format: theirsocket,oursocket +#ifdef IPV6 + snprintf(ident_request,127,"%d,%d\r\n",ntohs(sock_them.sin6_port),ntohs(sock_us.sin6_port)); +#else + snprintf(ident_request,127,"%d,%d\r\n",ntohs(sock_them.sin_port),ntohs(sock_us.sin_port)); +#endif + this->Write(ident_request); + Instance->Log(DEBUG,"Sent ident request, waiting for reply"); + return true; + } + } + else + { + return true; + } } }; @@ -192,75 +178,122 @@ class ModuleIdent : public Module { ConfigReader* Conf; + int IdentTimeout; public: void ReadSettings() { - Conf = new ConfigReader; + Conf = new ConfigReader(ServerInstance); IdentTimeout = Conf->ReadInteger("ident","timeout",0,true); - delete Conf; + if (!IdentTimeout) + IdentTimeout = 1; + DELETE(Conf); } - ModuleIdent() + ModuleIdent(InspIRCd* Me) + : Module::Module(Me) { - Srv = new Server; + ReadSettings(); } - virtual void OnRehash() + void Implements(char* List) + { + List[I_OnCleanup] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1; + } + + virtual void OnRehash(const std::string ¶meter) { ReadSettings(); } - virtual void OnUserRegister(userrec* user) + virtual int OnUserRegister(userrec* user) { - RFC1413* ident = new RFC1413; - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :*** Looking up your ident..."); - if (ident->Connect(user,IdentTimeout)) + /* + * when the new user connects, before they authenticate with USER/NICK/PASS, we do + * their ident lookup. We do this by instantiating an object of type RFC1413, which + * is derived from InspSocket, and inserting it into the socket engine using the + * Server::AddSocket() call. + */ + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident..."); + RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout); + if ((ident->GetState() == I_CONNECTING) || (ident->GetState() == I_CONNECTED)) { - user->Extend("ident_data",(char*)ident); - ident->Poll(); + user->Extend("ident_data", (char*)ident); } else { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :*** Could not look up your ident."); + char newident[MAXBUF]; + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using ~"+std::string(user->ident)+" instead."); + strcpy(newident,"~"); + strlcat(newident,user->ident,IDENTMAX); + strlcpy(user->ident,newident,IDENTMAX); delete ident; } + return 0; } virtual bool OnCheckReady(userrec* user) { - RFC1413* ident = (RFC1413*)user->GetExt("ident_data"); - if (ident) + /* + * The socket engine will clean up their ident request for us when it completes, + * either due to timeout or due to closing, so, we just hold them until they dont + * have an ident field any more. + */ + RFC1413* ident; + return (!user->GetExt("ident_data", ident)); + } + + virtual void OnCleanup(int target_type, void* item) + { + if (target_type == TYPE_USER) { - ident->Poll(); - if (ident->Done()) + userrec* user = (userrec*)item; + RFC1413* ident; + if (user->GetExt("ident_data", ident)) { - Srv->Log(DEBUG,"Ident: removing ident gubbins"); - user->Shrink("ident_data"); + // FIX: If the user record is deleted, the socket wont be removed + // immediately so there is chance of the socket trying to write to + // a user which has now vanished! To prevent this, set ident::u + // to NULL and check it so that we dont write users who have gone away. + ident->u = NULL; + ServerInstance->SE->DelFd(ident); delete ident; - return true; } - return false; } - return true; + } + + virtual void OnUserDisconnect(userrec* user) + { + /* + * when the user quits tidy up any ident lookup they have pending to keep things tidy. + * When we call RemoveSocket, the abstractions tied into the system evnetually work their + * way to RFC1459::OnClose(), which shrinks off the ident_data for us, so we dont need + * to do it here. If we don't tidy this up, there may still be lingering idents for users + * who have quit, as class RFC1459 is only loosely bound to userrec* via a pair of pointers + * and this would leave at least one of the invalid ;) + */ + RFC1413* ident; + if (user->GetExt("ident_data", ident)) + { + ident->u = NULL; + ServerInstance->SE->DelFd(ident); + delete ident; + } } virtual ~ModuleIdent() { - delete Srv; } virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); + return Version(1,1,0,0,VF_VENDOR,API_VERSION); } }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - class ModuleIdentFactory : public ModuleFactory { public: @@ -272,9 +305,9 @@ class ModuleIdentFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(InspIRCd* Me) { - return new ModuleIdent; + return new ModuleIdent(Me); } };