X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-client;h=7e38a20830fc145430a63727192149d14df85b35;hb=7a2821ea86076ebecd8fbea137a9c9901073412b;hp=a966c1a819f5dfd7ade57aa808a1c5909890eb2b;hpb=b9bf255a8cdde98c3f66a1b46ca5afd016089a5c;p=gosa.git

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index a966c1a81..7e38a2083 100755
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -18,6 +18,8 @@
 #     REVISION:  ---
 #===============================================================================
 
+my $client_version = '$HeadURL$:$Rev$';
+
 use strict;
 use warnings;
 use Getopt::Long;
@@ -28,20 +30,18 @@ use Time::HiRes qw( gettimeofday );
 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;
@@ -49,18 +49,19 @@ my $event_dir = "/usr/lib/gosa-si/client/events";
 use lib "/usr/lib/gosa-si/client/events";
 
 my (%cfg_defaults, $foreground, $verbose, $pid_file, $procid, $pid, $log_file, $fai_logpath);
-my ($server_ip, $server_port, $server_key, $server_timeout, $server_domain, $server_key_lifetime);
-my ($client_ip, $client_port, $client_mac_address, $ldap_enabled, $ldap_config, $pam_config, $nss_config);
+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 $default_server_key;
 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 $global_kernel;
 our $cfg_file;
 our $opts_file;
 our $server_address;
@@ -70,24 +71,29 @@ our $client_mac_address;
 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" =>
@@ -99,13 +105,14 @@ my $fai_log_dir = "/tmp/fai";
     {"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"],
@@ -120,6 +127,19 @@ my $fai_log_dir = "/tmp/fai";
 
 #=== 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: 
@@ -145,33 +165,6 @@ sub check_cmdline_param () {
 }
 
 
-#===  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:
@@ -239,69 +232,45 @@ $SIG{INT} = \&sig_int_handler;
 #  DESCRIPTION: 
 #===============================================================================
 sub daemon_log {
-    # log into log_file
+# log into log_file
     my( $msg, $level ) = @_;
     if(not defined $msg) { return }
     if(not defined $level) { $level = 1 }
     if(defined $log_file){
-        open(LOG_HANDLE, ">>$log_file");
-        if(not defined open( LOG_HANDLE, ">>$log_file" )) {
-            print STDERR "cannot open $log_file: $!";
-            return }
-            chomp($msg);
-            if($level <= $verbose){
-                my ($seconds, $minutes, $hours, $monthday, $month,
-                        $year, $weekday, $yearday, $sommertime) = localtime(time);
-                $hours = $hours < 10 ? $hours = "0".$hours : $hours;
-                $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
-                $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
-                my @monthnames = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
-                $month = $monthnames[$month];
-                $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
-                $year+=1900;
-
-                my $log_msg = "$month $monthday $hours:$minutes:$seconds $prg $msg\n";
-                print LOG_HANDLE $log_msg;
-                if( $foreground ) { 
-                    print STDERR $log_msg;
-                }
+		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,
+                    $year, $weekday, $yearday, $sommertime) = localtime(time);
+            $hours = $hours < 10 ? $hours = "0".$hours : $hours;
+            $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
+            $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
+            my @monthnames = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
+            $month = $monthnames[$month];
+            $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
+            $year+=1900;
+
+            my $log_msg = "$month $monthday $hours:$minutes:$seconds $prg $msg\n";
+            print LOG_HANDLE $log_msg;
+            if( $foreground ) { 
+                print STDERR $log_msg;
             }
+        }
         close( LOG_HANDLE );
     }
 }
 
 
-#===  FUNCTION  ================================================================
-#         NAME:  get_interfaces 
-#   PARAMETERS:  none
-#      RETURNS:  (list of interfaces) 
-#  DESCRIPTION:  Uses proc fs (/proc/net/dev) to get list of interfaces.
-#===============================================================================
-sub get_interfaces {
-    my @result;
-    my $PROC_NET_DEV= ('/proc/net/dev');
-
-    open(PROC_NET_DEV, "<$PROC_NET_DEV")
-        or die "Could not open $PROC_NET_DEV";
-
-    my @ifs = <PROC_NET_DEV>;
-
-    close(PROC_NET_DEV);
-
-    # Eat first two line
-    shift @ifs;
-    shift @ifs;
-
-    chomp @ifs;
-    foreach my $line(@ifs) {
-        my $if= (split /:/, $line)[0];
-        $if =~ s/^\s+//;
-        push @result, $if;
-    }
-
-    return @result;
-}
-
 #===  FUNCTION  ================================================================
 #         NAME:  get_mac 
 #   PARAMETERS:  interface name (i.e. eth0)
