From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 28 May 2020 16:15:53 +0000 (+0200)
Subject: rec: Fix RPZ removals when an update has several deltas
X-Git-Tag: rec-4.3.2~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f286a2c6e173f31635c8d42e09c4db01c5f2cb7;p=thirdparty%2Fpdns.git

rec: Fix RPZ removals when an update has several deltas

(cherry picked from commit b72e5c8578561a8c0a306a861011f5e409a4797b)
---

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index d9f219c1ee..14d8af1bbd 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -458,7 +458,8 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& masters, boost::optional<DN
       oldZone = luaconfsLocal->dfe.getZone(zoneIdx);
       /* we need to make a _full copy_ of the zone we are going to work on */
       std::shared_ptr<DNSFilterEngine::Zone> newZone = std::make_shared<DNSFilterEngine::Zone>(*oldZone);
-      std::shared_ptr<SOARecordContent> newSR{nullptr};
+      /* initialize the current serial to the last one */
+      std::shared_ptr<SOARecordContent> currentSR = sr;
 
       int totremove=0, totadd=0;
       bool fullUpdate = false;
@@ -475,11 +476,17 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& masters, boost::optional<DN
             continue;
           if(rr.d_type == QType::SOA) {
             auto oldsr = getRR<SOARecordContent>(rr);
-            if(oldsr && oldsr->d_st.serial == sr->d_st.serial) {
+            if (oldsr && oldsr->d_st.serial == currentSR->d_st.serial) {
               //	    cout<<"Got good removal of SOA serial "<<oldsr->d_st.serial<<endl;
             }
-            else
-              g_log<<Logger::Error<<"GOT WRONG SOA SERIAL REMOVAL, SHOULD TRIGGER WHOLE RELOAD"<<endl;
+            else {
+              if (!oldsr) {
+                throw std::runtime_error("Unable to extract serial from SOA record while processing the removal part of an update");
+              }
+              else {
+                throw std::runtime_error("Received an unexpected serial (" + std::to_string(oldsr->d_st.serial) + ", expecting " + std::to_string(currentSR->d_st.serial) + ") from SOA record while processing the removal part of an update");
+              }
+            }
           }
           else {
             totremove++;
@@ -493,9 +500,9 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& masters, boost::optional<DN
             continue;
           if(rr.d_type == QType::SOA) {
             auto tempSR = getRR<SOARecordContent>(rr);
-            //	  g_log<<Logger::Info<<"New SOA serial for "<<zoneName<<": "<<newsr->d_st.serial<<endl;
+            //	  g_log<<Logger::Info<<"New SOA serial for "<<zoneName<<": "<<currentSR->d_st.serial<<endl;
             if (tempSR) {
-              newSR = tempSR;
+              currentSR = tempSR;
             }
           }
           else {
@@ -507,8 +514,8 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& masters, boost::optional<DN
       }
 
       /* only update sr now that all changes have been converted */
-      if (newSR) {
-        sr = newSR;
+      if (currentSR) {
+        sr = currentSR;
       }
       g_log<<Logger::Info<<"Had "<<totremove<<" RPZ removal"<<addS(totremove)<<", "<<totadd<<" addition"<<addS(totadd)<<" for "<<zoneName<<" New serial: "<<sr->d_st.serial<<endl;
       newZone->setSerial(sr->d_st.serial);