X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_hostname_lookup.cpp;h=89c361555f4b8fc17cba0c0bc5c4327c7c1c7b5e;hb=0a6b1e1a7de92e078a98f0b955d2624e5b85e4c1;hp=13214115bd6630d7c406092df6280e17c87a3fad;hpb=dd24f8ac713793d5d5a7e959228937f48788ba66;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp index 13214115b..89c361555 100644 --- a/src/coremods/core_hostname_lookup.cpp +++ b/src/coremods/core_hostname_lookup.cpp @@ -1,7 +1,10 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013-2016 Adam + * Copyright (C) 2020 Matt Schatz + * Copyright (C) 2013-2015 Attila Molnar + * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2013, 2016 Adam * * 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 @@ -23,19 +26,26 @@ namespace { LocalIntExt* dl; - LocalStringExt* ph; } /** Derived from Resolver, and performs user forward/reverse lookups. */ class UserResolver : public DNS::Request { + private: /** UUID we are looking up */ const std::string uuid; - /** True if the lookup is forward, false if is a reverse lookup - */ - const bool fwd; + /** Handles errors which happen during DNS resolution. */ + static void HandleError(LocalUser* user, const std::string& message) + { + user->WriteNotice("*** " + message + "; using your IP address (" + user->GetIPString() + ") instead."); + + bool display_is_real = user->GetDisplayedHost() == user->GetRealHost(); + user->ChangeRealHost(user->GetIPString(), display_is_real); + + dl->unset(user); + } public: /** Create a resolver. @@ -48,7 +58,6 @@ class UserResolver : public DNS::Request UserResolver(DNS::Manager* mgr, Module* me, LocalUser* user, const std::string& to_resolve, DNS::QueryType qt) : DNS::Request(mgr, me, to_resolve, qt) , uuid(user->uuid) - , fwd(qt == DNS::QUERY_A || qt == DNS::QUERY_AAAA) { } @@ -68,17 +77,17 @@ class UserResolver : public DNS::Request const DNS::ResourceRecord* ans_record = r->FindAnswerOfType(this->question.type); if (ans_record == NULL) { - OnError(r); + HandleError(bound_user, "Could not resolve your hostname: No " + this->manager->GetTypeStr(this->question.type) + " records found"); return; } - ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "DNS result for %s: '%s' -> '%s'", uuid.c_str(), ans_record->name.c_str(), ans_record->rdata.c_str()); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "DNS %s result for %s: '%s' -> '%s'%s", + this->manager->GetTypeStr(question.type).c_str(), uuid.c_str(), + ans_record->name.c_str(), ans_record->rdata.c_str(), + r->cached ? " (cached)" : ""); - if (!fwd) + if (this->question.type == DNS::QUERY_PTR) { - // first half of resolution is done. We now need to verify that the host matches. - ph->set(bound_user, ans_record->rdata); - UserResolver* res_forward; if (bound_user->client_sa.family() == AF_INET6) { @@ -99,11 +108,10 @@ class UserResolver : public DNS::Request delete res_forward; ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Error in resolver: " + e.GetReason()); - bound_user->WriteNotice("*** There was an internal error resolving your host, using your IP address (" + bound_user->GetIPString() + ") instead."); - dl->set(bound_user, 0); + HandleError(bound_user, "There was an internal error resolving your host"); } } - else + else if (this->question.type == DNS::QUERY_A || this->question.type == DNS::QUERY_AAAA) { /* Both lookups completed */ @@ -126,37 +134,16 @@ class UserResolver : public DNS::Request } } - dl->set(bound_user, 0); - if (rev_match) { - std::string* hostname = ph->get(bound_user); - - if (hostname == NULL) - { - ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: User has no hostname attached when doing a forward lookup"); - bound_user->WriteNotice("*** There was an internal error resolving your host, using your IP address (" + bound_user->GetIPString() + ") instead."); - return; - } - else if (hostname->length() <= ServerInstance->Config->Limits.MaxHost) - { - /* Hostnames starting with : are not a good thing (tm) */ - if ((*hostname)[0] == ':') - hostname->insert(0, "0"); - - bound_user->WriteNotice("*** Found your hostname (" + *hostname + (r->cached ? ") -- cached" : ")")); - bound_user->ChangeRealHost(hostname->substr(0, ServerInstance->Config->Limits.MaxHost), true); - } - else - { - bound_user->WriteNotice("*** Your hostname is longer than the maximum of " + ConvToStr(ServerInstance->Config->Limits.MaxHost) + " characters, using your IP address (" + bound_user->GetIPString() + ") instead."); - } - - ph->unset(bound_user); + bound_user->WriteNotice("*** Found your hostname (" + this->question.name + (r->cached ? ") -- cached" : ")")); + bool display_is_real = bound_user->GetDisplayedHost() == bound_user->GetRealHost(); + bound_user->ChangeRealHost(this->question.name, display_is_real); + dl->unset(bound_user); } else { - bound_user->WriteNotice("*** Your hostname does not match up with your IP address. Sorry, using your IP address (" + bound_user->GetIPString() + ") instead."); + HandleError(bound_user, "Your hostname does not match up with your IP address"); } } } @@ -168,27 +155,22 @@ class UserResolver : public DNS::Request { LocalUser* bound_user = IS_LOCAL(ServerInstance->FindUUID(uuid)); if (bound_user) - { - bound_user->WriteNotice("*** Could not resolve your hostname: " + this->manager->GetErrorStr(query->error) + "; using your IP address (" + bound_user->GetIPString() + ") instead."); - dl->set(bound_user, 0); - } + HandleError(bound_user, "Could not resolve your hostname: " + this->manager->GetErrorStr(query->error)); } }; class ModuleHostnameLookup : public Module { + private: LocalIntExt dnsLookup; - LocalStringExt ptrHosts; dynamic_reference DNS; public: ModuleHostnameLookup() : dnsLookup("dnsLookup", ExtensionItem::EXT_USER, this) - , ptrHosts("ptrHosts", ExtensionItem::EXT_USER, this) , DNS(this, "DNS") { dl = &dnsLookup; - ph = &ptrHosts; } void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE