From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 9 Nov 2017 11:01:32 +0000 (+0100)
Subject: Check return of getTSIGKey and B64Decode in the Slave Communicator
X-Git-Tag: auth-4.0.5~1^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69eb0c119dc8ddba5c3f5b77c33544bf0555500c;p=thirdparty%2Fpdns.git

Check return of getTSIGKey and B64Decode in the Slave Communicator

(cherry picked from commit 40920298b1342affae194d77b229dc0a335a90a6)
---

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index 0f854d27ea..8d096f2ae5 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -782,8 +782,14 @@ void CommunicatorClass::slaveRefresh(PacketHandler *P)
 
       if(dk.getTSIGForAccess(di.zone, sr.master, &dni.tsigkeyname)) {
         string secret64;
-        B->getTSIGKey(dni.tsigkeyname, &dni.tsigalgname, &secret64);
-        B64Decode(secret64, dni.tsigsecret);
+        if(!B->getTSIGKey(dni.tsigkeyname, &dni.tsigalgname, &secret64)) {
+          L<<Logger::Error<<"TSIG key '"<<dni.tsigkeyname<<"' for domain '"<<di.zone<<"' not found, can not AXFR."<<endl;
+          continue;
+        }
+        if (B64Decode(secret64, dni.tsigsecret) == -1) {
+          L<<Logger::Error<<"Unable to Base-64 decode TSIG key '"<<dni.tsigkeyname<<"' for domain '"<<di.zone<<"', can not AXFR."<<endl;
+          continue;
+        }
       }
 
       localaddr.clear();