X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servDNS.inc;h=c109d44a6fa2d4fbf5d92be5a5ce1a1c69f74223;hb=b8358a5412b082ef08c36c441a85a4a651d84f7a;hp=37471e7cc92c70795c666c40d7f6b277b98d9138;hpb=8995ee5a2789cdaadf3e52ab8fe802cf126ea13a;p=gosa.git
diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index 37471e7cc..c109d44a6 100644
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -8,147 +8,61 @@ class servdns extends plugin
var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
/* attribute list for save action */
- var $ignore_account= TRUE;
- var $attributes = array("");
+ var $ignore_account = FALSE;
+ var $attributes = array();
var $objectclasses = array("whatever");
var $RecordTypes = array();
+ var $Zones = array();
+ var $dialog = NULL;
- var $Zones = array();
- var $dialog = NULL;
+ var $orig_dn = "";
- var $usedDNS = array();
- function servdns ($config, $dn= NULL)
- {
- plugin::plugin ($config, $dn);
-
- /* All types with required attrs */
- $this->RecordTypes['aRecord'] = "aRecord"; // ok
- $this->RecordTypes['mDRecord'] = "mDRecord"; // ok
- $this->RecordTypes['mXRecord'] = "mXRecord"; // ok
- $this->RecordTypes['nSRecord'] = "nSRecord"; // ok
- $this->RecordTypes['pTRRecord'] = "relativeDomainName";// ok
- $this->RecordTypes['hInfoRecord'] = "hInfoRecord"; // ok
- $this->RecordTypes['mInfoRecord'] = "mInfoRecord"; // ok
- $this->RecordTypes['tXTRecord'] = "tXTRecord"; // ok
- $this->RecordTypes['aFSDBRecord'] = "aFSDBRecord"; // ok
- $this->RecordTypes['SigRecord'] = "SigRecord"; // ok
- $this->RecordTypes['KeyRecord'] = "KeyRecord"; // ok
- $this->RecordTypes['aAAARecord'] = "aAAARecord"; // ok
- $this->RecordTypes['LocRecord'] = "LocRecord"; // ok
- $this->RecordTypes['nXTRecord'] = "nXTRecord"; // ok
- $this->RecordTypes['sRVRecord'] = "sRVRecord"; // ok
- $this->RecordTypes['nAPTRRecord'] = "nAPTRRecord"; // ok
- $this->RecordTypes['kXRecord'] = "kXRecord"; // ok
- $this->RecordTypes['certRecord'] = "certRecord"; // ok
- $this->RecordTypes['a6Record'] = "a6Record"; // ok
- $this->RecordTypes['dSRecord'] = "dSRecord"; // ok
- $this->RecordTypes['sSHFPRecord'] = "sSHFPRecord"; // ok
- $this->RecordTypes['rRSIGRecord'] = "rRSIGRecord"; // ok
- $this->RecordTypes['nSECRecord'] = "nSECRecord"; // ok
-
- $this->cn = $this->attrs['cn'][0];
-
- $types = array();
-
- /* Get all records */
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->dn);
- $ldap->search("(&(objectClass=dNSZone)(relativeDomainName=@))",array("*"));
-
- while($attrs = $ldap->fetch()){
- /* If relative domainname == cn
- * Try to read dnsclass / TTl / zone
- */
- $this->usedDNS[$attrs['dn']] = $attrs;
- if((isset($attrs['tXTRecord'][0]))&&(preg_match("/zoneName\=/",$attrs['tXTRecord'][0]))){
- $zoneName= preg_replace("/zoneName\=/","",$attrs['tXTRecord'][0]);
- $types[$zoneName]['ReverseZone'] = preg_replace("/\.in\-addr\.arpa/","",$attrs['zoneName'][0]);
- $types[$zoneName]['ReverseDN'] = $attrs['dn'];
- }else{
+ var $DNSinitially_was_account;
- /* Generate SOA entry */
- if(isset($attrs['sOARecord'][0])){
- $tmp = split("\ ",$attrs['sOARecord'][0]) ;
- $tmp2 = array();
- $ar = array("0"=>"sOAprimary","1"=>"sOAmail","2"=>"sOAserial","3"=>"sOArefresh","4"=>"sOAretry","5"=>"sOAexpire","6"=>"sOAttl");
-
- /* Assign soa vars */
- foreach($ar as $key => $name){
- if(isset($tmp[$key])){
- $types[$attrs['zoneName'][0]][$name] = $tmp[$key];
- }else{
- $types[$attrs['zoneName'][0]][$name] = "";
- }
- }
- }
- /* Set TTL value */
- if(isset($attrs['dNSTTL'][0])){
- $types[$attrs['zoneName'][0]]['dNSTTL'] = $attrs['dNSTTL'][0];
- }
-
- /* Set dns Class*/
- if(isset($attrs['dNSClass'][0])){
- $types[$attrs['zoneName'][0]]['dNSClass'] = $attrs['dNSClass'][0];
- }
+ function servdns ($config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
- /* Set zone Name */
- if(isset($attrs['zoneName'][0])){
- $types[$attrs['zoneName'][0]]['zoneName'] = $attrs['zoneName'][0];
- }
+ $this->orig_dn = $dn;
- /* Set status */
-// $types[$attrs['zoneName'][0]]['status'] ="edited";
-// $types[$attrs['zoneName'][0]]['Reversestatus'] ="edited";
-// $types[$attrs['zoneName'][0]]['ReverseDN']= $attrs['dn'];
-
- /* Create list with all used records */
- foreach($this->RecordTypes as $name => $value){
-
- /* If there is a record attribute */
- if(isset($attrs[$name])){
-
- /* get all entries */
- for($i = 0 ; $i < $attrs[$value]['count']; $i ++){
- $types[$attrs['zoneName'][0]]['Records'][] =array("type" =>$name,
- "inittype" =>$name,
- "value" =>$attrs[$value][$i],
- "status" =>"edited",
- "dn" =>$attrs['dn']);
- }
- }
- }
- }
- }
+ /* Get record types for zones
+ */
+ $this->RecordTypes = getDnsRecordTypes(true);
- /* If there is at least one entry in this -> types, we have DNS enabled */
- $this->Zones = $types;
+ /* Get all zone Informations
+ */
+ $this->Zones = getDNSZoneEntries($config,$dn);
+
+ /* If there is at least one entry in this -> types, we have DNS enabled
+ */
if(count($this->Zones) == 0){
$this->is_account = false;
}else{
$this->is_account = true;
}
-
- /* Store initally account settings */
$this->DNSinitially_was_account = $this->is_account;
}
+
function execute()
{
- /* Call parent execute */
+ /* Call parent execute
+ */
plugin::execute();
- /* Fill templating stuff */
+ /* Fill templating stuff
+ */
$smarty= get_smarty();
$display= "";
- /* Do we need to flip is_account state? */
+ /* Do we need to flip is_account state?
+ */
if (isset($_POST['modify_state'])){
$this->is_account= !$this->is_account;
}
- /* Show tab dialog headers */
if ($this->is_account){
$display= $this->show_header(_("Remove DNS service"),
_("This server has DNS features enabled. You can disable them by clicking below."));
@@ -158,123 +72,193 @@ class servdns extends plugin
return ($display);
}
+
+ /* Edited or Added zone
+ */
if(isset($_POST['SaveZoneChanges'])){
$this->dialog->save_object();
-
+
+ /* Check for errors
+ */
if(count($this->dialog->check())){
foreach($this->dialog->check() as $msgs){
print_red($msgs);
}
}else{
-
+ /* add new/edited zone
+ */
$ret = $this->dialog->save();
- unset($this->Zones[$this->dialog->InitiallyZoneName]);
- $this->Zones[$ret['zoneName']] = $ret;
-
- /*
- if($this->dialog->isNew == true){
- $this->Zones[$ret['zoneName']] = $ret;
- $this->Zones[$ret['zoneName']] = "new";
- }else{
-
- if(!$this->dialog->isNew){
-
- $ForStatus = $this->Zones[$this->dialog->InitiallyZoneName]['status'];
- $RevStatus = $this->Zones[$this->dialog->InitiallyZoneName]['Reversestatus'];
-
- if($ret['zoneName'] != $this->dialog->InitiallyZoneName){
- if($this->Zones[$this->dialog->InitiallyZoneName]['status'] != "new"){
- $this->Zones[$this->dialog->InitiallyZoneName]['status'] = "deleted";
- }else{
- unset($this->Zones[$this->dialog->InitiallyZoneName]);
- }
- $this->Zones[$ret['zoneName']] = $ret;
- $this->Zones[$ret['zoneName']]['status'] = "new";
- $this->Zones[$ret['zoneName']]['Reversestatus'] = $RevStatus;
-
- }elseif($ret['ReverseZone'] != $this->dialog->InitiallyReverseZone){
- if($this->Zones[$this->dialog->InitiallyZoneName]['Reversestatus'] != "new"){
- $this->Zones[$this->dialog->InitiallyZoneName]['Reversestatus'] = "deleted";
- }else{
- unset($this->Zones[$this->dialog->InitiallyZoneName]);
- }
- $this->Zones[$ret['zoneName']] = $ret;
- $this->Zones[$ret['zoneName']]['Reversestatus'] = "new";
- $this->Zones[$ret['zoneName']]['status'] = $ForStatus;
-
- }else{
- $this->Zones[$ret['zoneName']] = $ret;
- $this->Zones[$ret['zoneName']]['status'] = $ForStatus;
- $this->Zones[$ret['zoneName']]['Reversestatus'] = $RevStatus;
- }
- }
+ if(!$this->dialog->isNew){
+ unset($this->Zones[$this->dialog->OldZoneName]);
}
- */
+ $this->Zones[$ret['zoneName']] = $ret;
$this->dialog = NULL;
}
}
+
+ /* Cancel zone edit / new
+ */
if(isset($_POST['CancelZoneChanges'])){
$this->dialog = NULL;
}
- /* Add empty new zone */
+
+ /* Add empty new zone
+ */
if(isset($_POST['AddZone'])){
- $this->dialog = new servdnseditZone($this->config,$this->dn,$this->RecordTypes);
+ $this->dialog = new servdnseditZone($this->config,$this->dn);
}
+ /* Check for edit zone request
+ */
$once = false;
foreach( $_POST as $name => $value){
+
+ /* check all post for edit request
+ */
if(preg_match("/^editZone_/",$name)&&!$once){
$once =true;
$tmp = preg_replace("/^editZone_/","",$name);
$tmp = base64_decode(preg_replace("/_.*$/","",$tmp));
- $this->dialog= new servdnseditZone($this->config,$this->dn,$this->RecordTypes,$this->Zones[$tmp]);
+ $this->dialog= new servdnseditZone($this->config,$this->dn,$this->Zones[$tmp]);
+ }
+
+ /* check posts for delete zone
+ */
+ if(preg_match("/^delZone_/",$name)&&!$once){
+
+ $once =true;
+ $tmp = preg_replace("/^delZone_/","",$name);
+ $tmp = base64_decode(preg_replace("/_.*$/","",$tmp));
+
+ /* Initiate deletion
+ */
+ $this->RemoveZone($tmp);
}
}
+ /* Show dialog
+ */
if($this->dialog!= NULL){
$this->dialog->save_object();
$this->dialog->parent = $this;
return($this->dialog->execute());
}
- /* Create Listbox with existing Zones */
+ /* Create Listbox with existing Zones
+ */
$ZoneList = new divSelectBox("dNSZones");
$ZoneList -> SetHeight(254);
- /* Add entries to divlist*/
- $editImg = "";
+ /* Add entries to divlist
+ */
+ $editImg = "
+ ";
foreach($this->Zones as $zone => $values ){
$ZoneList->AddEntry(array(
- array("string" => $zone),
- array("string" => _("Reverse zone")." : ".$values['ReverseZone']),
- array("string" => _("TTL")." : ".$values['dNSTTL']),
- array("string" => _("Class")." : ".$values['dNSClass']),
- array("string" =>str_replace("%s",base64_encode($zone),$editImg))
- ));
+ array("string" => $zone),
+ array("string" => _("Reverse zone")." : ".$values['ReverseZone']),
+ array("string" => _("TTL")." : ".$values['sOAttl']),
+ array("string" => _("Class")." : ".$values['dNSClass']),
+ array("string" =>str_replace("%s",base64_encode($zone),$editImg))
+ ));
}
- /* Display tempalte */
+ /* Display tempalte
+ */
$smarty->assign("ZoneList",$ZoneList->DrawList());
$display.= $smarty->fetch(get_template_path('servdns.tpl', TRUE));
return($display);
}
- function remove_from_parent()
+
+ /* Delete specified zone
+ */
+ function RemoveZone($id)
{
- }
+ $zones = $this->getUsedZoneNames();
+
+ if(isset($this->Zones[$id]['InitialReverseZone'])){
+ $rev = FlipIp($this->Zones[$id]['InitialReverseZone']);
+ }else{
+ $rev = FlipIp($this->Zones[$id]['ReverseZone']);
+ }
+
+ $zonename = "";
+ if(isset($this->Zones[$id]['InitialzoneName'])){
+ $zonename= $this->Zones[$id]['InitialzoneName'];
+ }
+ $used = array();
- /* Save data to object */
- function save_object()
+ /* Add Records which use this zoneName
+ */
+ if(isset($zones[$zonename])){
+ $used = array_merge($used,$zones[$zonename]);
+ }
+
+ /* Add Records which uses this reverse zone
+ */
+ if(isset($zones[$rev.".in-addr.arpa"])){
+ $used = array_merge($used,$zones[$rev.".in-addr.arpa"]);
+ }
+
+ /* There are still entries using this configuration
+ * Abort deletion
+ */
+ if(count($used)){
+ $i = 2;
+ $str ="";
+ foreach($used as $dn){
+ if($i > 0 ){
+ $i --;
+ $str.=$dn." ";
+ }
+ }
+
+ /* Only show 2 dns in the error message
+ */
+ if(count($used)> 2) {
+ $str .=" ... ";
+ }
+ print_red(sprintf(_("Can't delete the selected zone, because it is still in use by these entry/entries '%s'"),trim($str)));
+
+ }else{
+ unset($this->Zones[$id]);
+ }
+ }
+
+
+ /* This funtion returns all used Zonenames
+ */
+ function getUsedZoneNames()
{
+ $ret = array();
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->search("(&(objectClass=dNSZone)(!(relativeDomainName=@))(zoneName=*))",array("zoneName","relativeDomainName"));
+ while($attr = $ldap->fetch()){
+ $ret[$attr['zoneName'][0]][] = $attr['dn'];
+ }
+ return($ret);
}
- /* Check supplied data */
- function check()
+ /* Remove dns service
+ */
+ function remove_from_parent()
{
- $message= array();
- return ($message);
+ if(!$this->DNSinitially_was_account){
+ return;
+ }
+ print_red("Can't remove dns yet. returning without remove.");
+ return;
+ $ldap = $this->config->get_ldap_link();
+ $ldap->ls("(&(objectClass=dNSZone)(zoneName=*)(relativeDomainName=@))",$this->orig_dn,array("relativeDomainName","zoneName"));
+ while($attr = $ldap->fetch()){
+ $ldap->cd($attr['dn']);
+ $ldap->rmDir($attr['dn']);
+ }
+ show_ldap_error($ldap->get_error(), _("Removing DNS service failed"));
}
@@ -282,94 +266,52 @@ class servdns extends plugin
function save()
{
$ldap = $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
-
- $actions =array("update"=>array(),"add"=>array(),"delete"=>array());
-
- foreach($this->Zones as $zone){
- $tmp = $this->generate_LDAP_entries($zone);
- foreach($tmp as $key => $values){
- if(isset($this->usedDNS[$key])){
- $actions['update'][$key]=$values;
- unset($this->usedDNS[$key]);
- }else{
- $actions['add'][$key] = $values;
- }
+ $ldap->cd($this->config->current['BASE']);
+
+ /* Get differences
+ */
+ $tmp = getDNSZoneEntriesDiff($this->config,$this->Zones,$this->orig_dn);
+
+ /* Updated zone entries if reverser or forward name has changed
+ * Must be done before moving entries, else the given dn is invalid
+ */
+ if(isset($tmp['zoneUpdates'])){
+ foreach($tmp['zoneUpdates'] as $dn => $attrs){
+ $ldap->cd($dn);
+ $ldap->modify($attrs);
+ show_ldap_error("Zone:".$ldap->get_error(), _("Updating DNS service failed"));
}
}
- foreach($this->usedDNS as $key => $values){
- $actions['delete'][$key] = $values;
- }
- foreach($actions['delete'] as $dn => $attrs){
+ /* Delete dns
+ */
+ foreach($tmp['del'] as $dn => $del){
$ldap->cd($dn);
- $ldap->rmDir($dn);
+ $ldap->rmdir_recursive($dn);
+ show_ldap_error($ldap->get_error(), _("Removing DNS entries failed"));
}
- foreach($actions['add'] as $dn => $attrs){
- $ldap->cd($this->config->current['BASE']);
-// $ldap->create_missing_trees($dn);
- $ldap->cd($dn);
- $ldap->add($attrs);
+ /* move follwoing entries
+ */
+ foreach($tmp['move'] as $src => $dst){
+ $this->recursive_move($src,$dst);
}
- foreach($actions['update'] as $dn => $attrs){
+ /* Add || Update new DNS entries
+ */
+ foreach($tmp['add'] as $dn => $attrs){
$ldap->cd($dn);
- $ldap->modify($attrs);
- }
- show_ldap_error($ldap->get_error());
- }
-
-
- function generate_LDAP_entries($zone)
- {
- $tmp = array();
- $tmp['objectClass'] = array("top","dNSZone");
- $tmp['dNSTTL'] = $zone['dNSTTL'];
- $tmp['dNSClass'] = $zone['dNSClass'];
- $tmp['relativeDomainName'] = "@";//$zone['relativeDomainName'];
-
- $str = "";
- foreach(array("sOAprimary","sOAmail","sOAserial","sOArefresh","sOAretry","sOAexpire","sOAttl") as $name){
- $str .= $zone[$name]." ";
- }
- $tmp['sOARecord'] = $str;
-
-
- /* Generate some attrs */
- $arr = array("SigRecord","KeyRecord","aAAARecord","nSRecord","iaFSDBRecord","mInfoRecord","hInfoRecord","mXRecord","mDRecord","tXTRecord",
- "LocRecord","nXTRecord","sRVRecord","nAPTRRecord","kXRecord","certRecord","a6Record","dSRecord","sSHFPRecord","rRSIGRecord","nSECRecord");
- $aRecords = array();
- foreach($arr as $ar){
- foreach($zone['Records'] as $type){
- if(($type['type'] == $ar)&&($type['status']!="deleted")){
- $tmp[$ar][] = $type['value'];
- }
- }
- }
- if(is_array($zone['Records'])){
- foreach($zone['Records'] as $type){
- if(isset($type['inittype'])){
- if($type['type'] != $type['inittype']){
- $tmp[$type['inittype']] = array();
- }
- }
+ $ldap->cat($dn, array('dn'));
+ if(count($ldap->fetch())){
+ $ldap->cd($dn);
+ $ldap->modify ($attrs);
+ }else{
+ $ldap->cd($dn);
+ $ldap->add($attrs);
}
+ show_ldap_error($ldap->get_error(), _("Saving DNS entries failed"));
}
- $dn = "zoneName=".$zone['zoneName'].",".$this->dn;
- $tmp2[$dn] = $tmp;
- $tmp2[$dn]['zoneName'] = $zone['zoneName'];
- $dn = "zoneName=".$zone['ReverseZone'].".in-addr.arpa,".$this->dn;
- $tmp2[$dn] = $tmp;
- $tmp2[$dn]['tXTRecord'] ="zoneName=".$zone['zoneName'];
- $tmp2[$dn]['zoneName'] = $zone['ReverseZone'].".in-addr.arpa";
-
- return($tmp2);
}
-
-
-
}
-
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>