X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=f0ced1db79789ba313711dc97defae384f1dc8b1;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=ad62c77f98a7761abb2c7bf562f0d8ca2a94ff95;hpb=800f02e7599d5f90d1c16f02cb1c28901d354140;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index ad62c77f9..f0ced1db7 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -1,16 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007, 2009 John Brooks + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007 Dennis Friis * - * 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 . */ + #include "inspircd.h" /* $ModDesc: Provides support for RFC1413 ident lookups */ @@ -73,14 +84,13 @@ class IdentRequestSocket : public EventHandler { - private: + public: LocalUser *user; /* User we are attached to */ - bool done; /* True if lookup is finished */ std::string result; /* Holds the ident string if done */ - public: time_t age; + bool done; /* True if lookup is finished */ - IdentRequestSocket(LocalUser* u) : user(u), result(u->ident) + IdentRequestSocket(LocalUser* u) : user(u) { age = ServerInstance->Time(); @@ -189,7 +199,6 @@ class IdentRequestSocket : public EventHandler 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); this->SetFd(-1); } } @@ -199,14 +208,6 @@ class IdentRequestSocket : public EventHandler return done; } - /* Note: if the lookup succeeded, will contain 'ident', otherwise - * will contain '~ident'. Use *GetResult() to determine lookup success. - */ - const char* GetResult() - { - return result.c_str(); - } - void ReadResponse() { /* We don't really need to buffer for incomplete replies here, since IDENT replies are @@ -215,60 +216,56 @@ class IdentRequestSocket : public EventHandler char ibuf[MAXBUF]; int recvresult = ServerInstance->SE->Recv(this, ibuf, MAXBUF-1, 0); + /* 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) - { - Close(); - done = true; return; - } ServerInstance->Logs->Log("m_ident",DEBUG,"ReadResponse()"); - 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; - - std::string ident; + /* 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); - /* Truncate the ident at any characters we don't like, skip leading spaces */ - size_t k = 0; - for (const char *j = token.c_str(); *j && (k < ServerInstance->Config->Limits.IdentMax + 1); j++) - { - if (*j == ' ') - continue; + /* <2 colons: invalid + * 2 colons: reply is an error + * >3 colons: there is a colon in the ident + */ + if (std::count(buf.begin(), buf.end(), ':') != 3) + return; - /* Rules taken from InspIRCd::IsIdent */ - if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.')) - { - ident += *j; - continue; - } + std::string::size_type lastcolon = buf.rfind(':'); + /* 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() == ServerInstance->Config->Limits.IdentMax) + /* Ident is getting too long */ break; - } - /* Re-check with IsIdent, in case that changes and this doesn't (paranoia!) */ - if (!ident.empty() && ServerInstance->IsIdent(ident.c_str())) + if (*i == ' ') + continue; + + /* 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; + result.erase(result.end()-1); + break; } - - break; } - - /* Close (but dont delete from memory) our socket - * and flag as done - */ - Close(); - done = true; - return; } }; @@ -279,9 +276,17 @@ class ModuleIdent : public Module public: ModuleIdent() : ext("ident_socket", this) { + } + + void init() + { + ServerInstance->Modules->AddService(ext); OnRehash(NULL); - Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnUserDisconnect }; - ServerInstance->Modules->Attach(eventlist, this, 4); + Implementation eventlist[] = { + I_OnRehash, I_OnUserInit, I_OnCheckReady, + I_OnUserDisconnect, I_OnSetConnectClass + }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } ~ModuleIdent() @@ -295,24 +300,16 @@ class ModuleIdent : public Module virtual void OnRehash(User *user) { - ConfigReader Conf; - - RequestTimeout = Conf.ReadInteger("ident", "timeout", 0, true); + RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5); if (!RequestTimeout) RequestTimeout = 5; } - virtual ModResult OnUserRegister(LocalUser *user) + void OnUserInit(LocalUser *user) { ConfigTag* tag = user->MyClass->config; if (!tag->getBool("useident", true)) - return MOD_RES_PASSTHRU; - - /* 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, "~"); + return; user->WriteServ("NOTICE Auth :*** Looking up your ident..."); @@ -325,8 +322,6 @@ class ModuleIdent : public Module { ServerInstance->Logs->Log("m_ident",DEBUG,"Ident exception: %s", e.GetReason()); } - - return MOD_RES_PASSTHRU; } /* This triggers pretty regularly, we can use it in preference to @@ -354,16 +349,10 @@ class ModuleIdent : public Module /* Ident timeout */ user->WriteServ("NOTICE Auth :*** Ident request timed out."); ServerInstance->Logs->Log("m_ident",DEBUG, "Timeout"); - /* The user isnt actually disconnecting, - * we call this to clean up the user - */ - OnUserDisconnect(user); - return MOD_RES_PASSTHRU; } - - /* Got a result yet? */ - if (!isock->HasResult()) + else if (!isock->HasResult()) { + // time still good, no result yet... hold the registration ServerInstance->Logs->Log("m_ident",DEBUG, "No result yet"); return MOD_RES_DENY; } @@ -371,16 +360,27 @@ class ModuleIdent : public Module 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 :*** Found your ident, '%s'", isock->GetResult()); + if (isock->result.empty()) + { + user->ident.insert(user->ident.begin(), 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()); + } - /* Copy the ident string to the user */ - user->ChangeIdent(isock->GetResult()); + user->InvalidateCache(); + isock->Close(); + ext.unset(user); + return MOD_RES_PASSTHRU; + } - /* The user isnt actually disconnecting, we call this to clean up the user */ - OnUserDisconnect(user); + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) + { + if (myclass->config->getBool("requireident") && user->ident[0] == '~') + return MOD_RES_DENY; return MOD_RES_PASSTHRU; } @@ -388,7 +388,11 @@ class ModuleIdent : public Module { /* Module unloading, tidy up users */ if (target_type == TYPE_USER) - OnUserDisconnect((LocalUser*)item); + { + LocalUser* user = IS_LOCAL((User*) item); + if (user) + OnUserDisconnect(user); + } } virtual void OnUserDisconnect(LocalUser *user)