From: Miod Vallat <miod.vallat@powerdns.com>
Date: Mon, 19 May 2025 14:24:58 +0000 (+0200)
Subject: Trust inet_pton to validate IPv6 addresses and nothing more.
X-Git-Tag: auth-5.0.0-alpha1~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89e875f0147231a4e54589780bbf6e64a5f9bf4e;p=thirdparty%2Fpdns.git

Trust inet_pton to validate IPv6 addresses and nothing more.

Fixes #15569
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 9ec564d443..9240937b71 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -479,7 +479,7 @@ static int checkZone(DNSSECKeeper &dk, UeberBackend &B, const ZoneName& zone, co
         }
       } else {
         struct in6_addr tmpbuf;
-        if (inet_pton(AF_INET6, rr.content.c_str(), &tmpbuf) != 1 || rr.content.find('.') != string::npos) {
+        if (inet_pton(AF_INET6, rr.content.c_str(), &tmpbuf) != 1) {
           cout<<"[Warning] Following record is not a valid IPv6 address: "<<rr.qname<<" IN " <<rr.qtype.toString()<< " '" << rr.content<<"'"<<endl;
           numwarnings++;
         }
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 295cecbb7f..79fc84ca12 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -612,7 +612,7 @@ static void gatherRecords(const Json& container, const DNSName& qname, const QTy
       }
       else {
         struct in6_addr tmpbuf{};
-        if (inet_pton(AF_INET6, content.c_str(), &tmpbuf) != 1 || content.find('.') != string::npos) {
+        if (inet_pton(AF_INET6, content.c_str(), &tmpbuf) != 1) {
           throw std::runtime_error("Invalid IPv6 address");
         }
       }