-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007, 2009 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#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;
-
public:
+ LocalUser *user; /* User we are attached to */
+ std::string result; /* Holds the ident string if done */
+ time_t age;
+ bool done; /* True if lookup is finished */
- IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident)
+ IdentRequestSocket(LocalUser* u) : user(u)
{
- /* connect here on instantiation, throw on immediate failure */
-
- socklen_t size = 0;
+ age = ServerInstance->Time();
-#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) < 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, 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))
- 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;
}
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;
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->SE->Close(GetFd());
- ServerInstance->SE->Shutdown(GetFd(), SHUT_WR);
+ ServerInstance->Logs->Log("m_ident",DEBUG,"Close ident socket %d", GetFd());
ServerInstance->SE->DelFd(this);
+ ServerInstance->SE->Close(GetFd());
+ this->SetFd(-1);
}
}
return done;
}
- const char* GetResult()
- {
- return result.c_str();
- }
-
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 */
+ /* Close (but don't delete from memory) our socket
+ * and flag as done since the ident lookup has finished
+ */
+ Close();
+ done = true;
+
+ /* Cant possibly be a valid response shorter than 3 chars,
+ * because the shortest possible response would look like: '1,1'
+ */
if (recvresult < 3)
- {
- done = true;
return;
- }
-
- irc::sepstream sep(ibuf, ':');
- std::string token;
- for (int i = 0; sep.GetToken(token); i++)
- {
- // We only really care about the 4th portion
- if (i < 3)
- continue;
- char ident[IDENTMAX + 2];
+ ServerInstance->Logs->Log("m_ident",DEBUG,"ReadResponse()");
- // 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++)
- {
- if (*j == ' ')
- continue;
-
- // Rules taken from InspIRCd::IsIdent
- if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.'))
- {
- ident[k++] = *j;
- continue;
- }
+ /* Truncate at the first null character, but first make sure
+ * there is at least one null char (at the end of the buffer).
+ */
+ ibuf[recvresult] = '\0';
+ std::string buf(ibuf);
+ std::string::size_type lastcolon = buf.rfind(':');
+ if (lastcolon == std::string::npos)
+ return;
+ /* Truncate the ident at any characters we don't like, skip leading spaces */
+ for (std::string::const_iterator i = buf.begin()+lastcolon+1; i != buf.end(); ++i)
+ {
+ if (result.size()+1 == ServerInstance->Config->Limits.IdentMax)
+ /* Ident is getting too long */
break;
- }
- ident[k] = '\0';
+ if (*i == ' ')
+ continue;
- // Redundant check with IsIdent, in case that changes and this doesn't (paranoia!)
- if (*ident && ServerInstance->IsIdent(ident))
+ /* Add the next char to the result and see if it's still a valid ident,
+ * according to IsIdent(). If it isn't, then erase what we just added and
+ * we're done.
+ */
+ result += *i;
+ if (!ServerInstance->IsIdent(result.c_str()))
{
- result = ident;
- ServerInstance->next_call = ServerInstance->Time();
+ result.erase(result.end()-1);
+ break;
}
-
- break;
}
-
- Close();
- done = true;
- return;
}
};
class ModuleIdent : public Module
{
- private:
int RequestTimeout;
+ SimpleExtItem<IdentRequestSocket> ext;
public:
- ModuleIdent(InspIRCd *Me)
- : Module(Me)
+ ModuleIdent() : ext("ident_socket", this)
{
- OnRehash(NULL, "");
+ OnRehash(NULL);
+ Implementation eventlist[] = {
+ I_OnRehash, I_OnUserInit, I_OnCheckReady,
+ I_OnUserDisconnect, I_OnSetConnectClass
+ };
+ ServerInstance->Modules->Attach(eventlist, this, 5);
}
-
- virtual Version GetVersion()
+
+ ~ModuleIdent()
{
- return Version(1, 1, 1, 0, VF_VENDOR, API_VERSION);
}
-
- 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);
}
-
- virtual void OnRehash(User *user, const std::string ¶m)
+
+ virtual void OnRehash(User *user)
{
- ConfigReader MyConf(ServerInstance);
-
- RequestTimeout = MyConf.ReadInteger("ident", "timeout", 0, true);
+ RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5);
if (!RequestTimeout)
RequestTimeout = 5;
}
-
- virtual int OnUserRegister(User *user)
+
+ void OnUserInit(LocalUser *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';
+ ConfigTag* tag = user->MyClass->config;
+ if (!tag->getBool("useident", true))
+ return;
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);
+ IdentRequestSocket *isock = new IdentRequestSocket(IS_LOCAL(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;
}
- 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(LocalUser *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");
- OnUserDisconnect(user);
- return true;
+ ServerInstance->Logs->Log("m_ident",DEBUG, "Timeout");
}
-
- /* Got a result yet? */
- if (!isock->HasResult())
+ else if (!isock->HasResult())
{
- ServerInstance->Log(DEBUG, "No result yet");
- return false;
+ // time still good, no result yet... hold the registration
+ 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! */
- if (*(isock->GetResult()) != '~')
- user->WriteServ("NOTICE Auth :*** Found your ident, '%s'", isock->GetResult());
+ /* wooo, got a result (it will be good, or bad) */
+ if (isock->result.empty())
+ {
+ user->ident.insert(0, 1, '~');
+ user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident.c_str());
+ }
else
- user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", isock->GetResult());
+ {
+ user->ident = isock->result;
+ user->WriteServ("NOTICE Auth :*** Found your ident, '%s'", user->ident.c_str());
+ }
- strlcpy(user->ident, isock->GetResult(), IDENTMAX+1);
- OnUserDisconnect(user);
- return true;
+ isock->Close();
+ ext.unset(user);
+ return MOD_RES_PASSTHRU;
+ }
+
+ ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+ {
+ if (myclass->config->getBool("requireident") && user->ident[0] == '~')
+ return MOD_RES_DENY;
+ return MOD_RES_PASSTHRU;
}
virtual void OnCleanup(int target_type, void *item)
{
/* Module unloading, tidy up users */
if (target_type == TYPE_USER)
- OnUserDisconnect((User*)item);
+ {
+ LocalUser* user = IS_LOCAL((User*) item);
+ if (user)
+ OnUserDisconnect(user);
+ }
}
- virtual void OnUserDisconnect(User *user)
+ virtual void OnUserDisconnect(LocalUser *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)