* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 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.
*
* ---------------------------------------------------
*/
-#include <stdio.h>
-#include <string>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <poll.h>
+#include "inspircd.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "inspircd.h"
-
-/* $ModDesc: Provides support for RFC 1413 ident lookups */
-Server *Srv;
+/* $ModDesc: Provides support for RFC1413 ident lookups */
-// State engine constants. We have three states,
-// connecting, waiting for data, and finished.
-
-#define IDENT_STATE_CONNECT 1
-#define IDENT_STATE_WAITDATA 2
-#define IDENT_STATE_DONE 3
+class IdentRequestSocket : public EventHandler
+{
+ private:
-// Ident lookups are done by attaching an RFC1413 class to the
-// userrec record using the Extensible system.
-// The RFC1413 class is written especially for this module but
-// it should be relatively standalone for anyone else who wishes
-// to have a nonblocking ident lookup in a program :)
-// the class operates on a simple state engine, each state of the
-// connection incrementing a state counter, leading through to
-// a concluding state which terminates the lookup.
+ User *user;
+ InspIRCd* ServerInstance;
+ bool done;
+ std::string result;
-class RFC1413
-{
- protected:
- int fd; // file descriptor
- userrec* u; // user record that the lookup is associated with
- sockaddr_in addr; // address we're connecting to
- in_addr addy; // binary ip address
- int state; // state (this class operates on a state engine)
- char ibuf[MAXBUF]; // input buffer
- 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
- int nrecv; // how many bytes we've received
- time_t timeout_end; // how long until the operation times out
- bool timeout; // true if we've timed out and should bail
- char ident_request[128]; // buffer used to make up the request string
public:
- // The destructor makes damn sure the socket is freed :)
-
- ~RFC1413()
+ IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident)
{
- if (this->fd != -1)
- {
- shutdown(this->fd,2);
- close(this->fd);
- this->fd = -1;
- }
- }
+ /* connect here on instantiation, throw on immediate failure */
- // establish an ident connection, maxtime is the time to spend trying
- // returns true if successful, false if something was catastrophically wrong.
- // note that failed connects are not reported here but detected in RFC1413::Poll()
- // as the socket is nonblocking
+ socklen_t size = 0;
- bool Connect(userrec* user, int maxtime)
- {
- timeout_end = time(NULL)+maxtime;
- timeout = false;
- if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
- {
- // theres been a boo-boo... no more fd's left for us, woe is me!
- 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);
+#ifdef IPV6
+ bool v6 = false;
+ if ((bindip.empty()) || bindip.find(':') != std::string::npos)
+ v6 = true;
- int flags;
- flags = fcntl(this->fd, F_GETFL, 0);
- fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
+ 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");
- if(connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
+ sockaddr* s = new sockaddr[2];
+ sockaddr* addr = new sockaddr[2];
+
+#ifdef IPV6
+ if (v6)
{
- // theres been an error, but EINPROGRESS just means 'right, im on it, call me later'
- if (errno != EINPROGRESS)
+ in6_addr addy;
+ in6_addr n;
+ if (inet_pton(AF_INET6, user->GetIPString(), &addy) > 0)
{
- // ... so that error isnt fatal, like the rest.
- Srv->Log(DEBUG,"Ident: connect failed for: "+std::string(user->ip));
- shutdown(this->fd,2);
- close(this->fd);
- this->fd = -1;
- return false;
+ ((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;
}
- }
- Srv->Log(DEBUG,"Ident: successful connect associated with user "+std::string(user->nick));
- this->u = user;
- this->state = IDENT_STATE_CONNECT;
- return true;
- }
-
- // Poll the socket to see if we have an ident result, and if we do apply it to the user.
- // returns false if we cannot poll for some reason (e.g. timeout).
-
- bool Poll()
- {
- if (time(NULL) > timeout_end)
+ }
+ else
+#endif
{
- timeout = true;
- Srv->SendServ(u->fd,"NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead.");
- shutdown(this->fd,2);
- close(this->fd);
- this->fd = -1;
- return false;
+ 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;
+ }
}
- pollfd polls;
- polls.fd = this->fd;
- if (state == IDENT_STATE_CONNECT)
+
+ if (ServerInstance->SE->Bind(GetFd(), s, size) < 0)
{
- // during state IDENT_STATE_CONNECT (leading up to the connect)
- // we're watching for writeability
- polls.events = POLLOUT;
+ this->Close();
+ delete[] s;
+ throw ModuleException("failed to bind()");
}
- else
+
+ delete[] s;
+ ServerInstance->SE->NonBlocking(GetFd());
+
+ if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1 && errno != EINPROGRESS)
{
- // the rest of the time we're waiting for data
- // back on the socket, or a socket close
- polls.events = POLLIN;
+ this->Close();
+ delete[] addr;
+ throw ModuleException("connect() failed");
}
- int ret = poll(&polls,1,1);
- if (ret > 0)
+ delete[] addr;
+
+ if (!ServerInstance->SE->AddFd(this))
{
- switch (this->state)
- {
- case IDENT_STATE_CONNECT:
- 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");
- shutdown(this->fd,2);
- close(this->fd);
- this->fd = -1;
- state = IDENT_STATE_DONE;
- }
- else
- {
- // 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));
- send(this->fd,ident_request,strlen(ident_request),0);
- Srv->Log(DEBUG,"Sent ident request, moving to state 2");
- state = IDENT_STATE_WAITDATA;
- }
- break;
- case IDENT_STATE_WAITDATA:
- 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));
- shutdown(this->fd,2);
- close(this->fd);
- this->fd = -1;
- char* savept;
- char* section = strtok_r(ibuf,":",&savept);
- while (section)
- {
- 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 == ' ') && (strlen(section)>0)) section++; // strip leading spaces
- int t = strlen(section);
- for (int j = 0; j < t; j++)
- if ((section[j] < 33) || (section[j]>126))
- section[j] = '\0'; // truncate at invalid chars
- 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;
- }
- }
- }
- section = strtok_r(NULL,":",&savept);
- }
- state = IDENT_STATE_DONE;
- }
- break;
- case IDENT_STATE_DONE:
- shutdown(this->fd,2);
- close(this->fd);
- this->fd = -1;
- Srv->Log(DEBUG,"Ident lookup is complete!");
- break;
- default:
- Srv->Log(DEBUG,"Ident: invalid ident state!!!");
- break;
- }
+ this->Close();
+ throw ModuleException("out of fds");
}
- }
- // returns true if the operation is completed,
- // either due to complete request, or a timeout
+ ServerInstance->SE->WantWrite(this);
+ }
- bool Done()
+ virtual void OnConnected()
{
- return ((state == IDENT_STATE_DONE) || (timeout == true));
- }
-};
+ /* 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). */
-class ModuleIdent : public Module
-{
+ #ifndef IPV6
+ sockaddr_in laddr, raddr;
+ #else
+ sockaddr_in6 laddr, raddr;
+ #endif
- ConfigReader* Conf;
- int IdentTimeout;
+ socklen_t laddrsz = sizeof(laddr);
+ socklen_t raddrsz = sizeof(raddr);
- public:
- void ReadSettings()
+ 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)
+ {
+ 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;
+ }
+ }
+
+ void Close()
{
- Conf = new ConfigReader;
- IdentTimeout = Conf->ReadInteger("ident","timeout",0,true);
- delete Conf;
+ ServerInstance->SE->Close(GetFd());
+ ServerInstance->SE->Shutdown(GetFd(), SHUT_WR);
}
- ModuleIdent()
+ bool HasResult()
{
- Srv = new Server;
- ReadSettings();
+ return done;
}
- virtual void OnRehash()
+ 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 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
- RFC1413* ident = new RFC1413;
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :*** Looking up your ident...");
- if (ident->Connect(user,IdentTimeout))
- {
- // attach the object to the user record
- user->Extend("ident_data",(char*)ident);
- // start it off polling (always good to have a head start)
- // because usually connect has completed by now
- ident->Poll();
- }
- else
+ 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)
{
- // something went wrong, call an irc-ambulance!
- Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :*** Could not look up your ident.");
- delete ident;
+ done = true;
+ return;
}
- }
- virtual bool OnCheckReady(userrec* user)
- {
- RFC1413* ident = (RFC1413*)user->GetExt("ident_data");
- if (ident)
+ irc::sepstream sep(ibuf, ':');
+ std::string token;
+ for (int i = 0; sep.GetToken(token); i++)
{
- // this user has a pending ident lookup, poll it
- ident->Poll();
- // is it done?
- if (ident->Done())
+ // We only really care about the 4th portion
+ if (i < 3)
+ continue;
+
+ char ident[IDENTMAX + 2];
+
+ // 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++)
{
- // their ident is done, zap the structures
- Srv->Log(DEBUG,"Ident: removing ident gubbins");
- user->Shrink("ident_data");
- delete ident;
- // ...and send them on their way
- return true;
+ if (*j == ' ')
+ continue;
+
+ // Rules taken from InspIRCd::IsIdent
+ if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.'))
+ {
+ ident[k++] = *j;
+ continue;
+ }
+
+ break;
}
- // nope, we hold them in this state, they dont go anywhere
- return false;
+
+ 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;
}
- return true;
+
+ done = true;
+ return;
}
+};
- virtual void OnUserDisconnect(userrec* user)
- {
- // when the user quits tidy up any ident lookup they have pending to keep things tidy
- // and to prevent a memory and FD leaks
- RFC1413* ident = (RFC1413*)user->GetExt("ident_data");
- if (ident)
- {
- delete ident;
- user->Shrink("ident_data");
- }
- }
-
- virtual ~ModuleIdent()
+class ModuleIdent : public Module
+{
+ private:
+ int RequestTimeout;
+ public:
+ ModuleIdent(InspIRCd *Me)
+ : Module(Me)
{
- delete Srv;
+ OnRehash(NULL, "");
}
virtual Version GetVersion()
{
- return Version(1,0,0,1,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()
+ 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)
+ {
+ 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)
{
- return new ModuleIdent;
+ /* Does user have an ident socket attached at all? */
+ IdentRequestSocket *isock = NULL;
+ if (!user->GetExt("ident_socket", isock))
+ return true;
+
+ 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");
+ }
+ }
+};
-extern "C" void * init_module( void )
-{
- return new ModuleIdentFactory;
-}
+MODULE_INIT(ModuleIdent);