X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=6790907e904a2d54044aebcdc552d29046a7cf22;hb=117742632909d9bfd71fc4feb3304263558101b7;hp=144a3bb53c27bcf9e1dff1c686f4162c5459b978;hpb=f561b32be27117fa16f7123adfd4e767e9e17561;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 144a3bb53..6790907e9 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,9 +12,6 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" /* $ModDesc: Provides support for RFC1413 ident lookups */ @@ -40,7 +37,7 @@ * 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 @@ -49,7 +46,7 @@ * * 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 @@ -77,12 +74,10 @@ 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: IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident) @@ -103,10 +98,12 @@ class IdentRequestSocket : public EventHandler if (GetFd() == -1) throw ModuleException("Could not create socket"); + done = false; + /* 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) @@ -180,7 +177,7 @@ class IdentRequestSocket : public EventHandler virtual void OnConnected() { - ServerInstance->Log(DEBUG,"OnConnected()"); + ServerInstance->Logs->Log("m_ident",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 @@ -208,7 +205,7 @@ class IdentRequestSocket : public EventHandler #else int req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.sin6_port), ntohs(laddr.sin6_port)); #endif - + /* Send failed if we didnt write the whole ident request -- * might as well give up if this happens! */ @@ -230,7 +227,7 @@ class IdentRequestSocket : public EventHandler 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! */ @@ -247,7 +244,7 @@ class IdentRequestSocket : public EventHandler */ 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); @@ -286,7 +283,7 @@ class IdentRequestSocket : public EventHandler return; } - ServerInstance->Log(DEBUG,"ReadResponse()"); + ServerInstance->Logs->Log("m_ident",DEBUG,"ReadResponse()"); irc::sepstream sep(ibuf, ':'); std::string token; @@ -296,11 +293,11 @@ class IdentRequestSocket : public EventHandler 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; @@ -308,17 +305,15 @@ class IdentRequestSocket : public EventHandler /* 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; } @@ -339,40 +334,56 @@ class ModuleIdent : public Module { private: int RequestTimeout; + ConfigReader *Conf; public: - ModuleIdent(InspIRCd *Me) - : Module(Me) + ModuleIdent(InspIRCd *Me) : Module(Me) { + Conf = new ConfigReader(ServerInstance); OnRehash(NULL, ""); + Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect }; + ServerInstance->Modules->Attach(eventlist, this, 5); } - - virtual Version GetVersion() + + ~ModuleIdent() { - return Version(1, 1, 1, 0, VF_VENDOR, API_VERSION); + delete Conf; } - - 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("$Id$", VF_VENDOR, API_VERSION); } - + virtual void OnRehash(User *user, const std::string ¶m) { - 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) { + for (int j = 0; j < Conf->Enumerate("connect"); j++) + { + 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", j); + + if (!useident) + return 0; + } + } + /* 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'; + * 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..."); @@ -386,7 +397,7 @@ class ModuleIdent : public Module if (getsockname(user->GetFd(), (sockaddr*) &laddr, &laddrsz) != 0) { - user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident); + user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident.c_str()); return 0; } @@ -404,7 +415,7 @@ class ModuleIdent : public Module } catch (ModuleException &e) { - ServerInstance->Log(DEBUG,"Ident exception: %s", e.GetReason()); + ServerInstance->Logs->Log("m_ident",DEBUG,"Ident exception: %s", e.GetReason()); return 0; } @@ -418,24 +429,25 @@ class ModuleIdent : public Module */ 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; /* Check for timeout of the socket */ - if (isock->age + RequestTimeout > ServerInstance->Time() && !isock->HasResult()) + if (ServerInstance->Time() >= compare) { /* 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 */ @@ -446,11 +458,11 @@ class ModuleIdent : public Module /* 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()) != '~') @@ -459,7 +471,7 @@ class ModuleIdent : public Module 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->ident.assign(isock->GetResult(), 0, ServerInstance->Config->Limits.IdentMax + 1); /* The user isnt actually disconnecting, we call this to clean up the user */ OnUserDisconnect(user); @@ -482,10 +494,9 @@ class ModuleIdent : public Module isock->Close(); delete isock; user->Shrink("ident_socket"); - ServerInstance->Log(DEBUG, "Removed ident socket from %s", user->nick); } } }; -MODULE_INIT(ModuleIdent); +MODULE_INIT(ModuleIdent)