X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_gosaSupportDaemon.inc;h=3a7d09ce4365793cfab00b120f92e54893d34566;hb=9fee4c10382768e341abef8b0b69751e6b050e19;hp=9b5a6ac83b1d92aa53639d4f276bbdde6c6d6cb6;hpb=958c86f696b4432fc9a6a4f7bea22da69cfbd9fa;p=gosa.git diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc index 9b5a6ac83..3a7d09ce4 100644 --- a/gosa-core/include/class_gosaSupportDaemon.inc +++ b/gosa-core/include/class_gosaSupportDaemon.inc @@ -31,8 +31,8 @@ class gosaSupportDaemon private $s_error = ""; private $b_error = FALSE; - private $is_connected = FALSE; - + private $is_connected = FALSE; + private $is_configured = FALSE; protected $use_alternative_xml_parse_method = FALSE; public function get_host() @@ -52,10 +52,18 @@ class gosaSupportDaemon @param boolean Connect Directly connect to daemon socket. @param float Timeout The timelimit for all socket actions. */ - public function __construct($connect=TRUE,$timeout=10) + public function __construct($connect=TRUE,$timeout=null) { #FIXME: bad idea about referencing global variables from within classes global $config; + if(!isset($config) || !$config){ + $config = session::global_get('config'); + } + + // Detect timeout + if($timeout == null){ + $timeout = $config->get_cfg_value("gosaSupportTimeout",15); + } /* This should only be the case if we call this from setup. __autoload() @@ -70,7 +78,7 @@ class gosaSupportDaemon $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("gosaSupportURI")); $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("gosaSupportURI")); } - + $this->is_configured = TRUE; $this->f_timeout = $timeout; if($connect){ $this->connect(); @@ -79,6 +87,12 @@ class gosaSupportDaemon } + public function is_configured() + { + return($this->is_configured); + } + + /*! \brief Establish daemon connection. @return boolean Returns true if the connection was succesfully established. */ @@ -116,17 +130,26 @@ class gosaSupportDaemon $data = array("module_name" => $mod); $res = $this->send_data("gosa_get_hosts_with_module",$this->s_host.":".$this->i_port,$data,TRUE); $hosts = array(); - if(isset($res['XML'])){ + if(isset($res['XML'][0])){ foreach($res['XML'][0] as $name => $data){ if(preg_match("/^ANSWER[0-9]*$/",$name)){ - if(isset($data[0]['MAC'][0]['VALUE'])){ + if(isset($data[0]['MAC'][0]['VALUE']) && $data[0]['MAC'][0]['VALUE'] != ""){ $hosts[] = $data[0]['MAC'][0]['VALUE']; - }elseif(isset($data[0]['VALUE'])){ - $hosts[] = $data[0]['VALUE']; + } elseif(isset($data[0]['IP'][0]['VALUE']) && $data[0]['IP'][0]['VALUE'] != "") { + $hosts[] = $data[0]['IP'][0]['VALUE']; } } } } + + if(count($hosts) == 0){ + @DEBUG(DEBUG_SI, __LINE__, "".__CLASS__."::".__FUNCTION__."" , + __FILE__, "Found: 0", $info=$mod); + }else{ + @DEBUG(DEBUG_SI, __LINE__, "".__CLASS__."::".__FUNCTION__."" , + __FILE__, "Found: ".count($hosts)."", $info=$mod); + } + return($hosts); } @@ -206,7 +229,7 @@ class gosaSupportDaemon $ret .= $msg." "; } } - $ret = preg_replace("/ /"," ",$ret); + $ret = str_replace(" "," ",$ret); return($ret); } @@ -1026,6 +1049,7 @@ class gosaSupportDaemon } @DEBUG(DEBUG_SI, $line, "".$class."::".$function."" , $file, "".htmlentities($data)."", $info=""); + $start = microtime(1); /******* Start sending data @@ -1038,6 +1062,7 @@ class gosaSupportDaemon /* Check if something went wrong while reading */ if($this->o_sock->is_error()){ $this->set_error($this->o_sock->get_error()); + @DEBUG(DEBUG_SI, $line, "".$class."::".$function."" , $file, sprintf('%.7f', microtime(1) - $start) , "FAILED Duration:"); return($ret); } @@ -1045,10 +1070,19 @@ class gosaSupportDaemon if(isset($entries['XML']) && is_array($entries['XML'])){ $ret = $entries; if($this->use_alternative_xml_parse_method) { + + // --------- Seems broken, check for 'ERROR' but using 'ERROR_STRING' if(isset($entries['XML'][0]['ERROR'][0]['VALUE']) && $entries['XML'][0]['ERROR'][0]['VALUE'] == "1"){ $this->set_error($entries['XML'][0]['ERROR_STRING'][0]['VALUE']); new log("debug","DaemonEvent (IDS) ", "gosaSupportDaemon::_send()", array($data=>$data),"FAILED ".$this->get_error()); + // --------- + + + }elseif(isset($entries['XML'][0]['ERROR'][0]['VALUE'])){ + $this->set_error($entries['XML'][0]['ERROR'][0]['VALUE']); + new log("debug","DaemonEvent (IDS) ", "gosaSupportDaemon::_send()", + array($data=>$data),"FAILED ".$this->get_error()); } }else{ if(isset($entries['XML']['ERROR_STRING'])) { @@ -1069,6 +1103,8 @@ class gosaSupportDaemon array($data=>$data),"Fire & forget, not result.! ".$this->get_error()); } } + + @DEBUG(DEBUG_SI, $line, "".$class."::".$function."" , $file, sprintf('%.7f', microtime(1) - $start) , "Duration:"); return($ret); } @@ -1114,6 +1150,9 @@ class gosaSupportDaemon function clean_queue_from_mac($mac) { global $config; + if(!isset($config) || !$config){ + $config = session::global_get('config'); + } /* First of all we have to check which jobs are startet * for $mac @@ -1177,7 +1216,7 @@ class gosaSupportDaemon { if (tests::is_mac($target)){ /* Get communication object */ - $d= new gosaSupportDaemon(TRUE,0.5); + $d= new gosaSupportDaemon(TRUE,2); $answer= $d->_send("
gosa_ping
GOSA$target", TRUE); return (count($answer) ? TRUE:FALSE); } @@ -1482,7 +1521,7 @@ class gosaSupportDaemon */ public function krb5_get_policy($server,$name) { - $res = array(); + $ret = array(); /* Check if the given name is a valid request value */ @@ -1743,6 +1782,9 @@ class gosaSupportDaemon /* Get list of available log files */ + if(!is_array($entry)){ + $entry = array($entry); + } foreach($entry as $log_date){ $xml_msg2 = "
gosa_show_log_files_by_date_and_mac
@@ -1751,7 +1793,7 @@ class gosaSupportDaemon ".$log_date." ".$mac." "; - + $ret[$mac][$log_date] = array(); $res = $this->_send($xml_msg2,TRUE); $ret[$mac][$log_date]['DATE_STR'] = $log_date; @@ -1850,7 +1892,7 @@ class gosaSupportDaemon 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)){ + if(preg_match("/BEGIN PGP PUBLIC KEY BLOCK/",$key)){ /* Remove header */ $key = preg_replace("/^.*\n\n/sim","",$key);