@@ -349,61 +318,6 @@ sub get_mac {
 }
 
 
-#===  FUNCTION  ================================================================
-#         NAME:  get_interface_for_ip
-#   PARAMETERS:  ip address (i.e. 192.168.0.1)
-#      RETURNS:  array: list of interfaces if ip=0.0.0.0, matching interface if found, undef else
-#  DESCRIPTION:  Uses proc fs (/proc/net/dev) to get list of interfaces.
-#===============================================================================
-sub get_interface_for_ip {
-    my $result;
-    my $ip= shift;
-    if ($ip && length($ip) > 0) {
-        my @ifs= &get_interfaces();
-        if($ip eq "0.0.0.0") {
-            $result = "all";
-        } else {
-            foreach (@ifs) {
-                my $if=$_;
-                if(get_ip($if) eq $ip) {
-                    $result = $if;
-                    last;
-                }
-            }       
-        }
-    }       
-    return $result;
-}
-
-
-#===  FUNCTION  ================================================================
-#         NAME:  get_ip 
-#   PARAMETERS:  interface name (i.e. eth0)
-#      RETURNS:  (ip address) 
-#  DESCRIPTION:  Uses ioctl to get ip address directly from system.
-#===============================================================================
-sub get_ip {
-    my $ifreq= shift;
-    my $result= "";
-    my $SIOCGIFADDR= 0x8915;       # man 2 ioctl_list
-        my $proto= getprotobyname('ip');
-
-    socket SOCKET, PF_INET, SOCK_DGRAM, $proto
-        or die "socket: $!";
-
-    if(ioctl SOCKET, $SIOCGIFADDR, $ifreq) {
-        my ($if, $sin)    = unpack 'a16 a16', $ifreq;
-        my ($port, $addr) = sockaddr_in $sin;
-        my $ip            = inet_ntoa $addr;
-
-        if ($ip && length($ip) > 0) {
-            $result = $ip;
-        }
-    }
-
-    return $result;
-}
-
 
 #===  FUNCTION  ================================================================
 #         NAME:  get_local_mac_for_remote_ip
@@ -416,6 +330,14 @@ sub get_local_mac_for_remote_ip {
 	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');
 
@@ -449,67 +371,22 @@ sub get_local_mac_for_remote_ip {
 	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;
 	foreach my $line (split /\n/, `cat /proc/bus/pci/devices`) {
 		$hw_data.= sprintf "%s", $line =~ /[^\s]+\s([^\s]+)\s.*/;
 	}
+        # linux-vserver has no /proc/bus/pci/devices 
+	if ( !$hw_data ) { 
+		foreach my $line (split /\n/, `ifconfig | grep HWaddr`) { 
+			$hw_data.= sprintf "%s", $line =~ /[^\s]+\s([^\s]+)\s.*/; 
+		} 
+	} 
 	return(md5_base64($hw_data));
 }
 
 
-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) {
@@ -551,45 +428,6 @@ sub decrypt_msg {
 }
 
 
-# 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
@@ -615,25 +453,31 @@ sub send_msg_to_target {
     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);
 
-	# xxxxxxxxxxxxxx
-
-	
-
     # 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); 
+            $global_kernel->yield('register_at_gosa_si_server');
+
+        }
         $error++;
     }
     
     # 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", 8);
+        daemon_log("DEBUG: message:\n$msg", 9);
     }
 
     # close socket in any case
@@ -686,7 +530,7 @@ sub open_socket {
     if(not defined $socket) {
         return;
     }
-    &daemon_log("open_socket: $PeerAddr", 7);
+    &daemon_log("DEBUG: open_socket: $PeerAddr", 7);
     return $socket;
 }
 
