From 3df045a6e13483ef95094ffc84de14689cf3948a Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Mon, 9 Nov 2020 19:23:18 +0100
Subject: [PATCH] pdnsutil validate key id when (de)activating

---
 pdns/pdnsutil.cc | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 020665ae89..55ae03a17b 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -2391,6 +2391,12 @@ try
       cerr<<"Invalid KEY-ID '"<<cmds[2]<<"'"<<endl;
       return 1;
     }
+    try {
+      dk.getKeyById(zone, id);
+    } catch (std::exception& e) {
+      cerr<<e.what()<<endl;
+      return 1;
+    }
     if (!dk.activateKey(zone, id)) {
       cerr<<"Activation of key failed"<<endl;
       return 1;
@@ -2409,6 +2415,12 @@ try
       cerr<<"Invalid KEY-ID"<<endl;
       return 1;
     }
+    try {
+      dk.getKeyById(zone, id);
+    } catch (std::exception& e) {
+      cerr<<e.what()<<endl;
+      return 1;
+    }
     if (!dk.deactivateKey(zone, id)) {
       cerr<<"Deactivation of key failed"<<endl;
       return 1;
@@ -2427,6 +2439,12 @@ try
       cerr<<"Invalid KEY-ID '"<<cmds[2]<<"'"<<endl;
       return 1;
     }
+    try {
+      dk.getKeyById(zone, id);
+    } catch (std::exception& e) {
+      cerr<<e.what()<<endl;
+      return 1;
+    }
     if (!dk.publishKey(zone, id)) {
       cerr<<"Publishing of key failed"<<endl;
       return 1;
@@ -2445,6 +2463,12 @@ try
       cerr<<"Invalid KEY-ID '"<<cmds[2]<<"'"<<endl;
       return 1;
     }
+    try {
+      dk.getKeyById(zone, id);
+    } catch (std::exception& e) {
+      cerr<<e.what()<<endl;
+      return 1;
+    }
     if (!dk.unpublishKey(zone, id)) {
       cerr<<"Unpublishing of key failed"<<endl;
       return 1;
-- 
2.47.2