Delete DNSSEC key files when zone gets deleted.

Author: tbrehm

server/plugins-available/bind_plugin.inc.php

@@ -227,7 +227,7 @@ function soa_dnssec_update(&$data, $new=false) {
 		$this->soa_dnssec_sign($data);
 	}
 
-	function soa_dnssec_delete(&$data) {
+	function soa_dnssec_delete(&$data, $sql_update = true) {
 		global $app, $conf;
 
 		//* Load libraries
@@ -236,17 +236,35 @@ function soa_dnssec_delete(&$data) {
 		//* load the server configuration options
 		$dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns');
 
+        if(isset($data['new']['origin'])) {
 		$domain = substr($data['new']['origin'], 0, strlen($data['new']['origin'])-1);
-
+        } elseif (isset($data['old']['origin'])) {
+            $domain = substr($data['old']['origin'], 0, strlen($data['old']['origin'])-1);
+        } else {
+            //* We have not domain
+            $app->log('DNSSEC Delete: Unable to find domain', LOGLEVEL_WARN);
+            return;
+        }
+
+        //* Delete key files
 		$key_files = glob($dns_config['bind_keyfiles_dir'].'/K'.$domain.'.+*');
 		foreach($key_files as $file) {
 			unlink($file);
 		}
-		unlink($dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_masterprefix'].$domain.'.signed');
-		unlink($dns_config['bind_keyfiles_dir'].'/dsset-'.$domain.'.');
 
-		if ($app->running_on_slaveserver()) $app->dbmaster->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id']));
-		$app->db->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id']));
+        //* Delete signed zone file
+        $signed_zone_file = $dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_masterprefix'].$domain.'.signed';
+		if(file_exists($signed_zone_file)) unlink($signed_zone_file);
+
+        //* Delete dsset file
+        $dsset_file = $dns_config['bind_keyfiles_dir'].'/dsset-'.$domain.'.';
+		if(file_exists($dsset_file)) unlink($dsset_file);
+
+        //* Update DNSSEC info in database
+        if($sql_update) {
+		    if ($app->running_on_slaveserver()) $app->dbmaster->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id']));
+		    $app->db->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id']));
+        }
 	}
 
 	function soa_insert($event_name, $data) {
@@ -421,6 +439,9 @@ function soa_delete($event_name, $data) {
 		//* rebuild the named.conf file
 		$this->write_named_conf($data, $dns_config);
 
+        //* Delete DNSSEC files
+        $this->soa_dnssec_delete($data,false);
+
 		//* Delete the domain file
 		$zone_file_name = $dns_config['bind_zonefiles_dir'].'/' . $dns_config['bind_zonefiles_masterprefix'] . str_replace("/", "_", substr($data['old']['origin'], 0, -1));
 		if(is_file($zone_file_name)) unlink($zone_file_name);