X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fmodules%2Fm_ident.cpp;h=ad62c77f98a7761abb2c7bf562f0d8ca2a94ff95;hb=800f02e7599d5f90d1c16f02cb1c28901d354140;hp=a5f81c6f4ebb6c1ca1014aefd5ffb4eb6fb8cea9;hpb=05c0944bc22f16e24943a209429651e6226cc12c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index a5f81c6f4..ad62c77f9 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -74,66 +74,42 @@ class IdentRequestSocket : public EventHandler { private: - User *user; /* User we are attached to */ - InspIRCd* ServerInstance; /* Server instance */ + 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; - IdentRequestSocket(InspIRCd *Server, User* u, const std::string &bindip) : user(u), ServerInstance(Server), result(u->ident) + IdentRequestSocket(LocalUser* u) : user(u), result(u->ident) { - 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)); + age = ServerInstance->Time(); + + SetFd(socket(user->server_sa.sa.sa_family, SOCK_STREAM, 0)); if (GetFd() == -1) throw ModuleException("Could not create socket"); done = false; - /* We allocate two of these because sizeof(sockaddr_in6) > sizeof(sockaddr_in) */ - irc::sockets::sockaddrs s; - irc::sockets::sockaddrs addr; + irc::sockets::sockaddrs bindaddr; + irc::sockets::sockaddrs connaddr; + + memcpy(&bindaddr, &user->server_sa, sizeof(bindaddr)); + memcpy(&connaddr, &user->client_sa, sizeof(connaddr)); -#ifdef IPV6 - /* Horrid icky nasty ugly berkely socket crap. */ - if (v6) + if (connaddr.sa.sa_family == AF_INET6) { - if (inet_pton(AF_INET6, user->GetIPString(), &addr.in6.sin6_addr) > 0) - { - addr.in6.sin6_family = AF_INET6; - addr.in6.sin6_port = htons(113); - size = sizeof(sockaddr_in6); - inet_pton(AF_INET6, bindip.c_str(), &s.in6.sin6_addr); - s.in6.sin6_family = AF_INET6; - s.in6.sin6_port = 0; - } + bindaddr.in6.sin6_port = 0; + connaddr.in6.sin6_port = htons(113); } else -#endif { - if (inet_aton(user->GetIPString(), &addr.in4.sin_addr) > 0) - { - addr.in4.sin_family = AF_INET; - addr.in4.sin_port = htons(113); - size = sizeof(sockaddr_in); - inet_aton(bindip.c_str(), &s.in4.sin_addr); - s.in4.sin_family = AF_INET; - s.in4.sin_port = 0; - } + 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.sa, size) < 0) + if (ServerInstance->SE->Bind(GetFd(), bindaddr) < 0) { this->Close(); throw ModuleException("failed to bind()"); @@ -142,53 +118,35 @@ class IdentRequestSocket : public EventHandler ServerInstance->SE->NonBlocking(GetFd()); /* Attempt connection (nonblocking) */ - if (ServerInstance->SE->Connect(this, &addr.sa, size) == -1 && errno != EINPROGRESS) + if (ServerInstance->SE->Connect(this, &connaddr.sa, connaddr.sa_size()) == -1 && errno != EINPROGRESS) { this->Close(); throw ModuleException("connect() failed"); } /* Add fd to socket engine */ - if (!ServerInstance->SE->AddFd(this)) + if (!ServerInstance->SE->AddFd(this, FD_WANT_NO_READ | FD_WANT_POLL_WRITE)) { this->Close(); throw ModuleException("out of fds"); } - - /* Important: We set WantWrite immediately after connect() - * because a successful connection will trigger a writability event - */ - ServerInstance->SE->WantWrite(this); } virtual void 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 - * byte level). */ - irc::sockets::sockaddrs laddr, raddr; - - socklen_t laddrsz = sizeof(laddr); - socklen_t raddrsz = sizeof(raddr); - - if ((getsockname(user->GetFd(), &laddr.sa, &laddrsz) != 0) || (getpeername(user->GetFd(), &raddr.sa, &raddrsz) != 0)) - { - done = true; - return; - } + ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); char req[32]; /* Build request in the form 'localport,remoteport\r\n' */ 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)); + 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 -#endif - req_size = snprintf(req, sizeof(req), "%d,%d\r\n", ntohs(raddr.in4.sin_port), ntohs(laddr.in4.sin_port)); + 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! @@ -316,52 +274,39 @@ class IdentRequestSocket : public EventHandler class ModuleIdent : public Module { - private: int RequestTimeout; - ConfigReader *Conf; + SimpleExtItem ext; public: - ModuleIdent(InspIRCd *Me) : Module(Me) + ModuleIdent() : ext("ident_socket", this) { - Conf = new ConfigReader(ServerInstance); - OnRehash(NULL, ""); - Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect }; - ServerInstance->Modules->Attach(eventlist, this, 5); + OnRehash(NULL); + Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnUserDisconnect }; + ServerInstance->Modules->Attach(eventlist, this, 4); } ~ModuleIdent() { - delete Conf; } virtual Version GetVersion() { - return Version("$Id$", VF_VENDOR, API_VERSION); + return Version("Provides support for RFC1413 ident lookups", VF_VENDOR); } - virtual void OnRehash(User *user, const std::string ¶m) + virtual void OnRehash(User *user) { - delete Conf; - Conf = new ConfigReader(ServerInstance); + ConfigReader Conf; - RequestTimeout = Conf->ReadInteger("ident", "timeout", 0, true); + RequestTimeout = Conf.ReadInteger("ident", "timeout", 0, true); if (!RequestTimeout) RequestTimeout = 5; } - virtual int OnUserRegister(User *user) + virtual ModResult OnUserRegister(LocalUser *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; - } - } + 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. */ @@ -371,36 +316,31 @@ 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 - const char *ip = user->GetIPString(); - - 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->Logs->Log("m_ident",DEBUG,"Ident exception: %s", e.GetReason()); - return 0; } - user->Extend("ident_socket", isock); - return 0; + return MOD_RES_PASSTHRU; } /* 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 bool OnCheckReady(User *user) + virtual ModResult OnCheckReady(LocalUser *user) { /* 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->Logs->Log("m_ident",DEBUG, "No ident socket :("); - return true; + return MOD_RES_PASSTHRU; } ServerInstance->Logs->Log("m_ident",DEBUG, "Has ident_socket"); @@ -418,14 +358,14 @@ class ModuleIdent : public Module * we call this to clean up the user */ OnUserDisconnect(user); - return true; + return MOD_RES_PASSTHRU; } /* Got a result yet? */ if (!isock->HasResult()) { ServerInstance->Logs->Log("m_ident",DEBUG, "No result yet"); - return false; + return MOD_RES_DENY; } ServerInstance->Logs->Log("m_ident",DEBUG, "Yay, result!"); @@ -437,29 +377,28 @@ 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 */ - user->ident.assign(isock->GetResult(), 0, ServerInstance->Config->Limits.IdentMax + 1); + user->ChangeIdent(isock->GetResult()); /* The user isnt actually disconnecting, we call this to clean up the user */ OnUserDisconnect(user); - return true; + 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); + OnUserDisconnect((LocalUser*)item); } - 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"); + ext.unset(user); } } };