X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=24e27d560455e926e8af93a06e7b9712761885cb;hb=8be88f3e732e7a40f2e501c5e5b78c7f1b999f2d;hp=197a6e5e2486eea0876f8984ca041f7d9c260c4b;hpb=7d7250484c352c13830e63ae41ee8faae40a9bd5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 197a6e5e2..24e27d560 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -2,8 +2,8 @@ * | 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. @@ -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,68 +98,56 @@ 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]; - + irc::sockets::sockaddrs s; + irc::sockets::sockaddrs addr; + #ifdef IPV6 /* Horrid icky nasty ugly berkely socket crap. */ if (v6) { - in6_addr addy; - in6_addr n; - if (inet_pton(AF_INET6, user->GetIPString(), &addy) > 0) + if (inet_pton(AF_INET6, user->GetIPString(), &addr.in6.sin6_addr) > 0) { - ((sockaddr_in6*)addr)->sin6_family = AF_INET6; - memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy)); - ((sockaddr_in6*)addr)->sin6_port = htons(113); + addr.in6.sin6_family = AF_INET6; + addr.in6.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; + inet_pton(AF_INET6, bindip.c_str(), &s.in6.sin6_addr); + s.in6.sin6_family = AF_INET6; + s.in6.sin6_port = 0; } } else #endif { - in_addr addy; - in_addr n; - if (inet_aton(user->GetIPString(), &addy) > 0) + if (inet_aton(user->GetIPString(), &addr.in4.sin_addr) > 0) { - ((sockaddr_in*)addr)->sin_family = AF_INET; - ((sockaddr_in*)addr)->sin_addr = addy; - ((sockaddr_in*)addr)->sin_port = htons(113); + addr.in4.sin_family = AF_INET; + addr.in4.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; + inet_aton(bindip.c_str(), &s.in4.sin_addr); + s.in4.sin_family = AF_INET; + s.in4.sin_port = 0; } } /* 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(), &s.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, &addr.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)) { @@ -185,16 +168,12 @@ class IdentRequestSocket : public EventHandler /* 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 + irc::sockets::sockaddrs laddr, raddr; 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)) + if ((getsockname(user->GetFd(), &laddr.sa, &laddrsz) != 0) || (getpeername(user->GetFd(), &raddr.sa, &raddrsz) != 0)) { done = true; return; @@ -203,12 +182,14 @@ class IdentRequestSocket : public EventHandler 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; +#ifdef IPV6 + if (raddr.sa.sa_family == AF_INET6) + req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.in6.sin6_port), ntohs(laddr.in6.sin6_port)); + else +#endif + req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.in4.sin_port), ntohs(laddr.in4.sin_port)); + /* Send failed if we didnt write the whole ident request -- * might as well give up if this happens! */ @@ -337,32 +318,51 @@ class ModuleIdent : public Module { 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, 2, 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) { + 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", "yes", 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. */ if (user->ident.length() > ServerInstance->Config->Limits.IdentMax + 1) @@ -372,25 +372,22 @@ class ModuleIdent : public Module 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 + irc::sockets::sockaddrs laddr; socklen_t laddrsz = sizeof(laddr); - if (getsockname(user->GetFd(), (sockaddr*) &laddr, &laddrsz) != 0) + if (getsockname(user->GetFd(), &laddr.sa, &laddrsz) != 0) { user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident.c_str()); 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 +#ifdef IPV6 + if (laddr.sa.sa_family == AF_INET6) + inet_ntop(laddr.in6.sin6_family, &laddr.in6.sin6_addr, ip, INET6_ADDRSTRLEN); + else +#endif + inet_ntop(laddr.in4.sin_family, &laddr.in4.sin_addr, ip, INET6_ADDRSTRLEN); IdentRequestSocket *isock = NULL; try