* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Provides support for RFC1413 ident lookups */
* 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
*
* 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
+ * 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
class IdentRequestSocket : public EventHandler
{
private:
-
- User *user; /* User we are attached to */
- InspIRCd* ServerInstance; /* Server instance */
- bool done; /* True if lookup is finished */
- std::string result; /* Holds the ident string if done */
-
+ User *user; /* User we are attached to */
+ InspIRCd* ServerInstance; /* Server instance */
+ bool done; /* True if lookup is finished */
+ std::string result; /* Holds the ident string if done */
public:
+ time_t age;
- IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident)
+ IdentRequestSocket(InspIRCd *Server, User* u) : user(u), ServerInstance(Server), result(u->ident)
{
+ age = ServerInstance->Time();
socklen_t size = 0;
-#ifdef IPV6
- /* Does this look like a v6 ip address? */
- 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");
- /* We allocate two of these because sizeof(sockaddr_in6) > sizeof(sockaddr_in) */
- sockaddr* s = new sockaddr[2];
- sockaddr* addr = new sockaddr[2];
-
-#ifdef IPV6
- /* Horrid icky nasty ugly berkely socket crap. */
- 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, bindip.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);
}
/* Attempt to bind (ident requests must come from the ip the query is referring to */
- if (ServerInstance->SE->Bind(GetFd(), s, size) < 0)
+ if (ServerInstance->SE->Bind(GetFd(), &bindaddr.sa, size) < 0)
{
this->Close();
- delete[] s;
- delete[] addr;
throw ModuleException("failed to bind()");
}
- delete[] s;
ServerInstance->SE->NonBlocking(GetFd());
/* Attempt connection (nonblocking) */
- if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1 && errno != EINPROGRESS)
+ if (ServerInstance->SE->Connect(this, &connaddr.sa, size) == -1 && errno != EINPROGRESS)
{
this->Close();
- delete[] addr;
throw ModuleException("connect() failed");
}
- delete[] addr;
-
/* Add fd to socket engine */
if (!ServerInstance->SE->AddFd(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))
- {
- done = true;
- return;
- }
+ ServerInstance->Logs->Log("m_ident",DEBUG,"OnConnected()");
char req[32];
/* Build request in the form 'localport,remoteport\r\n' */
- #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
-
+ 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!
*/
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!
*/
*/
if (GetFd() > -1)
{
- ServerInstance->Log(DEBUG,"Close ident socket %d", GetFd());
+ ServerInstance->Logs->Log("m_ident",DEBUG,"Close ident socket %d", GetFd());
ServerInstance->SE->DelFd(this);
ServerInstance->SE->Close(GetFd());
ServerInstance->SE->Shutdown(GetFd(), SHUT_WR);
return;
}
- ServerInstance->Log(DEBUG,"ReadResponse()");
+ ServerInstance->Logs->Log("m_ident",DEBUG,"ReadResponse()");
irc::sepstream sep(ibuf, ':');
std::string token;
if (i < 3)
continue;
- char ident[IDENTMAX + 2];
+ std::string 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++)
+ size_t k = 0;
+ for (const char *j = token.c_str(); *j && (k < ServerInstance->Config->Limits.IdentMax + 1); j++)
{
if (*j == ' ')
continue;
/* Rules taken from InspIRCd::IsIdent */
if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.'))
{
- ident[k++] = *j;
+ ident += *j;
continue;
}
break;
}
- ident[k] = '\0';
-
/* Re-check with IsIdent, in case that changes and this doesn't (paranoia!) */
- if (*ident && ServerInstance->IsIdent(ident))
+ if (!ident.empty() && ServerInstance->IsIdent(ident.c_str()))
{
result = ident;
}
{
private:
int RequestTimeout;
+ ConfigReader *Conf;
public:
- ModuleIdent(InspIRCd *Me)
- : Module(Me)
+ ModuleIdent(InspIRCd *Me) : Module(Me)
{
- OnRehash(NULL, "");
+ Conf = new ConfigReader(ServerInstance);
+ OnRehash(NULL);
Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect };
ServerInstance->Modules->Attach(eventlist, this, 5);
}
-
+
+ ~ModuleIdent()
+ {
+ delete Conf;
+ }
+
virtual Version GetVersion()
{
- return Version(1, 1, 1, 0, VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_VENDOR, API_VERSION);
}
-
-
- virtual void OnRehash(User *user, const std::string ¶m)
+
+ virtual void OnRehash(User *user)
{
- ConfigReader MyConf(ServerInstance);
-
- RequestTimeout = MyConf.ReadInteger("ident", "timeout", 0, true);
+ delete Conf;
+ Conf = new ConfigReader(ServerInstance);
+
+ RequestTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
if (!RequestTimeout)
RequestTimeout = 5;
}
-
+
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)
+ for (int j = 0; j < Conf->Enumerate("connect"); j++)
{
- user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident);
- return 0;
+ std::string hostn = Conf->ReadValue("connect","allow",j);
+ /* XXX: Fixme: does not respect port, limit, etc */
+ if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map)))
+ {
+ bool useident = Conf->ReadFlag("connect", "useident", "yes", j);
+
+ if (!useident)
+ 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
+ /* 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. */
+ if (user->ident.length() > ServerInstance->Config->Limits.IdentMax + 1)
+ user->ident.assign(user->ident, 0, ServerInstance->Config->Limits.IdentMax);
+ user->ident.insert(0, "~");
+
+ user->WriteServ("NOTICE Auth :*** Looking up your ident...");
- IdentRequestSocket *isock = NULL;
try
{
- isock = new IdentRequestSocket(ServerInstance, user, ip);
+ IdentRequestSocket *isock = new IdentRequestSocket(ServerInstance, user);
+ user->Extend("ident_socket", 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)
{
- 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))
{
- ServerInstance->Log(DEBUG, "No ident socket :(");
+ ServerInstance->Logs->Log("m_ident",DEBUG, "No ident socket :(");
return true;
}
- ServerInstance->Log(DEBUG, "Has ident_socket");
+ ServerInstance->Logs->Log("m_ident",DEBUG, "Has ident_socket");
time_t compare = isock->age;
compare += RequestTimeout;
{
/* Ident timeout */
user->WriteServ("NOTICE Auth :*** Ident request timed out.");
- ServerInstance->Log(DEBUG, "Timeout");
+ ServerInstance->Logs->Log("m_ident",DEBUG, "Timeout");
/* The user isnt actually disconnecting,
* we call this to clean up the user
*/
/* Got a result yet? */
if (!isock->HasResult())
{
- ServerInstance->Log(DEBUG, "No result yet");
+ ServerInstance->Logs->Log("m_ident",DEBUG, "No result yet");
return false;
}
- ServerInstance->Log(DEBUG, "Yay, result!");
+ ServerInstance->Logs->Log("m_ident",DEBUG, "Yay, result!");
/* wooo, got a result (it will be good, or bad) */
if (*(isock->GetResult()) != '~')
user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", isock->GetResult());
/* Copy the ident string to the user */
- strlcpy(user->ident, isock->GetResult(), IDENTMAX+1);
+ user->ChangeIdent(isock->GetResult());
/* The user isnt actually disconnecting, we call this to clean up the user */
OnUserDisconnect(user);
isock->Close();
delete isock;
user->Shrink("ident_socket");
- ServerInstance->Log(DEBUG, "Removed ident socket from %s", user->nick);
}
}
};
projects / user / henk / code / inspircd.git / blobdiff