@@ -715,20 +559,38 @@ sub register_at_gosa_si_server {
 
     	my $events = join( ",", keys %{$event_hash} );
     	while(1) {
-      		# fetch first gosa-si-server from @servers
-			my $server = shift(@servers);
-
-      		# append shifted gosa-si-server at the end of @servers, so looking for servers never stop if
-      		# a registration never occured
-      		push( @servers, $server );
+            $try_to_register++;
+
+ 			# after one complete round through all server, stop trying to register           
+            if( $try_to_register > @servers )  { last; }
+
+            # fetch first gosa-si-server from @servers
+            # append shifted gosa-si-server at the end of @servers, so looking for servers never stop if
+            # a registration never occured
+            my $server = shift(@servers);
+            push( @servers, $server );
+
+            # Check if our ip is resolvable - if not: don't try to register
+			if(!(defined($server) && $server =~ m/^[0-9\.]*?:.*$/)) {
+				&main::daemon_log("ERROR: Server with address '".defined($server)?$server:""."' is invalid!", 1);
+				if (length(@servers) == 1) {
+					&main::daemon_log("ERROR: No valid servers found!", 1);
+					exit(1);
+				}
+			}
 
       		# 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\.]*?):.*$/));
@@ -740,6 +602,7 @@ sub register_at_gosa_si_server {
             &add_content2xml_hash($register_hash, "client_status", $client_status);
             &add_content2xml_hash($register_hash, "client_revision", $client_revision);
 			&add_content2xml_hash($register_hash, "gotoHardwareChecksum", $gotoHardwareChecksum);
+            &add_content2xml_hash($register_hash, "key_lifetime", $server_key_lifetime);
 
 			# Add $HOSTNAME from ENV if force-hostname is set
 			if( defined($client_force_hostname) && $client_force_hostname eq "true") {
@@ -752,11 +615,9 @@ sub register_at_gosa_si_server {
 
       		# send xml hash to server with general server passwd
 			my $res = &send_msg_hash_to_target($register_hash, $server, $default_server_key);
-	  
-			if( $try_to_register >= @servers )  { last; }
 
 	  		# if delivery of registration msg succeed
-			if($res == 0) {
+			if($res eq "0") {
         		# reset try_to_register
 				$try_to_register = 0;
 
@@ -769,14 +630,12 @@ sub register_at_gosa_si_server {
 
 	  		# delivery of registration msg failed	
 			} else {
-				$try_to_register++;
         		# wait 1 sec until trying to register again
 				sleep(1);
 				next;
 			}
 
     } # end of while
-
 	# one circle through all servers finished and no registration succeed
 	if ( $try_to_register >= @servers )  {
 			&write_to_file("gosa-si-no-server-available", $fai_logpath);
@@ -803,7 +662,7 @@ sub check_key_and_xml_validity {
     my $msg_hash;
     eval{
         $msg = &decrypt_msg($crypted_msg, $module_key);
-        &main::daemon_log("decrypted_msg: \n$msg", 8);
+        &main::daemon_log("decrypted_msg: \n$msg", 9);
 
         $msg_hash = $xml->XMLin($msg, ForceArray=>1);
 
@@ -914,38 +773,6 @@ sub check_outgoing_xml_validity {
 }
 
 
-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] ;   
 
@@ -976,14 +803,82 @@ sub trigger_logged_in_users_report {
     }
 }
 
+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_reset {
-#    my ( $heap, $wheel_id ) = @_[ HEAP, ARG0 ];
-#
-#    my $service = $heap->{services}->{$wheel_id};
-#    daemon_log("INFO: '$service' watching reset", 5);
-#    return;
-#}
 
 sub generic_file_error {
     my ( $heap, $operation, $errno, $error_string, $wheel_id ) =
@@ -999,7 +894,7 @@ sub generic_file_error {
 }
 
 
-sub fifo_got_record {
+sub fai_fifo_got_record {
     my $file_record = $_[ARG0];
     my $header;
     my $content = "";
@@ -1018,6 +913,8 @@ sub fifo_got_record {
 
     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");
 
@@ -1030,34 +927,80 @@ sub fifo_got_record {
 }
 
 
+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); 
@@ -1069,10 +1012,21 @@ sub save_fai_log {
 }
 
 
+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');
     
@@ -1081,17 +1035,13 @@ sub _start {
         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');
 }
 
 
@@ -1107,11 +1057,13 @@ sub server_input {
     my $error = 0;
     my $answer;
     
-
     daemon_log("INFO: Incoming msg from '$remote_ip'", 5);
-    daemon_log("DEBUG: Incoming msg:\n$input\n", 8);
+    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/) {
@@ -1121,6 +1073,7 @@ sub server_input {
 
 			# 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 {
@@ -1141,47 +1094,58 @@ sub server_input {
         if( exists $event_hash->{$header} ) {
 
             # a event exists with the header as name
-            daemon_log("DEBUG: found event '$header' at event-module '".$event_hash->{$header}."'", 7);
+            daemon_log("INFO: found event '$header' at event-module '".$event_hash->{$header}."'", 5);
             no strict 'refs';
             $answer = &{$event_hash->{$header}."::$header"}($msg, $msg_hash);
         }
         else {
-            daemon_log("WARNING: no event '$header' found in event modules under $event_dir", 1);
+            daemon_log("WARNING: no event '$header' found in event modules under $event_dir", 3);
         }
     }
 
     ########
     # 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;
 }
 
 
@@ -1239,10 +1203,17 @@ if ($client_headURL =~ /\/tag\// ||
     $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("status: $client_status", 1);
-daemon_log($client_status_hash->{$client_status}.": $client_revision", 1); 
+daemon_log("INFO: status: $client_status", 1);
+daemon_log("INFO: ".$client_status_hash->{$client_status}.": $client_revision", 1); 
 
 # delete old DBsqlite lock files
 system('rm -f /tmp/gosa_si_lock*gosa-si-client*');
@@ -1251,17 +1222,30 @@ system('rm -f /tmp/gosa_si_lock*gosa-si-client*');
 $client_address = $client_ip.":".$client_port;
 my $network_interface= &get_interface_for_ip($client_ip);
 $client_mac_address= &get_mac($network_interface);
-daemon_log("gosa-si-client ip address detected: $client_ip", 1);
-daemon_log("gosa-si-client mac address detected: $client_mac_address", 1);
+daemon_log("INFO: ip address detected: $client_ip", 1);
+daemon_log("INFO: gosa-si-client mac address detected: $client_mac_address", 1);
 
 
 # import events
-&import_events();
+my ($error, $result, $tmp_hash) = &import_events($event_dir);
+while (my ($module, $mod_event_hash) = each %$tmp_hash) {
+    while (my ($event_name, $nothing) = each %$mod_event_hash) {
+        $event_hash->{$event_name} = $module;
+    }
+}
+
+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);
+    }
+}
 
 
 # compute hardware checksum
 $gotoHardwareChecksum= &generate_hw_digest();
-daemon_log("gosa-si-client gotoHardwareChecksum detected: $gotoHardwareChecksum", 1);
+daemon_log("INFO: gotoHardwareChecksum detected: $gotoHardwareChecksum", 1);
 
 
 # create socket for incoming xml messages
@@ -1270,43 +1254,46 @@ POE::Component::Server::TCP->new(
 	Port => $client_port,
 	ClientInput => \&server_input,
 );
-daemon_log("start socket for incoming xml messages at port '$client_port' ", 1);
+daemon_log("INFO: start socket for incoming xml messages at port '$client_port' ", 1);
 
 
 # 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 in DNS for domain: ".join(", ", @domain_list) if (@domain_list);
+                        my $log_string2 = "server addresses in domain: ".join(", ",@$tmp_domains) if (defined($tmp_domains));
+                        daemon_log("ERROR: $log_string", 1) if (defined($log_string));
+                        daemon_log("ERROR: $log_string2", 1) if (defined($log_string2));
+			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, $$;
 		}
@@ -1319,30 +1306,43 @@ if( defined $server_check ) {
 		} 
 	}
 
-    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 => \&register_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,