Updated Strings

[gosa.git] / gosa-si / gosa-si-client

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index abda025bdbc8b80370cec7278cb3dd8e4929500e..cbc3e571952a00d7474b602a6cc4650915c277bd 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -76,6 +76,9 @@ $gosa_si_client_fifo = "/var/run/gosa-si-client.socket";
 my $delay_set_time = 5;
 our $prg= basename($0);
 
+# all x seconds the client reports logged_in users to gosa-si-server
+my $trigger_logged_in_users_report_delay = 600;
+
 %cfg_defaults = (
 "general" =>
     {"log-file"           => [\$log_file, "/var/run/".$prg.".log"],
@@ -598,12 +601,8 @@ sub send_msg_to_target {
     my ($msg, $address, $encrypt_key, $msg_header) = @_ ;
     my $error = 0;
 
-    if( $msg_header ) {
-        $msg_header = "'$msg_header'-";
-    }
-    else {
-        $msg_header = "";
-    }
+    if( $msg_header ) { $msg_header = "'$msg_header'-"; }
+    else { $msg_header = ""; }
 
     # encrypt xml msg
     my $crypted_msg = &encrypt_msg($msg, $encrypt_key);
@@ -615,13 +614,11 @@ sub send_msg_to_target {
         $error++;
     }
     
+    # send xml msg
     if( $error == 0 ) {
-        # send xml msg
         print $socket $crypted_msg."\n";
-
         daemon_log("send ".$msg_header."msg to $address", 1);
         daemon_log("message:\n$msg", 8);
-
     }
 
     # close socket in any case
@@ -902,7 +899,7 @@ sub import_events {
         eval{ require $event; };
         if( $@ ) {
             daemon_log("ERROR: import of event module '$event' failed", 1);
-            daemon_log("$@", 8);
+            daemon_log("$@", 1);
             next;
         }
 
@@ -928,7 +925,34 @@ sub trigger_new_key {
     &send_msg_to_target($msg, $client_address, $server_key, 'new_key');
 
     $kernel->delay_set('trigger_new_key', $server_key_lifetime);
+}
+
+
+sub trigger_logged_in_users_report {
+    my ($kernel) = $_[KERNEL] ;  
+
+    # just do if client is registered already
+    if( $REGISTERED ) {
+        my $result = qx(/usr/bin/w -hs);
+        my @res_lines;
 
+        if( defined $result ) { 
+            chomp($result);
+            @res_lines = split("\n", $result);
+        }
+
+        my @logged_in_user_list;
+        foreach my $line (@res_lines) {
+            chomp($line);
+            my @line_parts = split(/\s+/, $line); 
+            push(@logged_in_user_list, $line_parts[0]);
+        }
+        system("echo 'CURRENTLY_LOGGED_IN ".join(" ", @logged_in_user_list)."' > /var/run/gosa-si-client.socket"); 
+        $kernel->delay_set('trigger_logged_in_users_report', $trigger_logged_in_users_report_delay);
+    } else {
+        # try it in 1 sec again
+        $kernel->delay_set('trigger_logged_in_users_report', 1);
+    }
 }
 
 
@@ -957,6 +981,7 @@ sub fifo_got_record {
     my $file_record = $_[ARG0];
     my $header;
     my $content = "";
+    daemon_log("DEBUG: fifo got record: $file_record", 7); 
 
     $file_record =~ /^(\S+)[ ]?([\s\S]+)?$/;
     if( defined $1 ) {
@@ -972,7 +997,7 @@ 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 $clmsg = &create_xml_string($clmsg_hash);
-    &send_msg_to_target($clmsg, $server_address, $server_key);
+    &send_msg_to_target($clmsg, $server_address, $server_key, "CLMSG_$header");
     return;
 }
 
@@ -995,6 +1020,13 @@ sub _start {
         $heap->{services}->{ $file_watcher->ID } = $file_name;
         $heap->{watchers}->{ $file_watcher->ID } = $file_watcher;
     }
+    $kernel->yield('trigger_logged_in_users_report'); 
+}
+
+
+sub _default {
+    daemon_log("ERROR: can not handle incoming msg with header '$_[ARG0]'", 1);
+    return;
 }
 
 
@@ -1045,7 +1077,8 @@ sub server_input {
                 $REGISTERED = 1;
             } 
             else {
-                &send_msg_to_target($answer, $server_address, $server_key);
+                $answer =~ /<header>(\S+)<\/header>/;
+                &send_msg_to_target($answer, $server_address, $server_key, $1);
             }
 
             # postprocessing
@@ -1080,9 +1113,9 @@ GetOptions("h|help" => \&usage,
 
 # forward error messages to logfile
 if ( ! $foreground ) {
-       open STDIN, '/dev/null' or die "Can’t read /dev/null: $!";
-       open STDOUT, '>>/dev/null' or die "Can't write to /dev/null: $!";
-       open STDERR, '>>/dev/null' or die "Can't write to /dev/null: $!";
+  open( STDIN,  '+>/dev/null' );
+  open( STDOUT, '+>&STDIN'    );
+  open( STDERR, '+>&STDIN'    );
 }
 
 # Just fork, if we are not in foreground mode
@@ -1199,8 +1232,12 @@ POSIX::mkfifo("$gosa_si_client_fifo", "0600");
 POE::Session->create(
        inline_states => {
                _start => \&_start, 
+        _default => \&_default,
         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,
         
         # handle records from each defined file differently
         fifo_record => \&fifo_got_record,