From ad955792a8ade5c0015aa3d68f86b1035c1acc31 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 22 Jan 2014 11:30:52 -0500
Subject: [PATCH] Fixed bug from previous commit
---
server/plugins-available/powerdns_plugin.inc.php | 322 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 199 insertions(+), 123 deletions(-)
diff --git a/server/plugins-available/powerdns_plugin.inc.php b/server/plugins-available/powerdns_plugin.inc.php
index 5627d55..335371c 100644
--- a/server/plugins-available/powerdns_plugin.inc.php
+++ b/server/plugins-available/powerdns_plugin.inc.php
@@ -78,105 +78,116 @@
*/
class powerdns_plugin {
-
+
var $plugin_name = 'powerdns_plugin';
var $class_name = 'powerdns_plugin';
-
+
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
function onInstall() {
global $conf;
-
+
if(isset($conf['powerdns']['installed']) && $conf['powerdns']['installed'] == true) {
return true;
} else {
return false;
}
-
+
}
-
-
+
+
/*
This function is called when the plugin is loaded
*/
-
+
function onLoad() {
global $app;
-
+
/*
Register for the events
*/
-
+
//* SOA
- $app->plugins->registerEvent('dns_soa_insert',$this->plugin_name,'soa_insert');
- $app->plugins->registerEvent('dns_soa_update',$this->plugin_name,'soa_update');
- $app->plugins->registerEvent('dns_soa_delete',$this->plugin_name,'soa_delete');
-
+ $app->plugins->registerEvent('dns_soa_insert', $this->plugin_name, 'soa_insert');
+ $app->plugins->registerEvent('dns_soa_update', $this->plugin_name, 'soa_update');
+ $app->plugins->registerEvent('dns_soa_delete', $this->plugin_name, 'soa_delete');
+
+ //* SLAVE
+ $app->plugins->registerEvent('dns_slave_insert', $this->plugin_name, 'slave_insert');
+ $app->plugins->registerEvent('dns_slave_update', $this->plugin_name, 'slave_update');
+ $app->plugins->registerEvent('dns_slave_delete', $this->plugin_name, 'slave_delete');
+
//* RR
- $app->plugins->registerEvent('dns_rr_insert',$this->plugin_name,'rr_insert');
- $app->plugins->registerEvent('dns_rr_update',$this->plugin_name,'rr_update');
- $app->plugins->registerEvent('dns_rr_delete',$this->plugin_name,'rr_delete');
-
+ $app->plugins->registerEvent('dns_rr_insert', $this->plugin_name, 'rr_insert');
+ $app->plugins->registerEvent('dns_rr_update', $this->plugin_name, 'rr_update');
+ $app->plugins->registerEvent('dns_rr_delete', $this->plugin_name, 'rr_delete');
+
}
-
-
- function soa_insert($event_name,$data) {
+
+
+ function soa_insert($event_name, $data) {
global $app, $conf;
-
+
if($data["new"]["active"] != 'Y') return;
-
+
$origin = substr($data["new"]["origin"], 0, -1);
$ispconfig_id = $data["new"]["id"];
$serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$ispconfig_id);
$serial_id = $serial["serial"];
$app->db->query("INSERT INTO powerdns.domains (name, type, notified_serial, ispconfig_id) VALUES ('$origin', 'MASTER', $serial_id, $ispconfig_id)");
- //$app->db->query("INSERT INTO powerdns.domains (name, type, ispconfig_id) VALUES ('$origin', 'NATIVE', $ispconfig_id)");
- $zone_id = mysql_insert_id();
+ $zone_id = $app->db->insertID();
if(substr($data["new"]["ns"], -1) == '.'){
$ns = substr($data["new"]["ns"], 0, -1);
} else {
$ns = $data["new"]["ns"].'.'.$origin;
}
if($ns == '') $ns = $origin;
-
+
$hostmaster = substr($data["new"]["mbox"], 0, -1);
$content = $ns.' '.$hostmaster.' 0';
- //$content = $ns.' '.$hostmaster.' '.$serial_id.'';
$ttl = $data["new"]["ttl"];
-
+
$app->db->query("INSERT INTO powerdns.records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$origin', 'SOA', '$content', $ttl, 0, ".time().", $ispconfig_id)");
-
+
+ //* Reload powerdns nameserver
+ $app->services->restartServiceDelayed('powerdns', 'reload');
+
}
-
- function soa_update($event_name,$data) {
+
+ function soa_update($event_name, $data) {
global $app, $conf;
-
+
if($data["new"]["active"] != 'Y'){
if($data["old"]["active"] != 'Y') return;
- $this->soa_delete($event_name,$data);
+ $this->soa_delete($event_name, $data);
} else {
if($data["old"]["active"] == 'Y'){
$origin = substr($data["new"]["origin"], 0, -1);
$ispconfig_id = $data["new"]["id"];
$serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$ispconfig_id);
$serial_id = $serial["serial"];
- //$app->db->query("UPDATE powerdns.domains SET name = '$origin', notified_serial = $serial_id WHERE ispconfig_id = $ispconfig_id");
- //$app->db->query("UPDATE powerdns.domains SET name = '$origin' WHERE ispconfig_id = $ispconfig_id");
-
+ //$app->db->query("UPDATE powerdns.domains SET name = '$origin', notified_serial = $serial_id WHERE ispconfig_id = $ispconfig_idi AND type = 'MASTER'");
+ //$app->db->query("UPDATE powerdns.domains SET name = '$origin' WHERE ispconfig_id = $ispconfig_id AND type = 'MASTER'");
+
if(substr($data["new"]["ns"], -1) == '.'){
$ns = substr($data["new"]["ns"], 0, -1);
} else {
$ns = $data["new"]["ns"].'.'.$origin;
}
if($ns == '') $ns = $origin;
-
+
$hostmaster = substr($data["new"]["mbox"], 0, -1);
//$content = $ns.' '.$hostmaster.' 0';
$content = $ns.' '.$hostmaster.' '.$serial_id.'';
$ttl = $data["new"]["ttl"];
$app->db->query("UPDATE powerdns.records SET name = '$origin', content = '$content', ttl = $ttl, change_date = ".time()." WHERE ispconfig_id = ".$data["new"]["id"]." AND type = 'SOA'");
+
+ //* Reload powerdns nameserver
+ $app->services->restartServiceDelayed('powerdns', 'reload');
+
+
} else {
- $this->soa_insert($event_name,$data);
+ $this->soa_insert($event_name, $data);
$ispconfig_id = $data["new"]["id"];
if($records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = $ispconfig_id AND active = 'Y'")){
foreach($records as $record){
@@ -189,30 +200,97 @@
}
}
-
+
}
-
- function soa_delete($event_name,$data) {
+
+ function soa_delete($event_name, $data) {
global $app, $conf;
-
- $zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["old"]["id"]);
+
+ $zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["old"]["id"]." AND type = 'MASTER'");
$zone_id = $zone["id"];
$app->db->query("DELETE FROM powerdns.records WHERE domain_id = $zone_id");
$app->db->query("DELETE FROM powerdns.domains WHERE id = $zone_id");
-
+
+ //* Reload powerdns nameserver
+ $app->services->restartServiceDelayed('powerdns', 'reload');
+
}
-
- function rr_insert($event_name,$data) {
+
+ function slave_insert($event_name, $data) {
+ global $app, $conf;
+
+ if($data["new"]["active"] != 'Y') return;
+
+ $origin = substr($data["new"]["origin"], 0, -1);
+ $ispconfig_id = $data["new"]["id"];
+ $master_ns = $data["new"]["ns"];
+
+ $app->db->query("INSERT INTO powerdns.domains (name, type, master, ispconfig_id) VALUES ('$origin', 'SLAVE', '$master_ns', $ispconfig_id)");
+
+ //$app->db->query("INSERT INTO powerdns.domains (name, type, ispconfig_id) VALUES ('$origin', 'NATIVE', $ispconfig_id)");
+ $zone_id = $app->db->insertID();
+
+ //* Reload powerdns nameserver
+ $app->services->restartServiceDelayed('powerdns', 'reload');
+
+ }
+
+ function slave_update($event_name, $data) {
+ global $app, $conf;
+
+ if($data["new"]["active"] != 'Y'){
+ if($data["old"]["active"] != 'Y') return;
+ $this->slave_delete($event_name, $data);
+ } else {
+ if($data["old"]["active"] == 'Y'){
+
+ $origin = substr($data["new"]["origin"], 0, -1);
+ $ispconfig_id = $data["new"]["id"];
+ $master_ns = $data["new"]["ns"];
+
+ $app->db->query("UPDATE powerdns.domains SET name = '$origin', type = 'SLAVE', master = '$master_ns' WHERE ispconfig_id=$ispconfig_id AND type = 'SLAVE'");
+ //$app->db->query("INSERT INTO powerdns.domains (name, type, ispconfig_id) VALUES ('$origin', 'NATIVE', $ispconfig_id)");
+ $zone_id = $app->db->insertID();
+
+ $zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$ispconfig_id." AND type = 'SLAVE'");
+ $zone_id = $zone["id"];
+ $app->db->query("DELETE FROM powerdns.records WHERE domain_id = $zone_id AND ispconfig_id = 0");
+
+ //* Reload powerdns nameserver
+ $app->services->restartServiceDelayed('powerdns', 'reload');
+
+ } else {
+ $this->slave_insert($event_name, $data);
+
+ }
+ }
+
+ }
+
+ function slave_delete($event_name, $data) {
+ global $app, $conf;
+
+ $zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["old"]["id"]." AND type = 'SLAVE'");
+ $zone_id = $zone["id"];
+ $app->db->query("DELETE FROM powerdns.records WHERE domain_id = $zone_id");
+ $app->db->query("DELETE FROM powerdns.domains WHERE id = $zone_id");
+
+ //* Reload powerdns nameserver
+ $app->services->restartServiceDelayed('powerdns', 'reload');
+
+ }
+
+ function rr_insert($event_name, $data) {
global $app, $conf;
if($data["new"]["active"] != 'Y') return;
-
+
$zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$data["new"]["zone"]);
$origin = substr($zone["origin"], 0, -1);
- $powerdns_zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["new"]["zone"]);
+ $powerdns_zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["new"]["zone"]." AND type = 'MASTER'");
$zone_id = $powerdns_zone["id"];
-
+
$type = $data["new"]["type"];
-
+
if(substr($data["new"]["name"], -1) == '.'){
$name = substr($data["new"]["name"], 0, -1);
} else {
@@ -223,59 +301,59 @@
}
}
if($name == '') $name = $origin;
-
+
switch ($type) {
- case "CNAME":
- case "MX":
- case "NS":
- case "ALIAS":
- case "PTR":
- case "SRV":
- if(substr($data["new"]["data"], -1) == '.'){
- $content = substr($data["new"]["data"], 0, -1);
- } else {
- $content = $data["new"]["data"].'.'.$origin;
- }
- break;
- case "HINFO":
- $content = $data["new"]["data"];
- $quote1 = strpos($content, '"');
- if($quote1 !== FALSE){
- $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
- }
- if($quote1 !== FALSE && $quote2 !== FALSE){
- $text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
- $content = $text_between_quotes.substr($content, ($quote2 + 2));
- }
- break;
- default:
- $content = $data["new"]["data"];
+ case "CNAME":
+ case "MX":
+ case "NS":
+ case "ALIAS":
+ case "PTR":
+ case "SRV":
+ if(substr($data["new"]["data"], -1) == '.'){
+ $content = substr($data["new"]["data"], 0, -1);
+ } else {
+ $content = $data["new"]["data"].'.'.$origin;
+ }
+ break;
+ case "HINFO":
+ $content = $data["new"]["data"];
+ $quote1 = strpos($content, '"');
+ if($quote1 !== FALSE){
+ $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
+ }
+ if($quote1 !== FALSE && $quote2 !== FALSE){
+ $text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
+ $content = $text_between_quotes.substr($content, ($quote2 + 2));
+ }
+ break;
+ default:
+ $content = $data["new"]["data"];
}
-
+
$ttl = $data["new"]["ttl"];
$prio = $data["new"]["aux"];
$change_date = time();
$ispconfig_id = $data["new"]["id"];
-
+
$app->db->query("INSERT INTO powerdns.records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$name', '$type', '$content', $ttl, $prio, $change_date, $ispconfig_id)");
-
+
}
-
- function rr_update($event_name,$data) {
+
+ function rr_update($event_name, $data) {
global $app, $conf;
-
+
if($data["new"]["active"] != 'Y'){
if($data["old"]["active"] != 'Y') return;
- $this->rr_delete($event_name,$data);
+ $this->rr_delete($event_name, $data);
} else {
if($data["old"]["active"] == 'Y'){
$zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$data["new"]["zone"]);
$origin = substr($zone["origin"], 0, -1);
- $powerdns_zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["new"]["zone"]);
+ $powerdns_zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["new"]["zone"]." AND type = 'MASTER'");
$zone_id = $powerdns_zone["id"];
-
- $type = $data["new"]["type"];
-
+
+ $type = $data["new"]["type"];
+
if(substr($data["new"]["name"], -1) == '.'){
$name = substr($data["new"]["name"], 0, -1);
} else {
@@ -288,58 +366,56 @@
if($name == '') $name = $origin;
switch ($type) {
- case "CNAME":
- case "MX":
- case "NS":
- case "ALIAS":
- case "PTR":
- case "SRV":
- if(substr($data["new"]["data"], -1) == '.'){
- $content = substr($data["new"]["data"], 0, -1);
- } else {
- $content = $data["new"]["data"].'.'.$origin;
- }
- break;
- case "HINFO":
- $content = $data["new"]["data"];
- $quote1 = strpos($content, '"');
- if($quote1 !== FALSE){
- $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
- }
- if($quote1 !== FALSE && $quote2 !== FALSE){
- $text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
- $content = $text_between_quotes.substr($content, ($quote2 + 2));
- }
- break;
- default:
- $content = $data["new"]["data"];
+ case "CNAME":
+ case "MX":
+ case "NS":
+ case "ALIAS":
+ case "PTR":
+ case "SRV":
+ if(substr($data["new"]["data"], -1) == '.'){
+ $content = substr($data["new"]["data"], 0, -1);
+ } else {
+ $content = $data["new"]["data"].'.'.$origin;
+ }
+ break;
+ case "HINFO":
+ $content = $data["new"]["data"];
+ $quote1 = strpos($content, '"');
+ if($quote1 !== FALSE){
+ $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
+ }
+ if($quote1 !== FALSE && $quote2 !== FALSE){
+ $text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
+ $content = $text_between_quotes.substr($content, ($quote2 + 2));
+ }
+ break;
+ default:
+ $content = $data["new"]["data"];
}
-
+
$ttl = $data["new"]["ttl"];
$prio = $data["new"]["aux"];
$change_date = time();
$ispconfig_id = $data["new"]["id"];
//echo "UPDATE powerdns.records SET name = '$name', type = '$type', content = '$content', ttl = $ttl, prio = $prio, change_date = ".time()." WHERE id = $record_id";
$app->db->query("UPDATE powerdns.records SET name = '$name', type = '$type', content = '$content', ttl = $ttl, prio = $prio, change_date = ".time()." WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
-
+
} else {
- $this->rr_insert($event_name,$data);
+ $this->rr_insert($event_name, $data);
}
}
-
+
}
-
- function rr_delete($event_name,$data) {
+
+ function rr_delete($event_name, $data) {
global $app, $conf;
-
+
$ispconfig_id = $data["old"]["id"];
$app->db->query("DELETE FROM powerdns.records WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
-
+
}
-
-
-
+
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1