* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * 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.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-using namespace std;
-
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "inspircd.h"
-/* $ModDesc: Provides support for RFC 1413 ident lookups */
+/* $ModDesc: Provides support for RFC1413 ident lookups */
-// Version 1.5.0.0 - Updated to use InspSocket, faster and neater.
-
-class RFC1413 : public InspSocket
+class IdentRequestSocket : public EventHandler
{
- protected:
- Server* Srv; // Server* class used for core communications
- userrec* u; // user record that the lookup is associated with
- sockaddr_in sock_us; // our port number
- sockaddr_in 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
+ private:
+
+ User *user;
+ InspIRCd* ServerInstance;
+ bool done;
+ std::string result;
+
public:
- RFC1413(userrec* user, int maxtime, Server* S) : InspSocket((char*)inet_ntoa(user->ip4), 113, false, maxtime), Srv(S), u(user)
+ IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident)
{
- Srv->Log(DEBUG,"Ident: associated.");
- }
+ /* connect here on instantiation, throw on immediate failure */
- 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.
- u->Shrink("ident_data");
- Srv->SendServ(u->fd,"NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead.");
- }
+ socklen_t size = 0;
- virtual bool OnDataReady()
- {
- char* ibuf = this->Read();
- if (ibuf)
+#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));
+
+ if (GetFd() == -1)
+ throw ModuleException("Could not create socket");
+
+ sockaddr* s = new sockaddr[2];
+ sockaddr* addr = new sockaddr[2];
+
+#ifdef IPV6
+ if (v6)
{
- char* savept;
- char* section = strtok_r(ibuf,":",&savept);
- while (section)
+ in6_addr addy;
+ in6_addr n;
+ if (inet_pton(AF_INET6, user->GetIPString(), &addy) > 0)
{
- if (strstr(section,"USERID"))
- {
- section = strtok_r(NULL,":",&savept);
- if (section)
- {
- // ID type, usually UNIX or OTHER... we dont want it, so read the next token
- section = strtok_r(NULL,":",&savept);
- if (section)
- {
- 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)
- {
- 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));
- }
- return false;
- }
- }
- }
- section = strtok_r(NULL,":",&savept);
+ ((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;
+ }
+ }
+ 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);
+ 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;
}
}
- return false;
- }
- virtual void OnClose()
- {
- // tidy up after ourselves when the connection is done.
- // We receive this event straight after a timeout, too.
- u->Shrink("ident_data");
- }
+ if (ServerInstance->SE->Bind(GetFd(), s, size) < 0)
+ {
+ this->Close();
+ delete[] s;
+ throw ModuleException("failed to bind()");
+ }
- virtual void OnError(InspSocketError e)
- {
- u->Shrink("ident_data");
- }
+ delete[] s;
+ ServerInstance->SE->NonBlocking(GetFd());
- virtual bool OnConnected()
- {
- 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)))
+ if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1 && errno != EINPROGRESS)
{
- Srv->Log(DEBUG,"Ident: failed to get socket names, bailing");
- return false;
+ this->Close();
+ delete[] addr;
+ throw ModuleException("connect() failed");
}
- else
+
+ delete[] addr;
+
+ if (!ServerInstance->SE->AddFd(this))
{
- // send the request in the following format: theirsocket,oursocket
- snprintf(ident_request,127,"%d,%d\r\n",ntohs(sock_them.sin_port),ntohs(sock_us.sin_port));
- this->Write(ident_request);
- Srv->Log(DEBUG,"Sent ident request, waiting for reply");
- return true;
+ this->Close();
+ throw ModuleException("out of fds");
}
+
+ ServerInstance->SE->WantWrite(this);
}
-};
-class ModuleIdent : public Module
-{
+ virtual void 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). */
- ConfigReader* Conf;
- Server* Srv;
- int IdentTimeout;
+ #ifndef IPV6
+ sockaddr_in laddr, raddr;
+ #else
+ sockaddr_in6 laddr, raddr;
+ #endif
- public:
- void ReadSettings()
+ 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))
+ return;
+
+ 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
+
+ if (ServerInstance->SE->Send(this, req, req_size, 0) < req_size)
+ done = true;
+ }
+
+ virtual void HandleEvent(EventType et, int errornum = 0)
{
- Conf = new ConfigReader;
- IdentTimeout = Conf->ReadInteger("ident","timeout",0,true);
- if (!IdentTimeout)
- IdentTimeout = 1;
- delete Conf;
+ 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- */
+ done = true;
+ break;
+ }
}
- ModuleIdent(Server* Me)
- : Module::Module(Me)
+ void Close()
{
- Srv = Me;
- ReadSettings();
+ ServerInstance->SE->Close(GetFd());
+ ServerInstance->SE->Shutdown(GetFd(), SHUT_WR);
}
- void Implements(char* List)
+ bool HasResult()
{
- List[I_OnCleanup] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
+ return done;
}
- virtual void OnRehash(std::string parameter)
+ const char* GetResult()
{
- ReadSettings();
+ return result.c_str();
}
- virtual void OnUserRegister(userrec* user)
+ void ReadResponse()
{
- // 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.
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :*** Looking up your ident...");
- RFC1413* ident = new RFC1413(user, IdentTimeout, Srv);
- if (ident->GetState() != I_ERROR)
+ // 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 */
+ if (recvresult < 3)
{
- user->Extend("ident_data", (char*)ident);
- Srv->AddSocket(ident);
+ done = true;
+ return;
}
- else
+
+ irc::sepstream sep(ibuf, ':');
+ std::string token;
+ for (int i = 0; sep.GetToken(token); i++)
{
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using "+std::string(user->ident)+" instead.");
- delete ident;
- }
- }
+ // We only really care about the 4th portion
+ if (i < 3)
+ continue;
- virtual bool OnCheckReady(userrec* user)
- {
- // 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 = (RFC1413*)user->GetExt("ident_data");
- return (!ident);
- }
+ char ident[IDENTMAX + 2];
- virtual void OnCleanup(int target_type, void* item)
- {
- if (target_type == TYPE_USER)
- {
- userrec* user = (userrec*)item;
- RFC1413* ident = (RFC1413*)user->GetExt("ident_data");
- if (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++)
{
- Srv->RemoveSocket(ident);
+ if (*j == ' ')
+ continue;
+
+ // Rules taken from InspIRCd::IsIdent
+ if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.'))
+ {
+ ident[k++] = *j;
+ continue;
+ }
+
+ break;
}
+
+ ident[k] = '\0';
+
+ // Redundant check with IsIdent, in case that changes and this doesn't (paranoia!)
+ if (*ident && ServerInstance->IsIdent(ident))
+ {
+ result = ident;
+ ServerInstance->next_call = ServerInstance->Time();
+ }
+
+ break;
}
+
+ done = true;
+ return;
}
+};
- 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 = (RFC1413*)user->GetExt("ident_data");
- if (ident)
- {
- Srv->RemoveSocket(ident);
- }
- }
-
- virtual ~ModuleIdent()
+class ModuleIdent : public Module
+{
+ private:
+ int RequestTimeout;
+ public:
+ ModuleIdent(InspIRCd *Me)
+ : Module(Me)
{
+ OnRehash(NULL, "");
}
virtual Version GetVersion()
{
- return Version(1,5,0,0,VF_VENDOR);
+ return Version(1, 1, 1, 0, VF_VENDOR, API_VERSION);
}
-};
-
-class ModuleIdentFactory : public ModuleFactory
-{
- public:
- ModuleIdentFactory()
+ virtual void Implements(char *List)
{
+ List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnCleanup] = List[I_OnUserDisconnect] = 1;
}
- ~ModuleIdentFactory()
+ virtual void OnRehash(User *user, const std::string ¶m)
{
+ ConfigReader MyConf(ServerInstance);
+
+ RequestTimeout = MyConf.ReadInteger("ident", "timeout", 0, true);
+ if (!RequestTimeout)
+ RequestTimeout = 5;
}
- virtual Module * CreateModule(Server* Me)
+ virtual int OnUserRegister(User *user)
{
- return new ModuleIdent(Me);
+ /* 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)
+ {
+ user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident);
+ return 0;
+ }
+
+ #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
+
+ IdentRequestSocket *isock = NULL;
+ try
+ {
+ isock = new IdentRequestSocket(ServerInstance, user, ip);
+ }
+ catch (ModuleException &e)
+ {
+ return 0;
+ }
+
+ user->Extend("ident_socket", isock);
+ return 0;
}
-
-};
+ virtual bool OnCheckReady(User *user)
+ {
+ /* Does user have an ident socket attached at all? */
+ IdentRequestSocket *isock = NULL;
+ if (!user->GetExt("ident_socket", isock))
+ return true;
-extern "C" void * init_module( void )
-{
- return new ModuleIdentFactory;
-}
+ if (isock->age < ServerInstance->Time() - RequestTimeout)
+ {
+ /* Ident timeout */
+ user->WriteServ("NOTICE Auth :*** Ident request timed out.");
+ OnUserDisconnect(user);
+ return true;
+ }
+
+ /* Got a result yet? */
+ if (!isock->HasResult())
+ return false;
+
+ /* wooo, got a result! */
+ user->WriteServ("NOTICE Auth :*** Found your ident, '%s'", isock->GetResult());
+ strlcpy(user->ident, isock->GetResult(), IDENTMAX+1);
+ return true;
+ }
+
+ virtual void OnCleanup(int target_type, void *item)
+ {
+ /* Module unloading, tidy up users */
+ if (target_type == TYPE_USER)
+ OnUserDisconnect((User*)item);
+ }
+
+ virtual void OnUserDisconnect(User *user)
+ {
+ /* User disconnect (generic socket detatch event) */
+ IdentRequestSocket *isock = NULL;
+ if (user->Extend("ident_socket", isock))
+ {
+ isock->Close();
+ delete isock;
+ user->Shrink("ident_socket");
+ }
+ }
+};
+
+MODULE_INIT(ModuleIdent);
projects / user / henk / code / inspircd.git / blobdiff