Be sure to always abort transactions if we don't plan to commit them.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index 7d74864a1be3e5b831ef50ca59c5751ce1b98b63..53433b6739000c2d869a08808da05fa5c4aaa2a7 100644 (file)
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -820,6 +820,7 @@ int PacketHandler::processUpdate(DNSPacket& packet) { // NOLINT(readability-func
     if (dnsRecord->d_place == DNSResourceRecord::ANSWER) {
       // Last line of 3.2.3
       if (dnsRecord->d_class != QClass::IN && dnsRecord->d_class != QClass::NONE && dnsRecord->d_class != QClass::ANY) {
+        di.backend->abortTransaction();
         return RCode::FormErr;
       }
 

diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 90c67455793bf8896abfb2ac3a6f5a2d4454868b..9264d5e330845535c792838d741c1521efd9076a 100644 (file)
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -2001,28 +2001,34 @@ static void apiServerZonesPOST(HttpRequest* req, HttpResponse* resp)
 
   domainInfo.backend->startTransaction(zonename, domainInfo.id);
 
-  // will be overridden by updateDomainSettingsFromDocument, if given in document.
-  domainInfo.backend->setDomainMetadataOne(zonename, "SOA-EDIT-API", "DEFAULT");
+  try {
+    // will be overridden by updateDomainSettingsFromDocument, if given in document.
+    domainInfo.backend->setDomainMetadataOne(zonename, "SOA-EDIT-API", "DEFAULT");
 
-  for (auto& resourceRecord : new_records) {
-    resourceRecord.domain_id = static_cast<int>(domainInfo.id);
-    domainInfo.backend->feedRecord(resourceRecord, DNSName());
-  }
-  for (Comment& comment : new_comments) {
-    comment.domain_id = static_cast<int>(domainInfo.id);
-    if (!domainInfo.backend->feedComment(comment)) {
-      throw ApiException("Hosting backend does not support editing comments.");
+    for (auto& resourceRecord : new_records) {
+      resourceRecord.domain_id = static_cast<int>(domainInfo.id);
+      domainInfo.backend->feedRecord(resourceRecord, DNSName());
+    }
+    for (Comment& comment : new_comments) {
+      comment.domain_id = static_cast<int>(domainInfo.id);
+      if (!domainInfo.backend->feedComment(comment)) {
+        throw ApiException("Hosting backend does not support editing comments.");
+      }
     }
-  }
 
-  updateDomainSettingsFromDocument(backend, domainInfo, zonename, document, !new_records.empty());
+    updateDomainSettingsFromDocument(backend, domainInfo, zonename, document, !new_records.empty());
 
-  if (!catalog && kind == DomainInfo::Primary) {
-    const auto& defaultCatalog = ::arg()["default-catalog-zone"];
-    if (!defaultCatalog.empty()) {
-      domainInfo.backend->setCatalog(zonename, ZoneName(defaultCatalog));
+    if (!catalog && kind == DomainInfo::Primary) {
+      const auto& defaultCatalog = ::arg()["default-catalog-zone"];
+      if (!defaultCatalog.empty()) {
+        domainInfo.backend->setCatalog(zonename, ZoneName(defaultCatalog));
+      }
     }
   }
+  catch (...) {
+    domainInfo.backend->abortTransaction();
+    throw;
+  }
 
   domainInfo.backend->commitTransaction();
 
@@ -2454,22 +2460,22 @@ static void patchZone(UeberBackend& backend, const ZoneName& zonename, DomainInf
       fillSOAData(resourceRecord.content, soaData);
       resp->headers["X-PDNS-New-Serial"] = std::to_string(soaData.serial);
     }
+
+    // Rectify
+    DNSSECKeeper dnssecKeeper(&backend);
+    if (!zone_disabled && !dnssecKeeper.isPresigned(zonename) && isZoneApiRectifyEnabled(domainInfo)) {
+      string info;
+      string error_msg;
+      if (!dnssecKeeper.rectifyZone(zonename, error_msg, info, false)) {
+        throw ApiException("Failed to rectify '" + zonename.toStringFull() + "' " + error_msg);
+      }
+    }
   }
   catch (...) {
     domainInfo.backend->abortTransaction();
     throw;
   }
 
-  // Rectify
-  DNSSECKeeper dnssecKeeper(&backend);
-  if (!zone_disabled && !dnssecKeeper.isPresigned(zonename) && isZoneApiRectifyEnabled(domainInfo)) {
-    string info;
-    string error_msg;
-    if (!dnssecKeeper.rectifyZone(zonename, error_msg, info, false)) {
-      throw ApiException("Failed to rectify '" + zonename.toStringFull() + "' " + error_msg);
-    }
-  }
-
   domainInfo.backend->commitTransaction();
 
   DNSSECKeeper::clearCaches(zonename);