X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=eb9f3f365c6bde4a3b6e018650d67c560d1ccd77;hb=02c6ce1ad09a7471a6b03dc00bac4b843d157489;hp=781661c4880d1db3d883d6a58a3ddafc415be7b8;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 781661c48..eb9f3f365 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -2,41 +2,29 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" - -extern InspIRCd* ServerInstance; - -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; /* $ModDesc: Provides support for RFC 1413 ident lookups */ // Version 1.5.0.0 - Updated to use InspSocket, faster and neater. +/** Handles RFC1413 ident connections to users + */ class RFC1413 : public InspSocket { protected: - Server* Srv; // 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 @@ -45,19 +33,19 @@ class RFC1413 : public InspSocket userrec* u; // user record that the lookup is associated with int ufd; - RFC1413(InspIRCd* SI, userrec* user, int maxtime, Server* S) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), Srv(S), u(user), ufd(user->fd) + RFC1413(InspIRCd* SI, userrec* user, int maxtime, const std::string &bindto) : InspSocket(SI, user->GetIPString(), 113, false, maxtime, bindto), u(user) { - log(DEBUG,"Ident: associated."); + ufd = user->GetFd(); } virtual void OnTimeout() { // When we timeout, the connection failed within the allowed timeframe, // so we just display a notice, and tidy off the ident_data. - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->SE->GetRef(ufd) == u)) { u->Shrink("ident_data"); - u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead."); + Instance->next_call = Instance->Time(); } } @@ -85,12 +73,12 @@ class RFC1413 : public InspSocket *j = '\0'; // truncate at invalid chars if (*section) { - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->SE->GetRef(ufd) == u)) { - if (ServerInstance->IsIdent(section)) + if (this->Instance->IsIdent(section)) { + u->Extend("IDENT", new std::string(std::string(section) + "," + std::string(u->ident))); strlcpy(u->ident,section,IDENTMAX); - log(DEBUG,"IDENT SET: "+std::string(u->ident)); u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident)); } } @@ -126,46 +114,66 @@ class RFC1413 : public InspSocket // descriptor that they were when the lookup began. // // Fixes issue reported by webs, 7 Jun 2006 - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->SE->GetRef(ufd) == u)) { + Instance->next_call = Instance->Time(); u->Shrink("ident_data"); } } virtual void OnError(InspSocketError e) { - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->SE->GetRef(ufd) == u)) { + if (*u->ident == '~') + u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead."); + + Instance->next_call = Instance->Time(); u->Shrink("ident_data"); } } virtual bool OnConnected() { - if (u && (fd_ref_table[ufd] == u)) + if (u && (Instance->SE->GetRef(ufd) == u)) { - 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))) + sockaddr* sock_us = new sockaddr[2]; + sockaddr* sock_them = new sockaddr[2]; + bool success = false; + uslen = sizeof(sockaddr_in); + themlen = sizeof(sockaddr_in); +#ifdef IPV6 + if (this->u->GetProtocolFamily() == AF_INET6) + { + themlen = sizeof(sockaddr_in6); + uslen = sizeof(sockaddr_in6); + } +#endif + success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen))); + if (success) { - log(DEBUG,"Ident: failed to get socket names, bailing"); + delete[] sock_us; + delete[] sock_them; 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)); + if (this->u->GetProtocolFamily() == AF_INET6) + snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in6*)sock_them)->sin6_port),ntohs(((sockaddr_in6*)sock_us)->sin6_port)); + else #endif + snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port)); this->Write(ident_request); - log(DEBUG,"Sent ident request, waiting for reply"); + delete[] sock_us; + delete[] sock_them; return true; } } else { + Instance->next_call = Instance->Time(); return true; } } @@ -175,23 +183,24 @@ class ModuleIdent : public Module { ConfigReader* Conf; - Server* Srv; int IdentTimeout; + std::string PortBind; public: void ReadSettings() { - Conf = new ConfigReader; - IdentTimeout = Conf->ReadInteger("ident","timeout",0,true); + Conf = new ConfigReader(ServerInstance); + IdentTimeout = Conf->ReadInteger("ident", "timeout", 0, true); + PortBind = Conf->ReadValue("ident", "bind", 0); if (!IdentTimeout) IdentTimeout = 1; DELETE(Conf); } ModuleIdent(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { - + ReadSettings(); } @@ -200,12 +209,23 @@ class ModuleIdent : public Module List[I_OnCleanup] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1; } - virtual void OnRehash(const std::string ¶meter) + void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) + { + if ((displayable) && (extname == "IDENT")) + { + std::string* ident; + if (GetExt("IDENT", ident)) + proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *ident); + } + } + + + virtual void OnRehash(userrec* user, const std::string ¶meter) { ReadSettings(); } - virtual void OnUserRegister(userrec* user) + virtual int OnUserRegister(userrec* user) { /* * when the new user connects, before they authenticate with USER/NICK/PASS, we do @@ -213,18 +233,24 @@ class ModuleIdent : public Module * is derived from InspSocket, and inserting it into the socket engine using the * Server::AddSocket() call. */ + char newident[MAXBUF]; + strcpy(newident,"~"); + strlcat(newident,user->ident,IDENTMAX); + strlcpy(user->ident,newident,IDENTMAX); + + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident..."); - RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout, Srv); - if (ident->GetState() != I_ERROR) + RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout, PortBind); + if ((ident->GetState() == I_CONNECTING) || (ident->GetState() == I_CONNECTED)) { user->Extend("ident_data", (char*)ident); - Srv->AddSocket(ident); } else { user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using "+std::string(user->ident)+" instead."); - DELETE(ident); + ServerInstance->next_call = ServerInstance->Time(); } + return 0; } virtual bool OnCheckReady(userrec* user) @@ -244,6 +270,7 @@ class ModuleIdent : public Module { userrec* user = (userrec*)item; RFC1413* ident; + std::string* identstr; if (user->GetExt("ident_data", ident)) { // FIX: If the user record is deleted, the socket wont be removed @@ -251,7 +278,12 @@ class ModuleIdent : public Module // 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; - Srv->RemoveSocket(ident); + ServerInstance->SE->DelFd(ident); + //delete ident; + } + if (user->GetExt("IDENT", identstr)) + { + delete identstr; } } } @@ -267,22 +299,28 @@ class ModuleIdent : public Module * and this would leave at least one of the invalid ;) */ RFC1413* ident; + std::string* identstr; if (user->GetExt("ident_data", ident)) { ident->u = NULL; - Srv->RemoveSocket(ident); + ServerInstance->SE->DelFd(ident); + } + if (user->GetExt("IDENT", identstr)) + { + delete identstr; } } - + virtual ~ModuleIdent() { + ServerInstance->next_call = ServerInstance->Time(); } - + virtual Version GetVersion() { - return Version(1,5,0,0,VF_VENDOR); + return Version(1,1,0,0,VF_VENDOR,API_VERSION); } - + }; class ModuleIdentFactory : public ModuleFactory @@ -291,20 +329,20 @@ class ModuleIdentFactory : public ModuleFactory ModuleIdentFactory() { } - + ~ModuleIdentFactory() { } - + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleIdent(Me); } - + }; -extern "C" void * init_module( void ) +extern "C" DllExport void * init_module( void ) { return new ModuleIdentFactory; }