X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuser_resolver.cpp;h=f18fc9a0385a29604ec5586bd3d276e7a8de2d8f;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=ea3b46272ef2df56f3a6af2234d07560ba8a1432;hpb=5db1d322be106c8462dc691072f9415dc0766ed4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp index ea3b46272..f18fc9a03 100644 --- a/src/user_resolver.cpp +++ b/src/user_resolver.cpp @@ -1,115 +1,144 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007 Robin Burchell * - * 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 . */ -/* $Core: libIRCDuserresolver */ #include "inspircd.h" - -UserResolver::UserResolver(InspIRCd* Instance, User* user, std::string to_resolve, QueryType qt, bool &cache) : - Resolver(Instance, to_resolve, qt, cache), bound_user(user) +UserResolver::UserResolver(LocalUser* user, std::string to_resolve, QueryType qt, bool &cache) : + Resolver(to_resolve, qt, cache, NULL), uuid(user->uuid) { this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA); - this->bound_fd = user->GetFd(); } -void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum) +void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) { - /* We are only interested in the first matching result */ - if (resultnum) + UserResolver *res_forward; // for forward-resolution + LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid); + if (!bound_user) + { + ServerInstance->Logs->Log("RESOLVER", DEBUG, "Resolution finished for user '%s' who is gone", uuid.c_str()); return; + } + + ServerInstance->Logs->Log("RESOLVER", DEBUG, "DNS result for %s: '%s' -> '%s'", uuid.c_str(), input.c_str(), result.c_str()); - if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)) + if (!fwd) { - this->bound_user->stored_host = result; + // first half of resolution is done. We now need to verify that the host matches. + bound_user->stored_host = result; try { /* Check we didnt time out */ - if (this->bound_user->registered != REG_ALL) + if (bound_user->registered != REG_ALL) { - bool lcached; -#ifdef IPV6 - if (this->bound_user->GetProtocolFamily() == AF_INET6) + bool lcached = false; + if (bound_user->client_sa.sa.sa_family == AF_INET6) { - /* IPV6 forward lookup (with possibility of 4in6) */ - const char* ip = this->bound_user->GetIPString(); - bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), lcached); + /* IPV6 forward lookup */ + res_forward = new UserResolver(bound_user, result, DNS_QUERY_AAAA, lcached); } else - /* IPV4 lookup (mixed protocol mode) */ -#endif - /* IPV4 lookup (ipv4 only mode) */ - bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached); - this->ServerInstance->AddResolver(bound_user->res_forward, lcached); + { + /* IPV4 lookup */ + res_forward = new UserResolver(bound_user, result, DNS_QUERY_A, lcached); + } + ServerInstance->AddResolver(res_forward, lcached); } } catch (CoreException& e) { - ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason()); + ServerInstance->Logs->Log("RESOLVER", DEBUG,"Error in resolver: %s",e.GetReason()); } } - else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)) + else { /* Both lookups completed */ - std::string result2("0::ffff:"); - result2.append(result); - if (this->bound_user->GetIPString() == result || this->bound_user->GetIPString() == result2) + + irc::sockets::sockaddrs* user_ip = &bound_user->client_sa; + bool rev_match = false; + if (user_ip->sa.sa_family == AF_INET6) + { + struct in6_addr res_bin; + if (inet_pton(AF_INET6, result.c_str(), &res_bin)) + { + rev_match = !memcmp(&user_ip->in6.sin6_addr, &res_bin, sizeof(res_bin)); + } + } + else + { + struct in_addr res_bin; + if (inet_pton(AF_INET, result.c_str(), &res_bin)) + { + rev_match = !memcmp(&user_ip->in4.sin_addr, &res_bin, sizeof(res_bin)); + } + } + + if (rev_match) { - std::string hostname = this->bound_user->stored_host; + std::string hostname = bound_user->stored_host; if (hostname.length() < 65) { /* Check we didnt time out */ - if ((this->bound_user->registered != REG_ALL) && (!this->bound_user->dns_done)) + if ((bound_user->registered != REG_ALL) && (!bound_user->dns_done)) { /* Hostnames starting with : are not a good thing (tm) */ - if (*(hostname.c_str()) == ':') + if (hostname[0] == ':') hostname.insert(0, "0"); - this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : "")); - this->bound_user->dns_done = true; - strlcpy(this->bound_user->dhost, hostname.c_str(),64); - strlcpy(this->bound_user->host, hostname.c_str(),64); + bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : "")); + bound_user->dns_done = true; + bound_user->dhost.assign(hostname, 0, 64); + bound_user->host.assign(hostname, 0, 64); /* Invalidate cache */ - this->bound_user->InvalidateCache(); + bound_user->InvalidateCache(); } } else { - if (!this->bound_user->dns_done) + if (!bound_user->dns_done) { - this->bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", this->bound_user->GetIPString()); - this->bound_user->dns_done = true; + bound_user->WriteServ("NOTICE Auth :*** Your hostname is longer than the maximum of 64 characters, using your IP address (%s) instead.", bound_user->GetIPString()); + bound_user->dns_done = true; } } } else { - if (!this->bound_user->dns_done) + if (!bound_user->dns_done) { - this->bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", this->bound_user->GetIPString()); - this->bound_user->dns_done = true; + bound_user->WriteServ("NOTICE Auth :*** Your hostname does not match up with your IP address. Sorry, using your IP address (%s) instead.", bound_user->GetIPString()); + bound_user->dns_done = true; } } + + // Save some memory by freeing this up; it's never used again in the user's lifetime. + bound_user->stored_host.resize(0); } } void UserResolver::OnError(ResolverError e, const std::string &errormessage) { - if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user) + LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid); + if (bound_user) { - this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), this->bound_user->GetIPString()); - this->bound_user->dns_done = true; + bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), bound_user->GetIPString()); + bound_user->dns_done = true; + bound_user->stored_host.resize(0); ServerInstance->stats->statsDnsBad++; } } - -