![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 797d56f4804d5685e41dd35389950dcd74dce637..240d139d37773a44ed650259308df5b62595ec42 100644 (file)
private $is_connected = FALSE;
+ protected $use_alternative_xml_parse_method = FALSE;
/*! \brief Creates a new gosaSupportDaemon object.
@param string Host The Host where the daemon is running on.
#FIXME: bad idea about referencing global variables from within classes
global $config;
+ /* This should only be the case if we call this from setup.
+ __autoload()
+ */
+ if(!is_object($config)) { return; }
+
# load from config, store statically
- if (isset($config->current['GOSA_SI'])){
+ if ($config->get_cfg_value("gosa_si") != ""){
if ($this->s_host == ""){
- $this->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->current['GOSA_SI']);
- $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->current['GOSA_SI']);
- $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->current['GOSA_SI']);
+ $this->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->get_cfg_value("gosa_si"));
+ $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("gosa_si"));
+ $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("gosa_si"));
}
$this->f_timeout = $timeout;
return($this->is_connected);
}
+
+ /*! \brief Returns TRUE whether we are connected or not
+ @return BOOLEAN Returns TRUE when connected else FALSE
+ */
+ public function is_connected()
+ {
+ return($this->is_connected);
+ }
+
+
/*! \brief Disconnect from gosa daemon.
*/
@param String XML string
@return Array Returns an array containing the xml structure.
*/
- private function xml_to_array($xml)
+ private function xml_to_array($xml,$alternative_method = FALSE)
{
$params = array();
$level = array();
}else{
xml_parser_free($parser);
- foreach ($vals as $xml_elem) {
- if ($xml_elem['type'] == 'open') {
- if (array_key_exists('attributes',$xml_elem)) {
- list($level[$xml_elem['level']],$extra) = array_values($xml_elem['attributes']);
- } else {
- $level[$xml_elem['level']] = $xml_elem['tag'];
- }
- }
- if ($xml_elem['type'] == 'complete') {
+ if($this->use_alternative_xml_parse_method) {
+ $params = $this->build_xml_array($vals);
+ } else {
- /* Save tag attributes too.
- e.g. <tag attr="val">
- */
- if(isset($xml_elem['attributes'])){
- foreach($xml_elem['attributes'] as $name => $value){
- $test2['ATTRIBUTES'][$name] = $value;
+ foreach ($vals as $xml_elem) {
+ if ($xml_elem['type'] == 'open') {
+ if (array_key_exists('attributes',$xml_elem)) {
+ list($level[$xml_elem['level']],$extra) = array_values($xml_elem['attributes']);
+ } else {
+ $level[$xml_elem['level']] = $xml_elem['tag'];
}
}
+ if ($xml_elem['type'] == 'complete') {
- $start_level = 1;
- $test2 = &$params;
- while($start_level < $xml_elem['level']) {
- $test2 = &$test2[$level[$start_level]];
- $start_level++;
- }
- if(!isset($test2[$xml_elem['tag']])){
- if(isset($xml_elem['value'])){
- $test2[$xml_elem['tag']] = $xml_elem['value'];
+ $start_level = 1;
+ $test2 = &$params;
+ while($start_level < $xml_elem['level']) {
+ $test2 = &$test2[$level[$start_level]];
+ $start_level++;
}
- }else{
- if(!is_array($test2[$xml_elem['tag']])){
- $test2[$xml_elem['tag']] = array($test2[$xml_elem['tag']]);
+
+ /* Save tag attributes too.
+ e.g. <tag attr="val">
+ */
+ if(isset($xml_elem['attributes'])){
+ foreach($xml_elem['attributes'] as $name => $value){
+ $test2['ATTRIBUTES'][$name] = $value;
+ }
+ }
+
+ if(!isset($test2[$xml_elem['tag']])){
+ if(isset($xml_elem['value'])){
+ $test2[$xml_elem['tag']] = $xml_elem['value'];
+ }
+ }else{
+ if(!is_array($test2[$xml_elem['tag']])){
+ $test2[$xml_elem['tag']] = array($test2[$xml_elem['tag']]);
+ }
+ $test2[$xml_elem['tag']][] = $xml_elem['value'];
}
- $test2[$xml_elem['tag']][] = $xml_elem['value'];
}
}
}
}
+ function build_xml_array(&$vals)
+ {
+ $array = array();
+ while(count($vals)){
+ $key = key($vals);
+ $val = $vals[$key];
+ unset($vals[$key]);
+ if($val['type'] == "close"){
+ return($array);
+ }elseif($val['type']=="open"){
+ $array[$val['tag']][] = $this->build_xml_array($vals);
+ }elseif($val['type'] != "cdata"){
+ $data = array("VALUE" => "","ATTRIBUTES" => "");
+ foreach(array("value" => "VALUE", "attributes" => "ATTRIBUTES") as $name => $attr){
+ if(isset($val[$name])){
+ $data[$attr] = $val[$name];
+ }
+ }
+ $array[$val['tag']][] = $data;
+ }else{
+#print_a($val);
+ }
+ }
+ return($array);
+ }
+
+
+
+
+
+
/*! \brief Updates an entry with a set of new values,
@param Integer The ID of the entry, we want to update.
@param Array The variables to update.
@param ...
@return Array All queued entries.
*/
- public function DAK_get_queue_entries($server)
+ public function DAK_keyring_entries($server)
{
/* Ensure that we send the event to a valid mac address
*/
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);
+ }elseif (!preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $key)) {
+
+ /* Encode key if it is raw.
+ */
+ $key = base64_encode($key);
+ }
+
+ /* Create query
+ */
+ $xml_msg = "<xml>
+ <header>gosa_import_dak_key</header>
+ <target>".$server."</target>
+ <key>".$key."</key>
+ <source>GOSA</source>
+ </xml>";
+
+ $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 = "<xml>
+ <header>gosa_remove_dak_key</header>
+ <target>".$server."</target>
+ <keyid>".$key."</keyid>
+ <source>GOSA</source>
+ </xml>";
+
+ $res = $this->_send($xml_msg,TRUE);
+ return($this->is_error());
+ }
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: