diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index be282a52de1d65c005a366224c30e8f04f2c4374..7f721da2f1a6675ce2fded8e859549b6b3a91bfe 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
# REVISION: ---
#===============================================================================
+my $client_version = '$HeadURL$:$Rev$';
+
use strict;
use warnings;
use Getopt::Long;
use POE qw(Component::Server::TCP Wheel::FollowTail Wheel::Run);
use IO::Socket::INET;
use NetAddr::IP;
-use Data::Dumper;
use Crypt::Rijndael;
use GOSA::GosaSupportDaemon;
use Digest::MD5 qw(md5_hex md5 md5_base64);
use MIME::Base64;
use XML::Simple;
-#use Net::DNS; # no longer used because function moved to GosaSupportDaemon.pm : rettenbe : 16.05.2008
use File::Basename;
use File::Spec;
+use Fcntl;
# Workaround: need pure perl to make it work with UTF-8 :-(
$XML::Simple::PREFERRED_PARSER= "XML::SAX::PurePerl";
-my $client_version = '$HeadURL$:$Rev$';
my $client_headURL;
my $client_revision;
my $client_status;
my (%cfg_defaults, $foreground, $verbose, $pid_file, $procid, $pid, $log_file, $fai_logpath);
my ($server_ip, $server_port, $server_timeout, $server_domain, $server_key_lifetime);
my ($client_port, $ldap_enabled, $ldap_config, $pam_config, $nss_config);
+my ($root_uid, $adm_gid);
my $xml;
my $event_hash;
my $default_server_key;
my @servers;
my $gotoHardwareChecksum;
-my $gosa_si_client_fifo;
-my %files_to_watch;
+my $system_com;
$verbose= 1;
# globalise variables which are used in imported events
our $client_dnsname;
our $client_force_hostname;
our $server_key;
+our $terminal_server_hash;
# default variables
our $REGISTERED = 0;
# path to fifo for non-gosa-si-client messages to gosa-si-server
-$gosa_si_client_fifo = "/var/run/gosa-si-client.socket";
-%files_to_watch = (fifo => $gosa_si_client_fifo);
+my $fai_com_fifo = "/var/run/gosa-si-client.socket";
+my $system_com_fifo = "/var/run/gosa-si-client-system-com.socket";
+my %files_to_watch = (fai_fifo => $fai_com_fifo, system_fifo => $system_com_fifo);
# in function register_at_gosa_si_server, after which period of seconds a new registration should be tried if a registration was
# not successful until now
my $delay_set_time = 10;
our $prg= basename($0);
-# all x seconds the client reports logged_in users to gosa-si-server
+# all n seconds the client reports logged_in users to gosa-si-server
my $trigger_logged_in_users_report_delay = 600;
+# all n seconds the client reports messages seen by user
+my $trigger_seen_messages_delay = 30;
+
# directory where all log files from installation are stored
-my $fai_log_dir = "/tmp/fai";
+my $fai_log_dir = "/var/log/fai";
%cfg_defaults = (
"general" =>
{"port" => [\$client_port, "20083"],
"ip" => [\$client_ip, "0.0.0.0"],
"mac-address" => [\$client_mac_address, "00:00:00:00:00:00"],
- "server-domain" => [\$server_domain, ""],
+ "server-domain" => [\$server_domain, ""],
"ldap" => [\$ldap_enabled, 1],
"ldap-config" => [\$ldap_config, "/etc/ldap/ldap.conf"],
"pam-config" => [\$pam_config, "/etc/pam_ldap.conf"],
"nss-config" => [\$nss_config, "/etc/libnss-ldap.conf"],
- "fai-logpath" => [\$fai_logpath, "/var/log/fai/fai.log"],
- "force-hostname" => [\$client_force_hostname, "false"],
+ "fai-logpath" => [\$fai_logpath, "/var/log/fai/fai.log"],
+ "force-hostname" => [\$client_force_hostname, "false"],
+ "system-com" => [\$system_com, "disabled"],
},
"server" => {
"ip" => [\$server_ip, "127.0.0.1"],
#=== FUNCTIONS = functions =====================================================
+sub usage {
+ print STDERR << "EOF" ;
+usage: $prg [-hvf] [-c config]
+
+ -h : this (help) message
+ -c <file> : config file
+ -f : foreground, process will not be forked to background
+ -v : be verbose (multiple to increase verbosity)
+
+EOF
+ print "\n" ;
+}
+
#=== FUNCTION ================================================================
# NAME: check_cmdline_param
# PARAMETERS:
}
-#=== FUNCTION ================================================================
-# NAME: read_configfile
-# PARAMETERS: cfg_file - string -
-# RETURNS:
-# DESCRIPTION:
-#===============================================================================
-sub read_configfile {
- my ($cfg_file, %cfg_defaults) = @_ ;
- my $cfg;
- if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
- if( -r $cfg_file ) {
- $cfg = Config::IniFiles->new( -file => $cfg_file );
- } else {
- print STDERR "Couldn't read config file!";
- }
- } else {
- $cfg = Config::IniFiles->new() ;
- }
- foreach my $section (keys %cfg_defaults) {
- foreach my $param (keys %{$cfg_defaults{ $section }}) {
- my $pinfo = $cfg_defaults{ $section }{ $param };
- ${@$pinfo[ 0 ]} = $cfg->val( $section, $param, @$pinfo[ 1 ] );
- }
- }
-}
-
-
#=== FUNCTION ================================================================
# NAME: check_pid
# PARAMETERS:
if(not defined $msg) { return }
if(not defined $level) { $level = 1 }
if(defined $log_file){
- open(LOG_HANDLE, ">>$log_file");
- chmod 0600, $log_file;
- if(not defined open( LOG_HANDLE, ">>$log_file" )) {
- print STDERR "cannot open $log_file: $!";
- return
- }
+ my $open_log_fh = sysopen(LOG_HANDLE, $log_file, O_WRONLY | O_CREAT | O_APPEND , 0440);
+ if(not $open_log_fh) {
+ print STDERR "cannot open $log_file: $!";
+ return;
+ }
+ # check owner and group of log_file and update settings if necessary
+ my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($log_file);
+ if((not $uid eq $root_uid) || (not $gid eq $adm_gid)) {
+ chown($root_uid, $adm_gid, $log_file);
+ }
+
chomp($msg);
if($level <= $verbose){
my ($seconds, $minutes, $hours, $monthday, $month,
my $server_ip= shift;
my $result= "00:00:00:00:00:00";
+ if($server_ip =~ /^[a-z][a-z0-9\.]+/i) {
+ my $ip_address = inet_ntoa(scalar gethostbyname($server_ip));
+ if(defined($ip_address) && $ip_address =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/) {
+ # Write ip address to $server_ip variable
+ $server_ip = $ip_address;
+ }
+ }
+
if($server_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
my $PROC_NET_ROUTE= ('/proc/net/route');
return $result;
}
-sub get_local_ip_for_remote_ip {
- my $server_ip= shift;
- my $result="0.0.0.0";
-
- if($server_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
- if($server_ip eq "127.0.0.1") {
- $result="127.0.0.1";
- } else {
- my $PROC_NET_ROUTE= ('/proc/net/route');
-
- open(PROC_NET_ROUTE, "<$PROC_NET_ROUTE")
- or die "Could not open $PROC_NET_ROUTE";
-
- my @ifs = <PROC_NET_ROUTE>;
-
- close(PROC_NET_ROUTE);
-
- # Eat header line
- shift @ifs;
- chomp @ifs;
- foreach my $line(@ifs) {
- my ($Iface,$Destination,$Gateway,$Flags,$RefCnt,$Use,$Metric,$Mask,$MTU,$Window,$IRTT)=split(/\s/, $line);
- my $destination;
- my $mask;
- my ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Destination);
- $destination= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
- ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Mask);
- $mask= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
- if(new NetAddr::IP($server_ip)->within(new NetAddr::IP($destination, $mask))) {
- # destination matches route, save mac and exit
- $result= &get_ip($Iface);
- last;
- }
- }
- }
- } else {
- daemon_log("get_local_ip_for_remote_ip was called with a non-ip parameter: $server_ip", 1);
- }
- return $result;
-}
-
sub generate_hw_digest {
my $hw_data;
}
-# moved to GosaSupportDaemon: rettenbe, 19.05.2008
-#sub create_passwd {
-# my $new_passwd = "";
-# for(my $i=0; $i<31; $i++) {
-# $new_passwd .= ("a".."z","A".."Z",0..9)[int(rand(62))]
-# }
-#
-# return $new_passwd;
-#}
-
-
sub create_ciphering {
my ($passwd) = @_;
if((!defined($passwd)) || length($passwd)==0) {
}
-# moved to GosaSupportDaemon: rettenbe: 16.05.2008
-#sub get_server_addresses {
-# my $domain= shift;
-# my @result;
-#
-# my $error = 0;
-# my $res = Net::DNS::Resolver->new;
-# my $query = $res->send("_gosa-si._tcp.".$domain, "SRV");
-# my @hits;
-#
-# if ($query) {
-# foreach my $rr ($query->answer) {
-# push(@hits, $rr->target.":".$rr->port);
-# }
-# }
-# else {
-# #warn "query failed: ", $res->errorstring, "\n";
-# $error++;
-# }
-#
-# if( $error == 0 ) {
-# foreach my $hit (@hits) {
-# my ($hit_name, $hit_port) = split(/:/, $hit);
-# chomp($hit_name);
-# chomp($hit_port);
-#
-# my $address_query = $res->send($hit_name);
-# if( 1 == length($address_query->answer) ) {
-# foreach my $rr ($address_query->answer) {
-# push(@result, $rr->address.":".$hit_port);
-# }
-# }
-# }
-# }
-#
-# return @result;
-#}
-
-
#=== FUNCTION ================================================================
# NAME: send_msg_hash_to_target
# PARAMETERS: msg_hash - hash - xml_hash created with function create_xml_hash
if( $msg_header ) { $msg_header = "'$msg_header'-"; }
else { $msg_header = ""; }
+ # Memorize own source address
+ $msg =~ /<source>(\S+)<\/source>/;
+ my $own_source_address = $1;
+
# encrypt xml msg
my $crypted_msg = &encrypt_msg($msg, $encrypt_key);
# opensocket
my $socket = &open_socket($address);
if( !$socket ) {
- daemon_log("ERROR: cannot send ".$msg_header."msg to $address , host not reachable", 1);
+ daemon_log("WARNING: cannot send ".$msg_header."msg to '$address', host not reachable", 3);
if ($REGISTERED == 1) {
$REGISTERED = 0; # if server is not available, cause reregistering
daemon_log("INFO: cause reregistering at gosa-si-server", 5);
# send xml msg
if( $error == 0 ) {
- print $socket $crypted_msg."\n";
+ print $socket $crypted_msg.";$own_source_address\n";
daemon_log("INFO: send ".$msg_header."msg to $address", 5);
daemon_log("DEBUG: message:\n$msg", 9);
}
# Check if our ip is resolvable - if not: don't try to register
my $ip= &get_local_ip_for_remote_ip(sprintf("%s", $server =~ /^([0-9\.]*?):.*$/));
my $dnsname= gethostbyaddr(inet_aton($ip), AF_INET);
- if(!defined($dnsname)) {
- &write_to_file("goto-error-dns:$ip", $fai_logpath);
- exit(1);
- }
+ if(!defined($dnsname)) {
+ if( defined($client_force_hostname) && $client_force_hostname eq "true") {
+ $dnsname = `hostname`;
+ } else {
+ &write_to_file("goto-error-dns:$ip", $fai_logpath);
+ &main::daemon_log("ERROR: ip is not resolvable, no registration possible. Write 'goto-error-dns:$ip' to $fai_logpath", 1);
+ exit(1);
+ }
+ }
# create registration msg
my $local_ip = &get_local_ip_for_remote_ip(sprintf("%s", $server =~ /^([0-9\.]*?):.*$/));
}
-#sub import_events {
-#
-# if (not -e $event_dir) {
-# daemon_log("ERROR: cannot find directory or directory is not readable: $event_dir", 1);
-# }
-# opendir (DIR, $event_dir) or die "ERROR while loading gosa-si-events from directory $event_dir : $!\n";
-#
-# while (defined (my $event = readdir (DIR))) {
-# if( $event eq "." || $event eq ".." ) { next; }
-# daemon_log("INFO: found event module: $event", 5);
-# eval{ require $event; };
-# if( $@ ) {
-# daemon_log("ERROR: import of event module '$event' failed", 1);
-# daemon_log("$@", 1);
-# next;
-# }
-#
-# $event =~ /(\S*?).pm$/;
-# my $event_module = $1;
-# my $events_l = eval( $1."::get_events()") ;
-# foreach my $event_name (@{$events_l}) {
-# $event_hash->{$event_name} = $event_module;
-# }
-#
-# }
-#
-# my @all_events = keys %$event_hash;
-# my $all_events_string = join(", ", @all_events);
-#
-# daemon_log("INFO: imported events: $all_events_string", 5);
-#}
-
sub trigger_new_key {
my ($kernel) = $_[KERNEL] ;
}
}
+sub trigger_set_terminal_server
+{
+ # Function is defined in load_reporter.pm
+ if (exists $event_hash->{set_terminal_server})
+ {
+ no strict 'refs';
+ &{$event_hash->{set_terminal_server}."::set_terminal_server"};
+ }
+ else
+ {
+ &daemon_log("0 ERROR: load_reporter.pm needs function set_terminal_server to write terminal server load information to client. Processing aborted!", 1);
+ }
+ return;
+}
+
+sub trigger_seen_messages {
+ my ($kernel) = $_[KERNEL] ;
+
+ # Select all files under /tmp with prefix 'goto_notify'
+ my $goto_dir = "/tmp";
+ opendir(DIR, $goto_dir);
+ my @goto_files = grep { /.+\.goto_notify$/ && -f "$goto_dir/$_" } readdir(DIR);
+ closedir DIR;
+
+ # Check if file has 'seen' tag
+ foreach my $goto_file (@goto_files) {
+ open(FILE, "$goto_dir/$goto_file");
+ my @lines = <FILE>;
+ close FILE;
+
+ my $source;
+ my $target;
+ my $usr;
+ my $subject;
+ my $message;
+ my $seen = 0;
+ chomp(@lines);
+ foreach my $line (@lines) {
+ if ($line =~ /^source:([\S\s]*)$/) {
+ $source = $1
+ }
+ if ($line =~ /^target:([\S\s]*)$/) {
+ $target = $1;
+ }
+ if ($line =~ /^usr:([\S\s]*)$/) {
+ $usr = $1;
+ }
+ if ($line =~ /^subject:([\S\s]*)$/) {
+ $subject = $1;
+ }
+ if ($line =~ /^message:([\S\s]*)$/) {
+ $message = $1;
+ }
+ if ($line =~ /^seen$/) {
+ $seen++;
+ }
+ }
+
+ # Send 'confirm_usr_msg' back to msg-hosting server
+ if ($seen) {
+ my %data = ('usr'=>$usr, 'subject'=>$subject, 'message'=>$message);
+ my $confirm_msg = &build_msg("confirm_usr_msg", $target, $source, \%data);
+ my $send_error = &send_msg_to_target($confirm_msg, $server_address, $server_key);
+
+ # Delete file
+ if (not $send_error) {
+ system("rm $goto_dir/$goto_file");
+ }
+ }
+ }
+
+ $kernel->delay_set('trigger_seen_messages', $trigger_seen_messages_delay);
+
+ return;
+}
+
sub generic_file_error {
my ( $heap, $operation, $errno, $error_string, $wheel_id ) =
}
-sub fifo_got_record {
+sub fai_fifo_got_record {
my $file_record = $_[ARG0];
my $header;
my $content = "";
my $clmsg_hash = &create_xml_hash("CLMSG_$header", $client_address, $server_address, $content);
&add_content2xml_hash($clmsg_hash, "macaddress", $client_mac_address);
+ my $utc_ts = &main::get_utc_time();
+ &add_content2xml_hash($clmsg_hash, "timestamp", $utc_ts);
my $clmsg = &create_xml_string($clmsg_hash);
&send_msg_to_target($clmsg, $server_address, $server_key, "CLMSG_$header");
}
+sub system_fifo_got_record {
+ my ($kernel, $socket_com_record) = @_[KERNEL, ARG0];
+ $socket_com_record =~ /^(\S+)\s?([\s\S]*)$/;
+ my $function = $1;
+ my $content = $2;
+
+ if( exists $event_hash->{$function} )
+ {
+ # a event exists with the header as name
+ daemon_log("INFO: found event '$function' at event-module '".$event_hash->{$function}."'", 5);
+ no strict 'refs';
+ my $answer = &{$event_hash->{$function}."::$function"}($content, $kernel);
+ &post_processing_and_sending($answer)
+ }
+ else
+ {
+ daemon_log("ERROR: Got input '$socket_com_record' from socket '$system_com_fifo'", 1);
+ daemon_log("ERROR: No event '$function' found in event modules under '$event_dir'.", 1);
+ }
+
+# # Sanity check of fifo record
+#
+# # Create record message
+# my $lr_msg_hash = &create_xml_hash("load_report", $client_address, $server_address, $file_record);
+# &add_content2xml_hash($lr_msg_hash, "macaddress", $client_mac_address);
+# my $utc_ts = &main::get_utc_time();
+# &add_content2xml_hash($lr_msg_hash, "timestamp", $utc_ts);
+# my $lr_msg = &create_xml_string($lr_msg_hash);
+#
+# # Report message to si-server
+# &send_msg_to_target($lr_msg, $server_address, $server_key, "load_report");
+
+ return;
+}
+
+
sub save_fai_log {
my ($fai_log_dir) = @_ ;
my $FAI_DIR;
- opendir($FAI_DIR, $fai_log_dir);
- if (not defined $FAI_DIR) {
- daemon_log("ERROR: can not open directory $fai_log_dir: $!", 1);
- return;
+ # Directory for log files after a softupdate
+ my $log_dir = File::Spec->catdir($fai_log_dir, "localhost/last");
+
+ if (not -d $log_dir) {
+ # Directory for log files after a new installation
+ $log_dir = "/tmp/fai";
+ if (not -d $log_dir) {
+ daemon_log("ERROR: cannot open directory $log_dir", 1);
+ return;
+ }
}
+ opendir($FAI_DIR, "$log_dir");
my @log_files = readdir($FAI_DIR);
closedir($FAI_DIR);
- my @log_list;
+ my @log_list;
foreach my $log_file (@log_files) {
if( $log_file eq "." || $log_file eq ".." ) { next; }
+
my $log = "log_file:$log_file:";
- $log_file = File::Spec->catfile( $fai_log_dir, $log_file );
- open(my $FILE, "<$log_file");
- if (not defined $FILE ) {
- daemon_log("ERROR: can not open '$log_file': $!", 1);
+ $log_file = File::Spec->catfile( $log_dir, $log_file );
+
+ if (not -f $log_file) {
+ daemon_log("ERROR: cannot read $log_file", 1);
next;
}
- my @lines = <$FILE>;
+
+ open(FILE, "<$log_file");
+ my @lines = <FILE> ;
+ close (FILE);
my $log_string = join("", @lines);
$log .= &encode_base64($log_string);
push(@log_list, $log);
- close ($FILE);
}
my $all_log_string = join("\n", @log_list);
}
+sub sig_handler {
+ my ($kernel, $signal) = @_[KERNEL, ARG0] ;
+ daemon_log("0 INFO got signal '$signal'", 1);
+ $kernel->sig_handled();
+ return;
+}
+
+
sub _start {
my ($kernel, $heap) = @_[KERNEL, HEAP];
$kernel->alias_set('client_session');
$global_kernel = $kernel; # this is used to throw events at each point of the skript
-
+
+ $kernel->sig(USR1 => "sig_handler");
+
# force a registration at a gosa-si-server
$kernel->yield('register_at_gosa_si_server');
my $watcher = POE::Wheel::FollowTail->new(
Filename => $file,
InputEvent => $name."_record",
- # ResetEvent => "file_reset",
ErrorEvent => "file_error",
);
-# $heap->{tail} = POE::Wheel::Run->new(
-# Program => [ "/usr/bin/tail", "-f", $file ],
-# StdoutEvent => $file_name."_record",
-# );
$heap->{services}->{ $watcher->ID } = $name;
$heap->{watchers}->{ $watcher->ID } = $watcher;
}
$kernel->yield('trigger_logged_in_users_report');
+ $kernel->yield('trigger_seen_messages');
}
my $error = 0;
my $answer;
-
daemon_log("INFO: Incoming msg from '$remote_ip'", 5);
daemon_log("DEBUG: Incoming msg:\n$input\n", 9);
- my ($msg, $msg_hash) = &check_key_and_xml_validity($input, $server_key);
+ # Cut of ip and port from msgs tail
+ my ($encrypted_msg, $msg_source) = split(/;/, $input);
+
+ my ($msg, $msg_hash) = &check_key_and_xml_validity($encrypted_msg, $server_key);
if( (!$msg) || (!$msg_hash) ) {
daemon_log("WARNING: Deciphering of incoming msg failed", 3);
if($server_address =~ /$remote_ip/) {
# if client is alread in a registration process, that means not registered, do nothing
# if not, cause re-registration
+# TODO : This if-else can cause a registration deadlock. Currently I can not reproduce the deadlock and don't have a clue what is the reason for the deadlock
if (not $REGISTERED) {
&daemon_log("WARNING: gosa-si-client is already in a registration process so ignore this message", 3);
} else {
########
# answer
- if( $answer ) {
-
- #check gosa-si envelope validity
- my $answer_hash = &check_outgoing_xml_validity($answer);
-
- if( $answer_hash ) {
- # answer is valid
-
- # preprocessing
- if( $answer =~ "<header>registered</header>") {
- # set registered flag to true to stop sending further registered msgs
- $REGISTERED = 1;
- }
- else {
- $answer =~ /<header>(\S+)<\/header>/;
- &send_msg_to_target($answer, $server_address, $server_key, $1);
- }
+ &post_processing_and_sending($answer);
- # postprocessing
- if( $answer =~ "<header>new_key</header>") {
- # set new key to global variable
- $answer =~ /<new_key>(\S*?)<\/new_key>/;
- my $new_key = $1;
- $server_key = $new_key;
- }
- }
+ return;
+}
- }
+sub post_processing_and_sending
+{
+ my ($answer) = @_ ;
- return;
+ # Do nothing if answer does not exists
+ if (not defined $answer) { return; }
+
+ # Check gosa-si envelope validity
+ my $answer_hash = &check_outgoing_xml_validity($answer);
+
+ if( $answer_hash )
+ {
+ # Answer is valid
+ # Pre-sending
+ if( $answer =~ "<header>registered</header>")
+ {
+ # Set registered flag to true to stop sending further registered msgs
+ $REGISTERED = 1;
+ }
+ else
+ {
+ $answer =~ /<header>(\S+)<\/header>/;
+ &send_msg_to_target($answer, $server_address, $server_key, $1);
+ }
+
+ # Post-sending
+ if( $answer =~ "<header>new_key</header>")
+ {
+ # Set new key to global variable
+ $answer =~ /<new_key>(\S*?)<\/new_key>/;
+ my $new_key = $1;
+ $server_key = $new_key;
+ }
+ }
+
+ return;
}
$client_status = "developmental" ;
}
+# Determine root uid and adm gid, used for creating log files
+$root_uid = getpwnam('root');
+$adm_gid = getgrnam('adm');
+if(not defined $adm_gid){
+ $adm_gid = getgrnam('root');
+}
+
daemon_log(" ", 1);
daemon_log("$prg started!", 1);
daemon_log("INFO: status: $client_status", 1);
@@ -1180,14 +1222,17 @@ daemon_log("INFO: gosa-si-client mac address detected: $client_mac_address", 1);
# import events
my ($error, $result, $tmp_hash) = &import_events($event_dir);
-$event_hash = $tmp_hash;
-if ($error == 0) {
- foreach my $log_line (@$result) {
- daemon_log("DEBUG: $log_line", 7);
+while (my ($module, $mod_event_hash) = each %$tmp_hash) {
+ while (my ($event_name, $nothing) = each %$mod_event_hash) {
+ $event_hash->{$event_name} = $module;
}
-} else {
- foreach my $log_line (@$result) {
- daemon_log("ERROR: $log_line", 1);
+}
+
+foreach my $log_line (@$result) {
+ if ($log_line =~ / succeed: /) {
+ &main::daemon_log("0 DEBUG: $log_line", 7);
+ } else {
+ &main::daemon_log("0 ERROR: $log_line", 1);
}
}
@@ -1208,38 +1253,41 @@ daemon_log("INFO: start socket for incoming xml messages at port '$client_port'
# prepare variables
if( inet_aton($server_ip) ){ $server_ip = inet_ntoa(inet_aton($server_ip)); }
-############################################################
-# to change
-#if( $server_ip eq "127.0.1.1" ) { $server_ip = "127.0.0.1" }
-############################################################
if (defined $server_ip && defined $server_port) {
$server_address = $server_ip.":".$server_port;
}
$xml = new XML::Simple();
$default_server_key = $server_key;
-
# add gosa-si-server address from config file at first position of server list
my $server_check_cfg = Config::IniFiles->new( -file => $cfg_file );
my $server_check = (defined($server_check_cfg))?$server_check_cfg->val( "server", "ip"):undef;
if( defined $server_check ) {
unshift(@servers, $server_address);
my $servers_string = join(", ", @servers);
- daemon_log("INFO: found servers in configuration file: $servers_string", 5);
+ daemon_log("INFO: found servers in configuration file: $servers_string", 1);
} else {
my @tmp_servers;
if ( !$server_domain) {
# Try our DNS Searchlist
- for my $domain(get_dns_domains()) {
+ my @domain_list = &get_dns_domains();
+ my $tmp_domains;
+ my $error_string;
+ for my $domain (@domain_list) {
chomp($domain);
- my @tmp_domains= &get_server_addresses($domain);
- if(@tmp_domains) {
- for my $tmp_server(@tmp_domains) {
+ ($tmp_domains, $error_string) = &get_server_addresses($domain);
+ if(@$tmp_domains) {
+ for my $tmp_server(@$tmp_domains) {
push @tmp_servers, $tmp_server;
}
}
}
- if(@tmp_servers && length(@tmp_servers)==0) {
+ if (0 == @tmp_servers) {
+ my $log_string = "no gosa-si-server found!";
+ $log_string .= "\n\tdetermined domains out of /etc/resolv.conf: ".join(", ", @domain_list) if (@domain_list);
+ $log_string .= "\n\tdetermined server addresses in domains: ".join(", ",@$tmp_domains) if (defined($tmp_domains));
+ daemon_log("ERROR: $log_string", 1) if (defined($log_string));
+ daemon_log("ERROR: $error_string", 1) if (defined($error_string));
daemon_log("ERROR: please specify a gosa-si-server address or a domain in config file", 1);
kill 2, $$;
}
}
}
- foreach my $server (@tmp_servers) {
- unshift(@servers, $server);
- }
- my $servers_string = join(", ", @servers);
- daemon_log("INFO: found servers in DNS: $servers_string", 5);
+ foreach my $server (@tmp_servers) {
+ unshift(@servers, $server);
+ }
+ my $servers_string = join(", ", @servers);
+ daemon_log("INFO: found servers in DNS: $servers_string", 1);
}
-# open fifo for non-gosa-si-client-msgs to gosa-si-server
-POSIX::mkfifo("$gosa_si_client_fifo", "0600");
+# Open a new fifo for FAI messages to gosa-si-server
+if (-p $fai_com_fifo) { unlink $fai_com_fifo }
+POSIX::mkfifo("$fai_com_fifo", "0600");
+# Open a new fifo for system communication,
+if (-p $system_com_fifo) { unlink $system_com_fifo }
+if ($system_com eq "enabled")
+{
+ POSIX::mkfifo("$system_com_fifo", "0600");
+}
POE::Session->create(
inline_states => {
_start => \&_start,
_default => \&_default,
+ sig_handler => \&sig_handler,
register_at_gosa_si_server => \®ister_at_gosa_si_server,
# trigger periodical tasks
trigger_new_key => \&trigger_new_key,
trigger_logged_in_users_report => \&trigger_logged_in_users_report,
+ trigger_seen_messages => \&trigger_seen_messages,
+
+ # trigger non periodical tasks
+ trigger_set_terminal_server => \&trigger_set_terminal_server,
# handle records from each defined file differently
- fifo_record => \&fifo_got_record,
+ fai_fifo_record => \&fai_fifo_got_record,
+ system_fifo_record => \&system_fifo_got_record,
# handle file resets and errors the same way for each file
file_reset => \&generic_file_reset,