![[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 bea358f72903078d111d8c4650f8100d645fd409..81272f9a4c5f4e808a7a9e7e685aca6df02eac93 100644 (file)
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()
+ {
+ return($this->s_host);
+ }
+
+ public function get_port()
+ {
+ return($this->i_port);
+ }
+
/*! \brief Creates a new gosaSupportDaemon object.
@param string Host The Host where the daemon is running on.
@param integer Port The port which the daemon use.
@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("core","gosaSupportTimeout");
+ }
/* This should only be the case if we call this from setup.
__autoload()
if(!is_object($config)) { return; }
# load from config, store statically
- if ($config->get_cfg_value("gosa_si") != ""){
+ if ($config->get_cfg_value("core","gosaSupportURI") != ""){
if ($this->s_host == ""){
- $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->s_host= preg_replace("/^.*@([^:]+):.*$/", "$1", $config->get_cfg_value("core","gosaSupportURI"));
+ $this->i_port= preg_replace("/^.*@[^:]+:(.*)$/", "$1", $config->get_cfg_value("core","gosaSupportURI"));
+ $this->s_encryption_key = preg_replace("/^(.*)@[^:]+:.*$/", "$1", $config->get_cfg_value("core","gosaSupportURI"));
}
-
+ $this->is_configured = TRUE;
$this->f_timeout = $timeout;
if($connect){
$this->connect();
}
+ public function is_configured()
+ {
+ return($this->is_configured);
+ }
+
+
/*! \brief Establish daemon connection.
@return boolean Returns true if the connection was succesfully established.
*/
new log("debug","gosaSupportDaemon::connect()", "Cannot connect to si-server", array(),$this->get_error());
}
}else{
- $this->set_error(msgPool::cmdnotfound("GOSA_SI",_("GOsa support daemon")));
+ $this->set_error(msgPool::cmdnotfound("gosaSupportURI",_("GOsa support daemon")));
}
return($this->is_connected);
}
$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("/^HOST[0-9]*$/",$name) && $name != "HOST"){
- $hosts[] = $data[0]['MAC'][0]['VALUE'];
+ if(preg_match("/^ANSWER[0-9]*$/",$name)){
+ if(isset($data[0]['MAC'][0]['VALUE']) && $data[0]['MAC'][0]['VALUE'] != ""){
+ $hosts[] = $data[0]['MAC'][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__, "<b>".__CLASS__."::".__FUNCTION__."</b>" ,
+ __FILE__, "<font color='red'><i>Found: 0</i></font>", $info=$mod);
+ }else{
+ @DEBUG(DEBUG_SI, __LINE__, "<b>".__CLASS__."::".__FUNCTION__."</b>" ,
+ __FILE__, "<i>Found: ".count($hosts)."</i>", $info=$mod);
+ }
+
return($hosts);
}
$line = __LINE__;
$class = __CLASS__;
foreach($debug as $info){
- if(!in_array($info['function'],array("send_data","_send","set_error"))){
+ if(!in_array($info['function'],array("send_data","_send","set_error","connect"))){
$file = $info['file'];
$line = $info['line'];
$class = get_class($this);
break;
}
}
- @DEBUG(GOSA_SI, $line, "<b>".$class."::".$function."</b>" , $file, "<font color='red'><i>".htmlentities($str)."</i></font>", $info="");
+ @DEBUG(DEBUG_SI, $line, "<b>".$class."::".$function."</b>" , $file, "<font color='red'><i>".htmlentities($str)."</i></font>", $info="");
/******
Set error string.
$ret .= $msg." ";
}
}
- $ret = preg_replace("/ /"," ",$ret);
+ $ret = str_replace(" "," ",$ret);
return($ret);
}
"<header>gosa_get_available_kernel</header>".
"<source>GOSA</source>".
"<target>GOSA</target>".
- "<release>".$release."</release>".
+ "<fai_release>".$release."</fai_release>".
"</xml>";
$ret = array();
public function FAI_get_classes($name)
{
$xml_msg = "<xml><header>gosa_query_fai_release</header><target>GOSA</target><source>GOSA</source>".
- "<where><clause><phrase><release>".$name."</release></phrase></clause></where></xml>";;
+ "<where><clause><phrase><fai_release>".$name."</fai_release></phrase></clause></where></xml>";;
$ret = array();
if($this->connect()){
/* Allows simply appending a new DaemonEvent
*/
- public function append($event)
+ public function append($event, $skip_add_mac = FALSE)
{
if(!($event instanceof DaemonEvent)){
return(FALSE);
/* Append an entry for each target
*/
foreach($targets as $target){
- $data['macaddress'] = $target;
+ if(!$skip_add_mac){
+ $data['macaddress'] = $target;
+ }
$this->send_data($action,$target,$data,$request_answer);
if($this->is_error()){
*/
public function _send($data, $answer_expected= FALSE)
{
- $this->reset_error();
+
$ret = array();
+ if(!$this->connect()){
+ return($ret);
+ }
+
+ $this->reset_error();
/******
Debug handling
break;
}
}
- @DEBUG(GOSA_SI, $line, "<b>".$class."::".$function."</b>" , $file, "<i>".htmlentities($data)."</i>", $info="");
+ @DEBUG(DEBUG_SI, $line, "<b>".$class."::".$function."</b>" , $file, "<i>".htmlentities($data)."</i>", $info="");
+ $start = microtime(1);
/*******
Start sending data
/* 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, "<b>".$class."::".$function."</b>" , $file, sprintf('%.7f', microtime(1) - $start) , "<b>FAILED Duration:</b>");
return($ret);
}
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'])) {
array($data=>$data),"Fire & forget, not result.! ".$this->get_error());
}
}
+
+ @DEBUG(DEBUG_SI, $line, "<b>".$class."::".$function."</b>" , $file, sprintf('%.7f', microtime(1) - $start) , "<b>Duration:</b>");
return($ret);
}
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
$tmp->add_targets(array($mac));
$tmp->set_type(TRIGGERED_EVENT);
if(!$this->append($tmp)){
- msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"),$entry['ID']) , ERROR_DIALOG);
+ msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"), bold($entry['ID'])) , ERROR_DIALOG);
new log("debug","DaemonEvent ", "gosaSupportDaemon::clean_queue_from_mac()", array($mac => $mac),
"FAILED, could not send 'DaemonEvent_faireboot' for entry ID (".$entry['ID'].") - ".$this->get_error());
}else{
* Failed or waiting events, can be removed without any trouble.
*/
if(!$this->remove_entries(array($entry['ID']))){
- msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"),$entry['ID']) , ERROR_DIALOG);
+ msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"), bold($entry['ID'])) , ERROR_DIALOG);
}
;break;
}
{
if (tests::is_mac($target)){
/* Get communication object */
- $d= new gosaSupportDaemon(TRUE,0.5);
+ $d= new gosaSupportDaemon(TRUE,2);
$answer= $d->_send("<xml><header>gosa_ping</header><source>GOSA</source><target>$target</target></xml>", TRUE);
return (count($answer) ? TRUE:FALSE);
}
*/
public function krb5_get_policy($server,$name)
{
- $res = array();
+ $ret = array();
/* Check if the given name is a valid request value
*/
/* Get list of available log files
*/
+ if(!is_array($entry)){
+ $entry = array($entry);
+ }
foreach($entry as $log_date){
$xml_msg2 = "<xml>
<header>gosa_show_log_files_by_date_and_mac</header>
<date>".$log_date."</date>
<mac>".$mac."</mac>
</xml>";
-
+
$ret[$mac][$log_date] = array();
$res = $this->_send($xml_msg2,TRUE);
$ret[$mac][$log_date]['DATE_STR'] = $log_date;
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);