Merge pull request #25761 from AkhterAli/develop

Adding delete_den to delete denied keys See issue #24836
saltstack · Aug 3, 2015 · 8e99e27 · 8e99e27
2 parents 31e64bf + d3be3d5
commit 8e99e27
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/salt/key.py b/salt/key.py
@@ -832,6 +832,24 @@ def delete_key(self, match=None, match_dict=None, preserve_minions=False):
             else self.dict_match(matches)
         )
 
+    def delete_den(self):
+        '''
+        Delete all denied keys
+        '''
+        keys = self.list_keys()
+        for status, keys in six.iteritems(self.list_keys()):
+            for key in keys[self.DEN]:
+                try:
+                    os.remove(os.path.join(self.opts['pki_dir'], status, key))
+                    eload = {'result': True,
+                                 'act': 'delete',
+                                 'id': key}
+                    self.event.fire_event(eload, tagify(prefix='key'))
+                except (OSError, IOError):
+                    pass
+        self.check_minion_cache()
+        return self.list_keys()
+
     def delete_all(self):
         '''
         Delete all keys