X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=b86f277aea1903cfe7b94622000dcc58bfa0113d;hb=9b22ccef7a7dc885c6058817fe91cc9161a8161f;hp=04538015981620e03b80638ca9d3367a8c0902ef;hpb=240b60a884d1297d4e838c86982e3c669478da81;p=gosa.git diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc index 045380159..b86f277ae 100644 --- a/gosa-core/include/class_gosaSupportDaemon.inc +++ b/gosa-core/include/class_gosaSupportDaemon.inc @@ -129,8 +129,16 @@ class gosaSupportDaemon public function get_error() { $str = $this->s_error; - $str = preg_replace("/ /"," ",$str); - return($str); + $ret = ""; + if(is_string($str)){ + $ret = $str; + }else{ + foreach($str as $msg){ + $ret .= $msg." "; + } + } + $ret = preg_replace("/ /"," ",$ret); + return($ret); } @@ -818,6 +826,16 @@ class gosaSupportDaemon } } if ($xml_elem['type'] == 'complete') { + + /* Save tag attributes too. + e.g. + */ + if(isset($xml_elem['attributes'])){ + foreach($xml_elem['attributes'] as $name => $value){ + $test2['ATTRIBUTES'][$name] = $value; + } + } + $start_level = 1; $test2 = &$params; while($start_level < $xml_elem['level']) { @@ -869,6 +887,7 @@ class gosaSupportDaemon $attr = ""; foreach($data as $key => $value){ + $key = strtolower($key); if(is_array($value)){ foreach($value as $sub_value){ $attr.= "<$key>".strtolower($sub_value)."\n"; @@ -1107,7 +1126,7 @@ class gosaSupportDaemon foreach ($data as $key => $value){ if(is_array($value)){ foreach($value as $sub_val){ - $xml_message.= "<$key>$sub_value"; + $xml_message.= "<$key>$sub_val"; } }else{ $xml_message.= "<$key>$value"; @@ -1300,7 +1319,7 @@ class gosaSupportDaemon trigger_error("The given principal name is not of type string or it is empty."); return($ret); } - if(!is_array($values) || !count($values)){ + if(!is_array($values)){ trigger_error("No valid update settings given. The parameter must be of type array and must contain at least one entry"); return($ret); } @@ -1318,6 +1337,7 @@ class gosaSupportDaemon trigger_error("Invalid configuration attribute given '".$key."=".$value."'."); return($ret); } + $key = strtolower($key); if(is_array($value)){ foreach($value as $val){ $attrs.= "<$key>$val\n"; @@ -1342,6 +1362,23 @@ class gosaSupportDaemon } + function krb5_ramdomize_key($server,$name) + { + /* Prepare request event + */ + $xml_msg = + "". + "
gosa_krb5_randomize_key
". + "".$name."". + "GOSA". + "".$server."". + ""; + + return($this->_send($xml_msg,TRUE) == TRUE && !$this->is_error()); + } + + + /*! \brief Updates a given principal with a set of configuration settings. For a list of configurable attributes have a look at 'krb5_get_principal()'. (Uses the GOsa support daemon instead of the ldap database.) @@ -1376,6 +1413,7 @@ class gosaSupportDaemon trigger_error("Invalid configuration attribute given '".$key."=".$value."'."); return($ret); } + $key = strtolower($key); if(is_array($value)){ foreach($value as $val){ $attrs.= "<$key>$val\n"; @@ -1569,6 +1607,7 @@ class gosaSupportDaemon trigger_error("Invalid policy configuration attribute given '".$id."=".$value."'."); return($ret); } + $id = strtolower($id); $attrs.= "<$id>$value\n"; } @@ -1624,6 +1663,7 @@ class gosaSupportDaemon trigger_error("Invalid policy configuration attribute given '".$id."=".$value."'."); return($ret); } + $id = strtolower($id); $attrs.= "<$id>$value\n"; } @@ -1677,6 +1717,45 @@ class gosaSupportDaemon } + /*! \brief Sets the password of for the given principal. + (Uses the GOsa support daemon instead of the ldap database.) + @param String The servers mac + @param String The principals name + @param String $the new password. + @return Boolean TRUE on success else FALSE + */ + public function krb5_set_password($server,$name,$password) + { + $ret = FALSE; + + /* Check if the given server is a valid mac address + */ + if(!tests::is_mac($server)){ + trigger_error("The given server address '".$server."' is invalid, it must be a valid mac address"); + return($ret); + } + + /* Check if the given name is a valid request value + */ + if(!is_string($name) || empty($name)){ + trigger_error("The given principal name is not of type string or it is empty."); + return($ret); + } + + /* Prepare request event + */ + $xml_msg = + "". + "
gosa_krb5_set_password
". + "".$name."". + "".$password."". + "GOSA". + "".$server."". + ""; + return($this->_send($xml_msg,TRUE) == TRUE && !$this->is_error()); + } + + /*! \brief Returns log file informations for a given mac address @param $mac The mac address to fetch logs for. @retrun Array A Multidimensional array containing log infos. @@ -1747,6 +1826,120 @@ class gosaSupportDaemon } return(""); } + + + + + + /***************** + * DAK - Functions + *****************/ + + /*! \brief Returns all currenlty queued entries for a given DAK repository + @param ... + @return Array All queued entries. + */ + public function DAK_keyring_entries($server) + { + /* Ensure that we send the event to a valid mac address + */ + if(!is_string($server) || !tests::is_mac($server)){ + trigger_error("No valid mac address given '".$server."'."); + return; + } + + /* Create query + */ + $xml_msg = " +
gosa_get_dak_keyring
+ ".$server." + GOSA + "; + + $res = $this->_send($xml_msg,TRUE); + + /* Check if there are results for POLICY + */ + if(isset($res['XML'])){ + $ret = array(); + foreach($res['XML'] as $key => $entry){ + if(preg_match("/^ANSWER/",$key)){ + $ret[] = $entry; + } + } + return($ret); + }else{ + return(array()); + } + } + + + /*! \brief Imports the given key into the specified keyring (Servers mac address) + @param String The servers mac address + @param String The gpg key. + @return Boolean TRUE on success else FALSE + */ + public function DAK_import_key($server,$key) + { + /* Ensure that we send the event to a valid mac address + */ + if(!is_string($server) || !tests::is_mac($server)){ + trigger_error("No valid mac address given '".$server."'."); + return; + } + + /* Check if there is some cleanup required before importing the key. + There may be some Header lines like: + -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.6 (GNU/Linux) + */ + if(preg_match("/".normalizePreg("BEGIN PGP PUBLIC KEY BLOCK")."/",$key)){ + + /* Remove header */ + $key = preg_replace("/^.*\n\n/sim","",$key); + /* Remove footer */ + $key = preg_replace("/-----.*$/sim","",$key); + } + + /* Create query + */ + $xml_msg = " +
gosa_import_dak_key
+ ".$server." + ".$key." + GOSA + "; + + $res = $this->_send($xml_msg,TRUE); + return($this->is_error()); + } + + + /*! \brief Removes a key from the keyring on the given server. + @param String The servers mac address + @param String The gpg key uid. + @return Boolean TRUE on success else FALSE + */ + public function DAK_remove_key($server,$key) + { + /* Ensure that we send the event to a valid mac address + */ + if(!is_string($server) || !tests::is_mac($server)){ + trigger_error("No valid mac address given '".$server."'."); + return; + } + + /* Create query + */ + $xml_msg = " +
gosa_remove_dak_key
+ ".$server." + ".$key." + GOSA + "; + + $res = $this->_send($xml_msg,TRUE); + return($this->is_error()); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: