X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-client;h=7e38a20830fc145430a63727192149d14df85b35;hb=7a2821ea86076ebecd8fbea137a9c9901073412b;hp=e24b8d1194ef5f6b0b7e0523fb4c928442fe599e;hpb=a4d7d24e99c82e1779929fe15c12ff382d9f736c;p=gosa.git diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client index e24b8d119..7e38a2083 100755 --- a/gosa-si/gosa-si-client +++ b/gosa-si/gosa-si-client @@ -30,7 +30,6 @@ 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); @@ -58,8 +57,7 @@ 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 @@ -73,13 +71,15 @@ 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 @@ -112,6 +112,7 @@ my $fai_log_dir = "/var/log/fai"; "nss-config" => [\$nss_config, "/etc/libnss-ldap.conf"], "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"], @@ -376,6 +377,12 @@ sub generate_hw_digest { 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)); } @@ -456,7 +463,7 @@ sub send_msg_to_target { # opensocket my $socket = &open_socket($address); if( !$socket ) { - daemon_log("WARNING: cannot send ".$msg_header."msg to $address , host not reachable", 3); + 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); @@ -796,6 +803,20 @@ 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] ; @@ -803,7 +824,7 @@ sub trigger_seen_messages { # 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); + my @goto_files = grep { /.+\.goto_notify$/ && -f "$goto_dir/$_" } readdir(DIR); closedir DIR; # Check if file has 'seen' tag @@ -873,7 +894,7 @@ sub generic_file_error { } -sub fifo_got_record { +sub fai_fifo_got_record { my $file_record = $_[ARG0]; my $header; my $content = ""; @@ -906,6 +927,42 @@ 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; @@ -978,13 +1035,8 @@ 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; } @@ -1005,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", 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/) { @@ -1019,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 { @@ -1050,36 +1105,47 @@ sub server_input { ######## # 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 =~ "
registered
") { - # set registered flag to true to stop sending further registered msgs - $REGISTERED = 1; - } - else { - $answer =~ /
(\S+)<\/header>/; - &send_msg_to_target($answer, $server_address, $server_key, $1); - } + &post_processing_and_sending($answer); - # postprocessing - if( $answer =~ "
new_key
") { - # set new key to global variable - $answer =~ /(\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 =~ "
registered
") + { + # Set registered flag to true to stop sending further registered msgs + $REGISTERED = 1; + } + else + { + $answer =~ /
(\S+)<\/header>/; + &send_msg_to_target($answer, $server_address, $server_key, $1); + } + + # Post-sending + if( $answer =~ "
new_key
") + { + # Set new key to global variable + $answer =~ /(\S*?)<\/new_key>/; + my $new_key = $1; + $server_key = $new_key; + } + } + + return; } @@ -1199,7 +1265,6 @@ if (defined $server_ip && defined $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; @@ -1224,10 +1289,10 @@ if( defined $server_check ) { } } 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)); + 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, $$; @@ -1249,9 +1314,16 @@ if( defined $server_check ) { } -# 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 => { @@ -1264,9 +1336,13 @@ POE::Session->create( 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,