From: Miod Vallat <miod.vallat@open-xchange.com>
Date: Thu, 13 Feb 2025 09:41:08 +0000 (+0100)
Subject: Merge pull request #15080 from miodvallat/import_with_care
X-Git-Tag: dnsdist-2.0.0-alpha1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dc2910d549395b6c06e64a845bf7bb1b5f20ef2;p=thirdparty%2Fpdns.git

Merge pull request #15080 from miodvallat/import_with_care

pdnsutil: check for key presence after import
---

1dc2910d549395b6c06e64a845bf7bb1b5f20ef2
diff --cc pdns/pdnsutil.cc
index d3b1700bcd,ca0f1c8958..3a35755fd0
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@@ -2922,9 -2899,29 +2922,29 @@@ static int unpublishZoneKey(vector<stri
    return 0;
  }
  
+ static int checkZoneKey(DNSSECKeeper &dsk, DNSName &zone, int64_t keyId)
+ {
+   if (keyId == -1) {
+     cerr<<std::to_string(keyId)<<": Key was added, but backend does not support returning of key id"<<endl;
+     return 0;
+   }
+   if (keyId < -1) {
+     cerr<<std::to_string(keyId)<<": Key was added, but there was a failure while returning the key id"<<endl;
+     return 1;
+   }
+   try {
+     dsk.getKeyById(zone, keyId);
+     cout<<std::to_string(keyId)<<endl;
+   } catch (std::exception& exc) {
+     cerr<<std::to_string(keyId)<<": Key was added, but there was a failure while reading it back: " <<exc.what()<<endl;
+     return 1;
+   }
+   return 0;
+ }
+ 
  static int addZoneKey(vector<string>& cmds)
  {
 -  if(cmds.size() < 3 ) {
 +  if(cmds.size() < 2 ) {
      cerr << "Syntax: pdnsutil add-zone-key ZONE [zsk|ksk] [BITS] [active|inactive] [rsasha1|rsasha1-nsec3-sha1|rsasha256|rsasha512|ecdsa256|ecdsa384";
  #if defined(HAVE_LIBSODIUM) || defined(HAVE_LIBCRYPTO_ED25519)
      cerr << "|ed25519";