X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=893ccfb3656f2e10c4df5f1adea880c4bf6a6cad;hb=4eeb0d22bb703e4dbbe4bd34349e5e8d8fc816c5;hp=2da5c1e563073954dddf3582609a32fc15fc2c21;hpb=cae17300d5ad195a55ce8c54bf7d84b8d4467092;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 2da5c1e56..893ccfb36 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -20,12 +20,12 @@ # REVISION: --- #=============================================================================== + use strict; use warnings; use Getopt::Long; use Config::IniFiles; use POSIX; -use utf8; use Fcntl; use IO::Socket::INET; @@ -41,6 +41,8 @@ use Sys::Syslog qw( :DEFAULT setlogsock); use Cwd; use File::Spec; use File::Basename; +use File::Find; +use File::Copy; use File::Path; use GOSA::DBsqlite; use GOSA::GosaSupportDaemon; @@ -51,9 +53,16 @@ use Net::LDAP::Util qw(:escape); my $modules_path = "/usr/lib/gosa-si/modules"; use lib "/usr/lib/gosa-si/modules"; +# TODO es gibt eine globale funktion get_ldap_handle +# - ist in einer session dieses ldap handle schon vorhanden, wird es zurückgegeben +# - ist es nicht vorhanden, wird es erzeugt, im heap für spätere ldap anfragen gespeichert und zurückgegeben +# - sessions die kein ldap handle brauchen, sollen auch keins haben +# - wird eine session geschlossen, muss das ldap verbindung vorher beendet werden +our $global_kernel; + my (%cfg_defaults, $foreground, $verbose, $ping_timeout); my ($bus_activ, $bus, $msg_to_bus, $bus_cipher); -my ($server, $server_mac_address); +my ($server); my ($gosa_server, $job_queue_timeout, $job_queue_loop_delay); my ($known_modules); my ($pid_file, $procid, $pid, $log_file); @@ -61,6 +70,9 @@ my ($arp_activ, $arp_fifo); my ($xml); my $sources_list; my $max_clients; +my %repo_files=(); +my $repo_path; +my %repo_dirs=(); # variables declared in config file are always set to 'our' our (%cfg_defaults, $log_file, $pid_file, $server_ip, $server_port, $SIPackages_key, @@ -70,6 +82,7 @@ our (%cfg_defaults, $log_file, $pid_file, # additional variable which should be globaly accessable our $server_address; +our $server_mac_address; our $bus_address; our $gosa_address; our $no_bus; @@ -77,7 +90,8 @@ our $no_arp; our $verbose; our $forground; our $cfg_file; -our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password ); +#our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn); +our ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn); # specifies the verbosity of the daemon_log @@ -100,8 +114,16 @@ our $prg= basename($0); our $job_db; our $job_queue_tn = 'jobs'; my $job_queue_file_name; -my @job_queue_col_names = ("id INTEGER", "timestamp", "status", "result", "progress INTEGER", - "headertag", "targettag", "xmlmessage", "macaddress"); +my @job_queue_col_names = ("id INTEGER", + "timestamp", + "status DEFAULT 'none'", + "result DEFAULT 'none'", + "progress DEFAULT 'none'", + "headertag DEFAULT 'none'", + "targettag DEFAULT 'none'", + "xmlmessage DEFAULT 'none'", + "macaddress DEFAULT 'none'", + ); # holds all other gosa-sd as well as the gosa-sd-bus our $known_server_db; @@ -146,8 +168,10 @@ my $messaging_file_name; # path to directory to store client install log files our $client_fai_log_dir = "/var/log/fai"; -# queue which stores taskes while max_clients are reached +# queue which stores taskes until one of the $max_children children are ready to process the task my @tasks = qw(); +my $max_children = 2; + %cfg_defaults = ( "general" => { @@ -166,6 +190,7 @@ my @tasks = qw(); "packages-list" => [\$packages_list_file_name, '/var/lib/gosa-si/packages.db'], "messaging" => [\$messaging_file_name, '/var/lib/gosa-si/messaging.db'], "source-list" => [\$sources_list, '/etc/apt/sources.list'], + "repo-path" => [\$repo_path, '/srv/www/repository'], "ldap-uri" => [\$ldap_uri, ""], "ldap-base" => [\$ldap_base, ""], "ldap-admin-dn" => [\$ldap_admin_dn, ""], @@ -405,19 +430,20 @@ sub import_modules { sub sig_int_handler { my ($signal) = @_; - if(defined($ldap_handle)) { - $ldap_handle->disconnect; - } +# if (defined($ldap_handle)) { +# $ldap_handle->disconnect; +# } + # TODO alle verbliebenden ldap verbindungen aus allen heaps beenden + daemon_log("shutting down gosa-si-server", 1); - exit(0); + system("killall gosa-si-server"); } $SIG{INT} = \&sig_int_handler; - sub check_key_and_xml_validity { - my ($crypted_msg, $module_key) = @_; + my ($crypted_msg, $module_key, $session_id) = @_; my $msg; my $msg_hash; my $error_string; @@ -425,7 +451,8 @@ sub check_key_and_xml_validity { $msg = &decrypt_msg($crypted_msg, $module_key); if ($msg =~ //i){ - daemon_log("decrypted_msg: \n$msg", 8); + $msg =~ s/\s+/ /g; # just for better daemon_log + daemon_log("$session_id DEBUG: decrypted_msg: \n$msg", 8); $msg_hash = $xml->XMLin($msg, ForceArray=>1); ############## @@ -454,7 +481,7 @@ sub check_key_and_xml_validity { } }; if($@) { - daemon_log("WARNING: do not understand the message: $@", 5); + daemon_log("$session_id DEBUG: do not understand the message: $@", 7); $msg = undef; $msg_hash = undef; } @@ -527,7 +554,7 @@ sub check_outgoing_xml_validity { sub input_from_known_server { - my ($input, $remote_ip) = @_ ; + my ($input, $remote_ip, $session_id) = @_ ; my ($msg, $msg_hash, $module); my $sql_statement= "SELECT * FROM known_server"; @@ -539,13 +566,13 @@ sub input_from_known_server { next; } my $host_key = $hit->{hostkey}; - daemon_log("DEBUG: input_from_known_server: host_name: $host_name", 7); + daemon_log("$session_id DEBUG: input_from_known_server: host_name: $host_name", 7); daemon_log("DEBUG: input_from_known_server: host_key: $host_key", 7); # check if module can open msg envelope with module key - my ($tmp_msg, $tmp_msg_hash) = &check_key_and_xml_validity($input, $host_key); + my ($tmp_msg, $tmp_msg_hash) = &check_key_and_xml_validity($input, $host_key, $session_id); if( (!$tmp_msg) || (!$tmp_msg_hash) ) { - daemon_log("DEBUG: input_from_known_server: deciphering raise error", 7); + daemon_log("$session_id DEBUG: input_from_known_server: deciphering raise error", 7); daemon_log("$@", 8); next; } @@ -558,7 +585,7 @@ sub input_from_known_server { } if( (!$msg) || (!$msg_hash) || (!$module) ) { - daemon_log("DEBUG: Incoming message is not from a known server", 7); + daemon_log("$session_id DEBUG: Incoming message is not from a known server", 7); } return ($msg, $msg_hash, $module); @@ -566,7 +593,7 @@ sub input_from_known_server { sub input_from_known_client { - my ($input, $remote_ip) = @_ ; + my ($input, $remote_ip, $session_id) = @_ ; my ($msg, $msg_hash, $module); my $sql_statement= "SELECT * FROM known_clients"; @@ -577,14 +604,14 @@ sub input_from_known_client { next; } my $host_key = $hit->{hostkey}; - &daemon_log("DEBUG: input_from_known_client: host_name: $host_name", 7); - &daemon_log("DEBUG: input_from_known_client: host_key: $host_key", 7); + &daemon_log("$session_id DEBUG: input_from_known_client: host_name: $host_name", 7); + &daemon_log("$session_id DEBUG: input_from_known_client: host_key: $host_key", 7); # check if module can open msg envelope with module key - ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key); + ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key, $session_id); if( (!$msg) || (!$msg_hash) ) { - &daemon_log("DEGUG: input_from_known_client: deciphering raise error", 7); + &daemon_log("$session_id DEGUG: input_from_known_client: deciphering raise error", 7); &daemon_log("$@", 8); next; } @@ -595,7 +622,7 @@ sub input_from_known_client { } if( (!$msg) || (!$msg_hash) || (!$module) ) { - &daemon_log("DEBUG: Incoming message is not from a known client", 7); + &daemon_log("$session_id DEBUG: Incoming message is not from a known client", 7); } return ($msg, $msg_hash, $module); @@ -604,7 +631,7 @@ sub input_from_known_client { sub input_from_unknown_host { no strict "refs"; - my ($input) = @_ ; + my ($input, $session_id) = @_ ; my ($msg, $msg_hash, $module); my $error_string; @@ -618,13 +645,13 @@ sub input_from_unknown_host { if( $mod eq 'ArpHandler' ) { next; } - daemon_log("ERROR: no key specified in config file for $mod", 1); + daemon_log("$session_id ERROR: no key specified in config file for $mod", 1); next; } - daemon_log("DEBUG: $mod: $module_key", 7); + daemon_log("$session_id DEBUG: $mod: $module_key", 7); # check if module can open msg envelope with module key - ($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key); + ($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key, $session_id); if( (not defined $msg) || (not defined $msg_hash) ) { next; } @@ -635,7 +662,7 @@ sub input_from_unknown_host { } if( (!$msg) || (!$msg_hash) || (!$module)) { - daemon_log("DEBUG: Incoming message is not from an unknown host", 7); + daemon_log("$session_id DEBUG: Incoming message is not from an unknown host", 7); } return ($msg, $msg_hash, $module); @@ -818,7 +845,7 @@ sub get_local_ip_for_remote_ip { sub send_msg_to_target { - my ($msg, $address, $encrypt_key, $msg_header) = @_ ; + my ($msg, $address, $encrypt_key, $msg_header, $session_id) = @_ ; my $error = 0; my $header; my $new_status; @@ -843,7 +870,7 @@ sub send_msg_to_target { # opensocket my $socket = &open_socket($address); if( !$socket ) { - daemon_log("ERROR: cannot send ".$header."msg to $address , host not reachable", 1); + daemon_log("$session_id ERROR: cannot send ".$header."msg to $address , host not reachable", 1); $error++; } @@ -851,8 +878,8 @@ sub send_msg_to_target { # send xml msg print $socket $crypted_msg."\n"; - daemon_log("INFO: send ".$header."msg to $address", 5); - daemon_log("message:\n$msg", 8); + daemon_log("$session_id INFO: send ".$header."msg to $address", 5); + #daemon_log("DEBUG: message:\n$msg", 9); } @@ -873,14 +900,14 @@ sub send_msg_to_target { if( $act_status eq "down" ) { $sql_statement = "DELETE FROM known_clients WHERE hostname='$address'"; $res = $known_clients_db->del_dbentry($sql_statement); - daemon_log("WARNING: failed 2x to send msg to host '$address', delete host from known_clients", 3); + daemon_log("$session_id WARNING: failed 2x to send msg to host '$address', delete host from known_clients", 3); } else { $sql_statement = "UPDATE known_clients SET status='$new_status' WHERE hostname='$address'"; $res = $known_clients_db->update_dbentry($sql_statement); if($new_status eq "down"){ - daemon_log("WARNING: set '$address' from status '$act_status' to '$new_status'", 3); + daemon_log("$session_id WARNING: set '$address' from status '$act_status' to '$new_status'", 3); } else { - daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5); + daemon_log("$session_id INFO: set '$address' from status '$act_status' to '$new_status'", 5); } } } @@ -893,16 +920,16 @@ sub send_msg_to_target { if( $act_status eq "down" ) { $sql_statement = "DELETE FROM known_server WHERE hostname='$address'"; $res = $known_server_db->del_dbentry($sql_statement); - daemon_log("WARNING: failed 2x to a send msg to host '$address', delete host from known_server", 3); + daemon_log("$session_id WARNING: failed 2x to a send msg to host '$address', delete host from known_server", 3); } else { $sql_statement = "UPDATE known_server SET status='$new_status' WHERE hostname='$address'"; $res = $known_server_db->update_dbentry($sql_statement); if($new_status eq "down"){ - daemon_log("WARNING: set '$address' from status '$act_status' to '$new_status'", 3); + daemon_log("$session_id WARNING: set '$address' from status '$act_status' to '$new_status'", 3); } else { - daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5); + daemon_log("$session_id INFO: set '$address' from status '$act_status' to '$new_status'", 5); } } } @@ -914,16 +941,18 @@ sub update_jobdb_status_for_send_msgs { my ($answer, $error) = @_; if( $answer =~ /(\d+)<\/jobdb_id>/ ) { my $jobdb_id = $1; + + # sending msg faild if( $error ) { if (not $answer =~ /
trigger_action_reinstall<\/header>/) { - # sending msg faild my $sql_statement = "UPDATE $job_queue_tn ". "SET status='error', result='can not deliver msg, please consult log file' ". "WHERE id='$jobdb_id'"; my $res = $job_db->update_dbentry($sql_statement); } + + # sending msg was successful } else { - # sending msg was successful my $sql_statement = "UPDATE $job_queue_tn ". "SET status='done' ". "WHERE id='$jobdb_id' AND status='processed'"; @@ -935,14 +964,23 @@ sub update_jobdb_status_for_send_msgs { sub _start { my ($kernel) = $_[KERNEL]; &trigger_db_loop($kernel); + $global_kernel = $kernel; $kernel->yield('create_fai_server_db', $fai_server_tn ); $kernel->yield('create_fai_release_db', $fai_release_tn ); + $kernel->sig(USR1 => "sig_handler"); +} + +sub sig_handler { + my ($kernel, $signal) = @_[KERNEL, ARG0] ; + daemon_log("0 INFO got signal '$signal'", 1); + $kernel->sig_handled(); + return; } sub next_task { my ($session, $heap) = @_[SESSION, HEAP]; - while ( keys( %{ $heap->{task} } ) < $max_clients ) { + while ( keys( %{ $heap->{task} } ) < $max_children ) { my $next_task = shift @tasks; last unless defined $next_task; @@ -969,7 +1007,10 @@ sub handle_task_result { $heap = $session_reference->get_heap(); } } - $heap->{'client'}->put($client_answer); + + if(exists $heap->{'client'}) { + $heap->{'client'}->put($client_answer); + } } $kernel->sig(CHLD => "child_reap"); } @@ -996,36 +1037,49 @@ sub process_task { my $client_answer = ""; daemon_log("", 5); - daemon_log("INFO: Incoming msg with session ID $session_id from '".$heap->{'remote_ip'}."'", 5); - daemon_log("DEBUG: Incoming msg:\n$input", 9); + daemon_log("$session_id INFO: Incoming msg with session ID $session_id from '".$heap->{'remote_ip'}."'", 5); + daemon_log("$session_id DEBUG: Incoming msg:\n$input", 9); #################### # check incoming msg # msg is from a new client or gosa - ($msg, $msg_hash, $module) = &input_from_unknown_host($input); + ($msg, $msg_hash, $module) = &input_from_unknown_host($input, $session_id); # msg is from a gosa-si-server or gosa-si-bus if(( !$msg ) || ( !$msg_hash ) || ( !$module )){ - ($msg, $msg_hash, $module) = &input_from_known_server($input, $heap->{'remote_ip'}); + ($msg, $msg_hash, $module) = &input_from_known_server($input, $heap->{'remote_ip'}, $session_id); } # msg is from a gosa-si-client if(( !$msg ) || ( !$msg_hash ) || ( !$module )){ - ($msg, $msg_hash, $module) = &input_from_known_client($input, $heap->{'remote_ip'}); + ($msg, $msg_hash, $module) = &input_from_known_client($input, $heap->{'remote_ip'}, $session_id); } # an error occurred if(( !$msg ) || ( !$msg_hash ) || ( !$module )){ + # if an incoming msg could not be decrypted (maybe a wrong key), send client a ping. If the client + # could not understand a msg from its server the client cause a re-registering process + daemon_log("$session_id INFO cannot understand incoming msg, send 'ping'-msg to all host with ip '".$heap->{remote_ip}."' to cause a re-registering of the client if necessary", 5); + my $sql_statement = "SELECT * FROM $main::known_clients_tn WHERE (hostname LIKE '".$heap->{'remote_ip'}."%')"; + my $query_res = $known_clients_db->select_dbentry( $sql_statement ); + while( my ($hit_num, $hit) = each %{ $query_res } ) { + my $host_name = $hit->{'hostname'}; + my $host_key = $hit->{'hostkey'}; + my $ping_msg = "
gosa_ping
$server_address $host_name"; + my $error = &send_msg_to_target($ping_msg, $host_name, $host_key, "gosa_ping", $session_id); + &update_jobdb_status_for_send_msgs($ping_msg, $error); + } $error++; } ###################### # process incoming msg if( $error == 0) { - daemon_log("INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]."'", 5); - daemon_log("DEBUG: Processing module ".$module, 7); + daemon_log("$session_id INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]. + "' from '".$heap->{'remote_ip'}."'", 5); + daemon_log("$session_id DEBUG: Processing module ".$module, 7); $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $session_id); if ( 0 < @{$answer_l} ) { my $answer_str = join("\n", @{$answer_l}); - daemon_log("DEBUG: $module: Got answer from module: \n".$answer_str,8); + daemon_log("$session_id DEBUG: $module: Got answer from module: \n".$answer_str,8); } } if( !$answer_l ) { $error++ }; @@ -1058,7 +1112,7 @@ sub process_task { while( my ($hit_num, $hit) = each %{ $query_res } ) { my $host_name = $hit->{hostname}; my $host_key = $hit->{hostkey}; - my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header); + my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id); &update_jobdb_status_for_send_msgs($answer, $error); } } @@ -1072,14 +1126,14 @@ sub process_task { my $host_name = $hit->{hostname}; my $host_key = $hit->{hostkey}; $answer =~ s/KNOWN_SERVER/$host_name/g; - my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header); + my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id); &update_jobdb_status_for_send_msgs($answer, $error); } } # target of msg is GOsa elsif( $answer_target eq "GOSA" ) { - my $session_id = ($1) if $answer =~ s/(\d+?)<\/session_id>//; + my $session_id = ($1) if $answer =~ /(\d+?)<\/session_id>/; my $add_on = ""; if( defined $session_id ) { $add_on = ".session_id=$session_id"; @@ -1094,35 +1148,35 @@ sub process_task { $answer =~ /
(\S+)<\/header>/; my $header; if( defined $1 ) { $header = $1; } - my $error = &send_msg_to_target($answer, $server_address, $GosaPackages_key, $header); + my $error = &send_msg_to_target($answer, $server_address, $GosaPackages_key, $header, $session_id); &update_jobdb_status_for_send_msgs($answer, $error); } # target of msg is a mac address elsif( $answer_target =~ /^([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})$/i ) { - daemon_log("INFO: target is mac address '$answer_target', looking for host in known_clients", 5); - my $sql_statement = "SELECT * FROM known_clients WHERE macaddress='$answer_target'"; + daemon_log("$session_id INFO: target is mac address '$answer_target', looking for host in known_clients", 5); + my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$answer_target'"; my $query_res = $known_clients_db->select_dbentry( $sql_statement ); my $found_ip_flag = 0; while( my ($hit_num, $hit) = each %{ $query_res } ) { my $host_name = $hit->{hostname}; my $host_key = $hit->{hostkey}; $answer =~ s/$answer_target/$host_name/g; - daemon_log("INFO: found host '$host_name', associated to '$answer_target'", 5); - my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header); + daemon_log("$session_id INFO: found host '$host_name', associated to '$answer_target'", 5); + my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id); &update_jobdb_status_for_send_msgs($answer, $error); $found_ip_flag++ ; } if( $found_ip_flag == 0) { - daemon_log("WARNING: no host found in known_clients with mac address '$answer_target'", 3); + daemon_log("$session_id WARNING: no host found in known_clients with mac address '$answer_target'", 3); if( $bus_activ eq "true" ) { - daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5); + daemon_log("$session_id INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5); my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'"; my $query_res = $known_server_db->select_dbentry( $sql_statement ); while( my ($hit_num, $hit) = each %{ $query_res } ) { my $bus_address = $hit->{hostname}; my $bus_key = $hit->{hostkey}; - my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header); + my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header, $session_id); &update_jobdb_status_for_send_msgs($answer, $error); last; } @@ -1136,27 +1190,27 @@ sub process_task { my $encrypt_key = &get_encrypt_key($answer_target); if( not defined $encrypt_key ) { # unknown target, forward msg to bus - daemon_log("WARNING: unknown target '$answer_target'", 3); + daemon_log("$session_id WARNING: unknown target '$answer_target'", 3); if( $bus_activ eq "true" ) { - daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5); + daemon_log("$session_id INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5); my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'"; my $query_res = $known_server_db->select_dbentry( $sql_statement ); my $res_length = keys( %{$query_res} ); if( $res_length == 0 ){ - daemon_log("WARNING: send '$answer_header' to '$bus_address' failed, ". + daemon_log("$session_id WARNING: send '$answer_header' to '$bus_address' failed, ". "no bus found in known_server", 3); } else { while( my ($hit_num, $hit) = each %{ $query_res } ) { my $bus_key = $hit->{hostkey}; - my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header); + my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header,$session_id ); &update_jobdb_status_for_send_msgs($answer, $error); } } } next; } - my $error = &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header); + my $error = &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header,$session_id); &update_jobdb_status_for_send_msgs($answer, $error); } } @@ -1211,30 +1265,21 @@ sub watch_for_new_jobs { my $jobdb_id = $hit->{id}; my $macaddress = $hit->{'macaddress'}; my $job_msg = $hit->{'xmlmessage'}; - daemon_log("DEBUG: its time to execute $job_msg", 7); - my $header = $hit->{'headertag'}; + daemon_log("J DEBUG: its time to execute $job_msg", 7); my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'"; my $res_hash = $known_clients_db->select_dbentry( $sql_statement ); # expect macaddress is unique!!!!!! my $target = $res_hash->{1}->{hostname}; - if (not defined $target) { - &daemon_log("ERROR: no host found for mac address: $macaddress", 1); - &daemon_log("$hit->{xmlmessage}", 8); - my $sql_statement = "UPDATE $job_queue_tn ". - "SET status='error', result='no host found for mac address' ". - "WHERE id='$jobdb_id'"; - my $res = $job_db->update_dbentry($sql_statement); - next; - } - # change header $job_msg =~ s/
job_/
gosa_/; # add sqlite_id $job_msg =~ s/<\/xml>$/$jobdb_id<\/jobdb_id><\/xml>/; - my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header); + $job_msg =~ /
(\S+)<\/header>/; + my $header = $1 ; + my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J"); # update status in job queue to 'processing' $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id='$jobdb_id'"; @@ -1245,43 +1290,44 @@ sub watch_for_new_jobs { } -sub refresh_ldap_handle { - my $mesg; +sub get_ldap_handle { + my ($session_id) = @_; + my $heap; + my $ldap_handle; - # Get an ldap handle, if we don't have one - if( ! defined $ldap_handle ){ - $ldap_handle = Net::LDAP->new( $ldap_uri ); - } - # Still not defined? - if( ! defined $ldap_handle ) { - daemon_log( "ch $$: Net::LDAP constructor failed: $!\n" ); - return 0; - } + if (not defined $session_id ) { $session_id = 0 }; - # Bind to ldap server - eventually authenticate - if( defined $ldap_admin_dn ) { - if( defined $ldap_admin_password ) { - $mesg = $ldap_handle->bind( $ldap_admin_dn, password => $ldap_admin_password ); - } else { - $mesg = $ldap_handle->bind( $ldap_admin_dn ); - } - } else { - $mesg = $ldap_handle->bind(); - } + if ($session_id == 0) { + daemon_log("$session_id DEBUG: get_ldap_handle invoked without a session_id, create a new ldap_handle", 7); + $ldap_handle = Net::LDAP->new( $ldap_uri ); + $ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password); - if( 0 != $mesg->code ) { - undef( $ldap_handle ) if( 81 == $mesg->code ); - daemon_log( "ch $$: LDAP bind: error (". $mesg->code . ') - ' . $mesg->error . "\n", 1); - return 0; - } + } else { + my $session_reference = $global_kernel->ID_id_to_session($session_id); + if( defined $session_reference ) { + $heap = $session_reference->get_heap(); + } + + if (not defined $heap) { + daemon_log("$session_id DEBUG: cannot get heap for session_id '$session_id'", 7); + return; + } - return 1; + # TODO: This "if" is nonsense, because it doesn't prove that the + # used handle is still valid - or if we've to reconnect... + #if (not exists $heap->{ldap_handle}) { + $ldap_handle = Net::LDAP->new( $ldap_uri ); + $ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password); + $heap->{ldap_handle} = $ldap_handle; + #} + } + return $ldap_handle; } sub change_fai_state { - my ($st, $targets) = @_; - + my ($st, $targets, $session_id) = @_; + $session_id = 0 if not defined $session_id; # Set FAI state to localboot my %mapActions= ( reboot => '', @@ -1292,29 +1338,32 @@ sub change_fai_state { wake => '', memcheck => 'memcheck', sysinfo => 'sysinfo', + install => 'install', ); # Return if this is unknown if (!exists $mapActions{ $st }){ + daemon_log("$session_id ERROR: unknown action '$st', can not translate ot FAIstate", 1); return; } my $state= $mapActions{ $st }; - &refresh_ldap_handle(); + my $ldap_handle = &get_ldap_handle($session_id); if( defined($ldap_handle) ) { # Build search filter for hosts - my $search= "(&(objectClass=GOhard)"; - foreach (@{$targets}){ - $search.= "(macAddress=$_)"; - } - $search.= ")"; + my $search= "(&(objectClass=GOhard)"; + foreach (@{$targets}){ + $search.= "(macAddress=$_)"; + } + $search.= ")"; # If there's any host inside of the search string, procress them - if (!($search =~ /macAddress/)){ - return; - } + if (!($search =~ /macAddress/)){ + daemon_log("$session_id ERROR: no macAddress found in filter statement for LDAP search: '$search'", 1); + return; + } # Perform search for Unit Tag my $mesg = $ldap_handle->search( @@ -1327,11 +1376,9 @@ sub change_fai_state { if ($mesg->count) { my @entries = $mesg->entries; foreach my $entry (@entries) { - # Only modify entry if it is not set to '$state' if ($entry->get_value("FAIstate") ne "$state"){ - - daemon_log("INFO: Setting FAIstate to '$state' for ".$entry->dn, 5); + daemon_log("$session_id INFO: Setting FAIstate to '$state' for ".$entry->dn, 5); my $result; my %tmp = map { $_ => 1 } $entry->get_value("objectClass"); if (exists $tmp{'FAIobject'}){ @@ -1350,23 +1397,30 @@ sub change_fai_state { # Errors? if ($result->code){ - daemon_log("Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1); + daemon_log("$session_id Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1); } - } + } else { + daemon_log("$session_id DEBUG FAIstate at host '$_' already at state '$st'", 7); + } } } + # if no ldap handle defined + } else { + daemon_log("$session_id ERROR: no LDAP handle defined for update FAIstate", 1); } + } sub change_goto_state { - my ($st, $targets) = @_; + my ($st, $targets, $session_id) = @_; + $session_id = 0 if not defined $session_id; # Switch on or off? my $state= $st eq 'active' ? 'active': 'locked'; - &refresh_ldap_handle(); + my $ldap_handle = &get_ldap_handle($session_id); if( defined($ldap_handle) ) { # Build search filter for hosts @@ -1396,14 +1450,14 @@ sub change_goto_state { # Only modify entry if it is not set to '$state' if ($entry->get_value("gotoMode") ne $state){ - daemon_log("INFO: Setting gotoMode to '$state' for ".$entry->dn, 5); + daemon_log("$session_id INFO: Setting gotoMode to '$state' for ".$entry->dn, 5); my $result; $result= $ldap_handle->modify($entry->dn, changes => [ replace => [ gotoMode => $state ] ]); # Errors? if ($result->code){ - &daemon_log("Error: Setting gotoMode to '$state' for ".$entry->dn. "failed: ".$result->error, 1); + &daemon_log("$session_id Error: Setting gotoMode to '$state' for ".$entry->dn. "failed: ".$result->error, 1); } } @@ -1415,9 +1469,9 @@ sub change_goto_state { sub create_fai_server_db { - my ($table_name) = @_; + my ($table_name, $kernel) = @_; my $result; - + my $ldap_handle = &get_ldap_handle(); if(defined($ldap_handle)) { daemon_log("INFO: create_fai_server_db: start", 5); my $mesg= $ldap_handle->search( @@ -1447,18 +1501,19 @@ sub create_fai_server_db { } } daemon_log("INFO: create_fai_server_db: finished", 5); - } - - # Now we can create the packages list - $kernel->yield('create_packages_list_db'); + # TODO: Find a way to post the 'create_packages_list_db' event + &create_packages_list_db($ldap_handle); + } + + $ldap_handle->disconnect; return $result; } sub run_create_fai_server_db { - my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0]; + my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0]; my $task = POE::Wheel::Run->new( - Program => sub { &create_fai_server_db($table_name) }, + Program => sub { &create_fai_server_db($table_name,$kernel) }, StdoutEvent => "session_run_result", StderrEvent => "session_run_debug", CloseEvent => "session_run_done", @@ -1473,6 +1528,7 @@ sub create_fai_release_db { my ($table_name) = @_; my $result; + my $ldap_handle = &get_ldap_handle(); if(defined($ldap_handle)) { daemon_log("INFO: create_fai_release_db: start",5); my $mesg= $ldap_handle->search( @@ -1487,7 +1543,7 @@ sub create_fai_release_db { my @sql_list; my $timestamp= &get_time(); foreach my $ou (@{$mesg->{entries}}) { - my $tmp_classes= resolve_fai_classes($ou->dn); + my $tmp_classes= resolve_fai_classes($ou->dn, $ldap_handle); if(defined($tmp_classes) && ref($tmp_classes) eq 'HASH') { my @tmp_array=get_fai_release_entries($tmp_classes); if(@tmp_array) { @@ -1516,7 +1572,7 @@ sub create_fai_release_db { } daemon_log("INFO: create_fai_release_db: finished",5); } - + $ldap_handle->disconnect; return $result; } sub run_create_fai_release_db { @@ -1566,8 +1622,8 @@ sub get_fai_state { } sub resolve_fai_classes { + my ($fai_base, $ldap_handle) = @_; my $result; - my $fai_base= shift; my @possible_fai_classes= ("FAIscript", "FAIhook", "FAIpartitionTable", "FAItemplate", "FAIvariable", "FAIprofile", "FAIpackageList"); my $fai_filter= "(|(&(objectClass=FAIclass)(|(objectClass=".join(")(objectClass=", @possible_fai_classes).")))(objectClass=FAIbranch))"; my $fai_classes; @@ -1771,28 +1827,49 @@ sub session_run_done { } sub create_sources_list { - my $result=""; - - my $query_result= $fai_server_db->select_dbentry('SELECT * FROM '.$fai_server_tn); - if($query_result) { - my $fh; - $result= '/tmp/gosa_si_tmp_sources_list'; - open($fh, ">$result") or return undef; - while (my ($hit_num, $hit) = each %{$query_result}) { - my $line = "deb ".$hit->{'server'}." ".$hit->{'release'}; - my $sections= $hit->{'sections'}; - $sections =~ s/,/ /g; - $line.= " $sections"; - print $fh $line."\n"; + my ($ldap_handle) = @_; + my $result="/tmp/gosa_si_tmp_sources_list"; + + # Remove old file + if(stat($result)) { + unlink($result); + } + + my $fh; + open($fh, ">$result") or return undef; + if(defined($ldap_server_dn) and length($ldap_server_dn) > 0) { + my $mesg=$ldap_handle->search( + base => $ldap_server_dn, + scope => 'base', + attrs => 'FAIrepository', + filter => 'objectClass=FAIrepositoryServer' + ); + if($mesg->count) { + foreach my $entry(@{$mesg->{'entries'}}) { + my ($server, $tag, $release, $sections)= split /\|/, $entry->get_value('FAIrepository'); + my $line = "deb $server $release"; + $sections =~ s/,/ /g; + $line.= " $sections"; + print $fh $line."\n"; + } } - close($fh); } + close($fh); return $result; } sub create_packages_list_db { - my ($sources_file) = @_ || &create_sources_list; + my ($ldap_handle, $sources_file) = @_ ; + + if (not defined $ldap_handle) { + daemon_log("0 ERROR: no ldap_handle available to create_packages_list_db", 1); + return; + } + if (not defined $sources_file) { + $sources_file = &create_sources_list($ldap_handle); + } + my $line; daemon_log("INFO: create_packages_list_db: start", 5); @@ -1831,29 +1908,33 @@ sub create_packages_list_db { daemon_log("INFO: create_packages_list_db: finished", 5); return; } + sub run_create_packages_list_db { - my ($session, $heap, $sources_list) = @_[SESSION, HEAP, ARG0]; + my ($session, $heap) = @_[SESSION, HEAP]; my $task = POE::Wheel::Run->new( Program => sub {&create_packages_list_db}, StdoutEvent => "session_run_result", StderrEvent => "session_run_debug", CloseEvent => "session_run_done", ); - $heap->{task}->{ $task->ID } = $task; } + sub parse_package_info { my ($baseurl, $dist, $section)= @_; my ($package); my ($path) = ($baseurl =~ m%://[^/]*(.*)$%); + $repo_dirs{ "${repo_path}/pool" } = 1; foreach $package ("Packages.gz"){ daemon_log("DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7); get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section" ); parse_package( "$outdir/$dist/$section", $dist, $path ); } + find(\&cleanup_and_extract, keys( %repo_dirs ) ); } + sub get_package { my ($url, $dest)= @_; @@ -1863,14 +1944,15 @@ sub get_package { # This is ugly, but I've no time to take a look at "how it works in perl" if(0 == system("wget '$url' -O '$dest' 2>/dev/null") ) { system("gunzip -cd '$dest' > '$dest.in'"); - system("rm -f '$dest'"); + unlink($dest); } else { daemon_log("ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1); } return 0; } + sub parse_package { - my ($path, $dist, $srv_path )= @_; + my ($path, $dist, $srv_path)= @_; my ($package, $version, $section, $description); my @sql_list; my $PACKAGES; @@ -1894,7 +1976,7 @@ sub parse_package { # Use empty lines as a trigger if ($line =~ /^\s*$/){ - my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', 'xxx', 'none', '0')"; + my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '', 'none', '0')"; push(@sql_list, $sql); $package = "none"; $version = "none"; @@ -1927,6 +2009,12 @@ sub parse_package { next; } + # Trigger for filename + if ($line =~ /^Filename:\s/){ + my ($filename) = ($line =~ /^Filename: (.*)$/); + store_fileinfo( $package, $filename, $dist, $srv_path, $version, $repo_path ); + next; + } } close( $PACKAGES ); @@ -1935,18 +2023,53 @@ sub parse_package { $packages_list_db->exec_statementlist(\@sql_list); } -# -#sub store_fileinfo { -# my( $package, $file, $dist, $path, $vers ) = @_; -# -# my %fileinfo = ( -# 'package' => $package, -# 'dist' => $dist, -# 'version' => $vers -# ); -# -# $repo_files{ "${srvdir}${path}/$file" } = \%fileinfo; -#} +sub store_fileinfo { + my( $package, $file, $dist, $path, $vers, $srvdir) = @_; + + my %fileinfo = ( + 'package' => $package, + 'dist' => $dist, + 'version' => $vers, + ); + + $repo_files{ "${srvdir}/$file" } = \%fileinfo; +} + +sub cleanup_and_extract { + my $fileinfo = $repo_files{ $File::Find::name }; + + if( defined $fileinfo ) { + + my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d"; + my $sql; + my $package = $fileinfo->{ 'package' }; + my $newver = $fileinfo->{ 'version' }; + + mkpath($dir); + system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" ); + + if( -f "$dir/DEBIAN/templates" ) { + + daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 5); + + my $tmpl= ""; + { + local $/=undef; + open FILE, "$dir/DEBIAN/templates"; + $tmpl = &encode_base64(); + close FILE; + } + rmtree("$dir/DEBIAN/templates"); + + $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';"; + + } else { + $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';"; + } + + my $res= $main::packages_list_db->update_dbentry($sql); + } +} #==== MAIN = main ============================================================== @@ -2001,38 +2124,40 @@ if ($no_bus > 0) { $bus_activ = "false" } - - -# delete old DBsqlite lock files -#unlink('/tmp/gosa_si_lock*'); - # connect to gosa-si job queue +unlink($job_queue_file_name.".si.lock"); $job_db = GOSA::DBsqlite->new($job_queue_file_name); $job_db->create_table($job_queue_tn, \@job_queue_col_names); # connect to known_clients_db +unlink($known_clients_file_name.".si.lock"); $known_clients_db = GOSA::DBsqlite->new($known_clients_file_name); $known_clients_db->create_table($known_clients_tn, \@known_clients_col_names); # connect to known_server_db +unlink($known_server_file_name.".si.lock"); $known_server_db = GOSA::DBsqlite->new($known_server_file_name); $known_server_db->create_table($known_server_tn, \@known_server_col_names); # connect to login_usr_db +unlink($login_users_file_name.".si.lock"); $login_users_db = GOSA::DBsqlite->new($login_users_file_name); $login_users_db->create_table($login_users_tn, \@login_users_col_names); # connect to fai_server_db and fai_release_db +unlink($fai_server_file_name.".si.lock"); $fai_server_db = GOSA::DBsqlite->new($fai_server_file_name); $fai_server_db->create_table($fai_server_tn, \@fai_server_col_names); $fai_server_db->create_table($fai_release_tn, \@fai_release_col_names); # connect to packages_list_db +unlink($packages_list_file_name.".si.lock"); unlink($packages_list_file_name); $packages_list_db = GOSA::DBsqlite->new($packages_list_file_name); $packages_list_db->create_table($packages_list_tn, \@packages_list_col_names); # connect to messaging_db +unlink($messaging_file_name.".si.lock"); $messaging_db = GOSA::DBsqlite->new($messaging_file_name); $messaging_db->create_table($messaging_tn, \@messaging_col_names); @@ -2064,6 +2189,7 @@ daemon_log("start socket for incoming xml messages at port '$server_port' ", 1); POE::Session->create( inline_states => { _start => \&_start, + sig_handler => \&sig_handler, watch_for_new_jobs => \&watch_for_new_jobs, watch_for_done_jobs => \&watch_for_done_jobs, create_packages_list_db => \&run_create_packages_list_db,