X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=7c689a3229ff41ae765363bc48b7bde0cb41f375;hb=b2cdf619b7566bce0a8b164fd7470d4084082aaa;hp=0f0aa84d4177c9ab3970a5e284df7f628d9208ff;hpb=8fc7262816a9108f721d744c9c81e5a68d065ac6;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 0f0aa84d4..7c689a322 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; @@ -50,17 +52,33 @@ use Net::LDAP::Util qw(:escape); my $modules_path = "/usr/lib/gosa-si/modules"; use lib "/usr/lib/gosa-si/modules"; +my $server_version = '$HeadURL$:$Rev$'; +my $server_headURL; +my $server_revision; +my $server_status; + + +# 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 ($messaging_db_loop_delay); my ($known_modules); my ($pid_file, $procid, $pid, $log_file); 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 +88,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 +96,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 @@ -91,8 +111,10 @@ $ping_timeout = 5; $no_bus = 0; $bus_activ = "true"; - $no_arp = 0; +my $packages_list_under_construction = "/tmp/packages_list_creation_in_progress"; +my @packages_list_statements; +my $watch_for_new_jobs_in_progress = 0; our $prg= basename($0); @@ -100,54 +122,69 @@ 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 PRIMARY KEY", + "timestamp DEFAULT 'none'", + "status DEFAULT 'none'", + "result DEFAULT 'none'", + "progress DEFAULT 'none'", + "headertag DEFAULT 'none'", + "targettag DEFAULT 'none'", + "xmlmessage DEFAULT 'none'", + "macaddress DEFAULT 'none'", + "plainname DEFAULT 'none'", + ); # holds all other gosa-sd as well as the gosa-sd-bus our $known_server_db; our $known_server_tn = "known_server"; my $known_server_file_name; -my @known_server_col_names = ('hostname', 'status', 'hostkey', 'timestamp'); +my @known_server_col_names = ("hostname", "status", "hostkey", "timestamp"); # holds all registrated clients our $known_clients_db; our $known_clients_tn = "known_clients"; my $known_clients_file_name; -my @known_clients_col_names = ('hostname', 'status', 'hostkey', 'timestamp', 'macaddress', 'events'); +my @known_clients_col_names = ("hostname", "status", "hostkey", "timestamp", "macaddress", "events"); # holds all logged in user at each client our $login_users_db; our $login_users_tn = "login_users"; my $login_users_file_name; -my @login_users_col_names = ('client', 'user', 'timestamp'); +my @login_users_col_names = ("client", "user", "timestamp"); # holds all fai server, the debian release and tag our $fai_server_db; our $fai_server_tn = "fai_server"; my $fai_server_file_name; -our @fai_server_col_names = ('timestamp', 'server', 'release', 'sections', 'tag'); +our @fai_server_col_names = ("timestamp", "server", "release", "sections", "tag"); + +our $fai_release_db; our $fai_release_tn = "fai_release"; -our @fai_release_col_names = ('timestamp', 'release', 'class', 'type', 'state'); +my $fai_release_file_name; +our @fai_release_col_names = ("timestamp", "release", "class", "type", "state"); # holds all packages available from different repositories our $packages_list_db; our $packages_list_tn = "packages_list"; my $packages_list_file_name; -our @packages_list_col_names = ('distribution', 'package', 'version', 'section', 'description', 'template', 'timestamp'); +our @packages_list_col_names = ("distribution", "package", "version", "section", "description", "template", "timestamp"); my $outdir = "/tmp/packages_list_db"; my $arch = "i386"; # holds all messages which should be delivered to a user our $messaging_db; our $messaging_tn = "messaging"; -our @messaging_col_names = ('subject', 'from', 'to', 'flag', 'direction', 'delivery_time', 'message', 'timestamp', 'id INTEGER', ); +our @messaging_col_names = ("id INTEGER", "subject", "message_from", "message_to", + "flag", "direction", "delivery_time", "message", "timestamp" ); 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" => { @@ -162,10 +199,12 @@ my @tasks = qw(); "known-clients" => [\$known_clients_file_name, '/var/lib/gosa-si/clients.db' ], "known-servers" => [\$known_server_file_name, '/var/lib/gosa-si/servers.db'], "login-users" => [\$login_users_file_name, '/var/lib/gosa-si/users.db'], - "fai-server" => [\$fai_server_file_name, '/var/lib/gosa-si/fai.db'], + "fai-server" => [\$fai_server_file_name, '/var/lib/gosa-si/fai_server.db'], + "fai-release" => [\$fai_release_file_name, '/var/lib/gosa-si/fai_release.db'], "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, ""], @@ -178,6 +217,7 @@ my @tasks = qw(); "port" => [\$gosa_port, "20082"], "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'], "job-queue-loop-delay" => [\$job_queue_loop_delay, 3], + "messaging-db-loop-delay" => [\$messaging_db_loop_delay, 3], "key" => [\$GosaPackages_key, "none"], }, "SIPackages" => { @@ -216,7 +256,7 @@ EOF #=============================================================================== sub read_configfile { my $cfg; - if( defined( $cfg_file) && ( length($cfg_file) > 0 )) { + if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) { if( -r $cfg_file ) { $cfg = Config::IniFiles->new( -file => $cfg_file ); } else { @@ -253,6 +293,7 @@ sub daemon_log { print STDERR "cannot open $log_file: $!"; return } chomp($msg); + $msg =~s/\n//g; # no newlines are allowed in log messages, this is important for later log parsing if($level <= $verbose){ my ($seconds, $minutes, $hours, $monthday, $month, $year, $weekday, $yearday, $sommertime) = localtime(time); @@ -405,19 +446,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("kill `ps -C gosa-si-server -o pid=`"); } $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 +467,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 +497,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 +570,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 +582,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 +601,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 +609,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 +620,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 +638,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 +647,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 +661,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 +678,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 +861,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 +886,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 +894,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 +916,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 +936,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,19 +957,21 @@ 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'"; + "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'"; + "WHERE id=$jobdb_id AND status='processed'"; my $res = $job_db->update_dbentry($sql_statement); } } @@ -935,14 +980,24 @@ 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"); + $kernel->sig(USR2 => "create_packages_list_db"); +} + +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 +1024,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,37 +1054,53 @@ 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); + } else { + daemon_log("$session_id DEBUG: $module: Got no answer from module!" ,8); } + } if( !$answer_l ) { $error++ }; @@ -1058,7 +1132,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 +1146,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 +1168,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 +1210,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); } } @@ -1179,9 +1253,13 @@ sub process_task { sub trigger_db_loop { my ($kernel) = @_ ; $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay); - $kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay); + $kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay); + $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay); + $kernel->delay_set('watch_for_delivery_messages', $messaging_db_loop_delay); + $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay); } + sub watch_for_done_jobs { my ($kernel,$heap) = @_[KERNEL, HEAP]; @@ -1191,97 +1269,297 @@ sub watch_for_done_jobs { while( my ($id, $hit) = each %{$res} ) { my $jobdb_id = $hit->{id}; - my $sql_statement = "DELETE FROM $job_queue_tn WHERE id='$jobdb_id'"; - my $res = $job_db->del_dbentry($sql_statement); + my $sql_statement = "DELETE FROM $job_queue_tn WHERE id=$jobdb_id"; + my $res = $job_db->del_dbentry($sql_statement); } $kernel->delay_set('watch_for_done_jobs',$job_queue_loop_delay); } + sub watch_for_new_jobs { - my ($kernel,$heap) = @_[KERNEL, HEAP]; + if($watch_for_new_jobs_in_progress == 0) { + $watch_for_new_jobs_in_progress = 1; + my ($kernel,$heap) = @_[KERNEL, HEAP]; + + # check gosa job queue for jobs with executable timestamp + my $timestamp = &get_time(); + my $sql_statement = "SELECT * FROM $job_queue_tn WHERE status='waiting' AND (CAST (timestamp AS INTEGER)) < $timestamp ORDER BY timestamp"; + my $res = $job_db->exec_statement( $sql_statement ); + + # Merge all new jobs that would do the same actions + my @drops; + my $hits; + foreach my $hit (reverse @{$res} ) { + my $macaddress= lc @{$hit}[8]; + my $headertag= @{$hit}[5]; + if( + defined($hits->{$macaddress}) && + defined($hits->{$macaddress}->{$headertag}) && + defined($hits->{$macaddress}->{$headertag}[0]) + ) { + push @drops, "DELETE FROM $job_queue_tn WHERE id = $hits->{$macaddress}->{$headertag}[0]"; + } + $hits->{$macaddress}->{$headertag}= $hit; + } - # check gosa job queue for jobs with executable timestamp - my $timestamp = &get_time(); - my $sql_statement = "SELECT * FROM ".$job_queue_tn. - " WHERE status='waiting' AND timestamp<'$timestamp'"; - my $res = $job_db->select_dbentry( $sql_statement ); + # Delete new jobs with a matching job in state 'processing' + foreach my $macaddress (keys %{$hits}) { + foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) { + my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0]; + if(defined($jobdb_id)) { + my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND headertag='$jobdb_headertag' AND status='processing'"; + my $res = $job_db->exec_statement( $sql_statement ); + foreach my $hit (@{$res}) { + push @drops, "DELETE FROM $job_queue_tn WHERE id=$jobdb_id"; + } + } else { + daemon_log("J ERROR: Job without id exists for macaddress $macaddress!", 1); + } + } + } - while( my ($id, $hit) = each %{$res} ) { - 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'}; - 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; + # Commit deletion + $job_db->exec_statementlist(\@drops); + + # Look for new jobs that could be executed + foreach my $macaddress (keys %{$hits}) { + + # Look if there is an executing job + my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND status='processing'"; + my $res = $job_db->exec_statement( $sql_statement ); + + # Skip new jobs for host if there is a processing job + if(defined($res) and defined @{$res}[0]) { + next; + } + + foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) { + my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0]; + if(defined($jobdb_id)) { + my $job_msg = @{$hits->{$macaddress}->{$jobdb_headertag}}[7]; + + 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}; + + # change header + $job_msg =~ s/
job_/
gosa_/; + + # add sqlite_id + $job_msg =~ s/<\/xml>$/$jobdb_id<\/jobdb_id><\/xml>/; + + $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"; + my $res = $job_db->update_dbentry($sql_statement); +# TODO: abfangen ob alles in ordnung ist oder nicht, wenn nicht error schmeißen + + # We don't want parallel processing + last; + } + } } - # change header - $job_msg =~ s/
job_/
gosa_/; + $watch_for_new_jobs_in_progress = 0; + $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay); + } +} - # 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); +sub watch_for_new_messages { + my ($kernel,$heap) = @_[KERNEL, HEAP]; + my @coll_user_msg; # collection list of outgoing messages + + # check messaging_db for new incoming messages with executable timestamp + my $timestamp = &get_time(); + my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( (CAST(timestamp AS INTEGER))<$timestamp AND flag='n' AND direction='in' )"; + my $res = $messaging_db->exec_statement( $sql_statement ); + foreach my $hit (@{$res}) { + + # create outgoing messages + my $message_to = @{$hit}[3]; + # translate message_to to plain login name + my @message_to_l = split(/,/, $message_to); + my %receiver_h; + foreach my $receiver (@message_to_l) { + if ($receiver =~ /^u_([\s\S]*)$/) { + $receiver_h{$1} = 0; + } elsif ($receiver =~ /^g_([\s\S]*)$/) { +# TODO implement receiver translation + } else { + my $sbjct = &encode_base64(@{$hit}[1]); + my $msg = &encode_base64(@{$hit}[7]); + &daemon_log("M WARNING: unknown receiver '$receiver' for a user-message 'sbjct - msg'", 3); + } + } + my @receiver_l = keys(%receiver_h); + + my $message_id = @{$hit}[0]; + + #add each outgoing msg to messaging_db + my $receiver; + foreach $receiver (@receiver_l) { + my $sql_statement = "INSERT INTO $messaging_tn (id, subject, message_from, message_to, flag, direction, delivery_time, message, timestamp) ". + "VALUES ('". + $message_id."', '". # id + @{$hit}[1]."', '". # subject + @{$hit}[2]."', '". # message_from + $receiver."', '". # message_to + "none"."', '". # flag + "out"."', '". # direction + @{$hit}[6]."', '". # delivery_time + @{$hit}[7]."', '". # message + $timestamp."'". # timestamp + ")"; + &daemon_log("M DEBUG: $sql_statement", 1); + my $res = $messaging_db->exec_statement($sql_statement); + &daemon_log("M INFO: message '".@{$hit}[0]."' is prepared for delivery to receiver '$receiver'", 5); + } - # update status in job queue to 'processing' - $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id='$jobdb_id'"; - my $res = $job_db->update_dbentry($sql_statement); + # set incoming message to flag d=deliverd + $sql_statement = "UPDATE $messaging_tn SET flag='p' WHERE id='$message_id'"; + &daemon_log("M DEBUG: $sql_statement", 7); + $res = $messaging_db->update_dbentry($sql_statement); + &daemon_log("M INFO: message '$message_id' is set to flag 'p' (processed)", 5); } - $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay); + $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay); + return; } +sub watch_for_delivery_messages { + my ($kernel, $heap) = @_[KERNEL, HEAP]; -sub refresh_ldap_handle { - my $mesg; + # select outgoing messages + my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' )"; + #&daemon_log("0 DEBUG: $sql", 7); + my $res = $messaging_db->exec_statement( $sql_statement ); + + # build out msg for each usr + foreach my $hit (@{$res}) { + my $receiver = @{$hit}[3]; + my $msg_id = @{$hit}[0]; + my $subject = @{$hit}[1]; + my $message = @{$hit}[7]; + + # resolve usr -> host where usr is logged in + my $sql = "SELECT * FROM $login_users_tn WHERE (user='$receiver')"; + #&daemon_log("0 DEBUG: $sql", 7); + my $res = $login_users_db->exec_statement($sql); + + # reciver is logged in nowhere + if (not ref(@$res[0]) eq "ARRAY") { next; } + + my $send_succeed = 0; + foreach my $hit (@$res) { + my $receiver_host = @$hit[0]; + &daemon_log("M DEBUG: user '$receiver' is logged in at host '$receiver_host'", 7); + + # fetch key to encrypt msg propperly for usr/host + my $sql = "SELECT * FROM $known_clients_tn WHERE (hostname='$receiver_host')"; + &daemon_log("0 DEBUG: $sql", 7); + my $res = $known_clients_db->exec_statement($sql); + + # host is already down + if (not ref(@$res[0]) eq "ARRAY") { next; } + + # host is on + my $receiver_key = @{@{$res}[0]}[2]; + my %data = ('subject' => $subject, 'message' => $message, 'usr' => $receiver); + my $out_msg = &build_msg("usr_msg", $server_address, $receiver_host, \%data ); + my $error = &send_msg_to_target($out_msg, $receiver_host, $receiver_key, "usr_msg", 0); + if ($error == 0 ) { + $send_succeed++ ; + } + } + + if ($send_succeed) { + # set outgoing msg at db to deliverd + my $sql = "UPDATE $messaging_tn SET flag='d' WHERE (id='$msg_id' AND direction='out' AND message_to='$receiver')"; + &daemon_log("0 DEBUG: $sql", 7); + my $res = $messaging_db->exec_statement($sql); + } + } - # 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; - } + $kernel->delay_set('watch_for_delivery_messages', $messaging_db_loop_delay); + return; +} - # 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 ); + +sub watch_for_done_messages { + my ($kernel,$heap) = @_[KERNEL, HEAP]; + + my $sql = "SELECT * FROM $messaging_tn WHERE (flag='p' AND direction='in')"; + #&daemon_log("0 DEBUG: $sql", 7); + my $res = $messaging_db->exec_statement($sql); + + foreach my $hit (@{$res}) { + my $msg_id = @{$hit}[0]; + + my $sql = "SELECT * FROM $messaging_tn WHERE (id='$msg_id' AND direction='out' AND (NOT flag='s'))"; + #&daemon_log("0 DEBUG: $sql", 7); + my $res = $messaging_db->exec_statement($sql); + + # not all usr msgs have been seen till now + if ( ref(@$res[0]) eq "ARRAY") { next; } + + $sql = "DELETE FROM $messaging_tn WHERE (id='$msg_id')"; + #&daemon_log("0 DEBUG: $sql", 7); + $res = $messaging_db->exec_statement($sql); + } - } else { - $mesg = $ldap_handle->bind(); - } - 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; - } + $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay); + return; +} + + +sub get_ldap_handle { + my ($session_id) = @_; + my $heap; + my $ldap_handle; + + if (not defined $session_id ) { $session_id = 0 }; + if ($session_id =~ /[^0-9]*/) { $session_id = 0 }; + + 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); + + } else { + my $session_reference = $global_kernel->ID_id_to_session($session_id); + if( defined $session_reference ) { + $heap = $session_reference->get_heap(); + } - return 1; + if (not defined $heap) { + daemon_log("$session_id DEBUG: cannot get heap for session_id '$session_id'", 7); + return; + } + + # 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 +1570,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( @@ -1324,49 +1605,53 @@ sub change_fai_state { filter => "$search" ); - 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); - my $result; - my %tmp = map { $_ => 1 } $entry->get_value("objectClass"); - if (exists $tmp{'FAIobject'}){ - if ($state eq ''){ - $result= $ldap_handle->modify($entry->dn, changes => [ - delete => [ FAIstate => [] ] ]); - } else { - $result= $ldap_handle->modify($entry->dn, changes => [ - replace => [ FAIstate => $state ] ]); - } - } elsif ($state ne ''){ - $result= $ldap_handle->modify($entry->dn, changes => [ - add => [ objectClass => 'FAIobject' ], - add => [ FAIstate => $state ] ]); - } - - # Errors? - if ($result->code){ - daemon_log("Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1); - } - - } - } - } + 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("$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'}){ + if ($state eq ''){ + $result= $ldap_handle->modify($entry->dn, changes => [ + delete => [ FAIstate => [] ] ]); + } else { + $result= $ldap_handle->modify($entry->dn, changes => [ + replace => [ FAIstate => $state ] ]); + } + } elsif ($state ne ''){ + $result= $ldap_handle->modify($entry->dn, changes => [ + add => [ objectClass => 'FAIobject' ], + add => [ FAIstate => $state ] ]); + } + + # Errors? + if ($result->code){ + 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 '".$entry->dn."' 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 +1681,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); } } @@ -1414,12 +1699,29 @@ sub change_goto_state { } +sub run_create_fai_server_db { + my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0]; + my $session_id = $session->ID; + my $task = POE::Wheel::Run->new( + Program => sub { &create_fai_server_db($table_name,$kernel, undef, $session_id) }, + StdoutEvent => "session_run_result", + StderrEvent => "session_run_debug", + CloseEvent => "session_run_done", + ); + + $heap->{task}->{ $task->ID } = $task; + return; +} + + sub create_fai_server_db { - my ($table_name, $kernel) = @_; + my ($table_name, $kernel, $dont_create_packages_list, $session_id) = @_; my $result; + if (not defined $session_id) { $session_id = 0; } + my $ldap_handle = &get_ldap_handle(); if(defined($ldap_handle)) { - daemon_log("INFO: create_fai_server_db: start", 5); + daemon_log("$session_id INFO: create_fai_server_db: start", 5); my $mesg= $ldap_handle->search( base => $ldap_base, scope => 'sub', @@ -1446,19 +1748,24 @@ sub create_fai_server_db { } } } - daemon_log("INFO: create_fai_server_db: finished", 5); + daemon_log("$session_id INFO: create_fai_server_db: finished", 5); # TODO: Find a way to post the 'create_packages_list_db' event - &create_packages_list_db(); + if(not defined($dont_create_packages_list)) { + &create_packages_list_db(undef, undef, $session_id); + } } - + + $ldap_handle->disconnect; return $result; } -sub run_create_fai_server_db { - my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0]; + +sub run_create_fai_release_db { + my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0]; + my $session_id = $session->ID; my $task = POE::Wheel::Run->new( - Program => sub { &create_fai_server_db($table_name,$kernel) }, + Program => sub { &create_fai_release_db($table_name, $session_id) }, StdoutEvent => "session_run_result", StderrEvent => "session_run_debug", CloseEvent => "session_run_done", @@ -1470,11 +1777,15 @@ sub run_create_fai_server_db { sub create_fai_release_db { - my ($table_name) = @_; + my ($table_name, $session_id) = @_; my $result; + # used for logging + if (not defined $session_id) { $session_id = 0; } + + my $ldap_handle = &get_ldap_handle(); if(defined($ldap_handle)) { - daemon_log("INFO: create_fai_release_db: start",5); + daemon_log("$session_id INFO: create_fai_release_db: start",5); my $mesg= $ldap_handle->search( base => $ldap_base, scope => 'sub', @@ -1487,7 +1798,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, $session_id); if(defined($tmp_classes) && ref($tmp_classes) eq 'HASH') { my @tmp_array=get_fai_release_entries($tmp_classes); if(@tmp_array) { @@ -1507,30 +1818,20 @@ sub create_fai_release_db { } } } - daemon_log("DEBUG: Inserting ".scalar @sql_list." entries to DB",6); + + daemon_log("$session_id DEBUG: Inserting ".scalar @sql_list." entries to DB",8); if(@sql_list) { + unshift @sql_list, "VACUUM"; unshift @sql_list, "DELETE FROM $table_name"; - $fai_server_db->exec_statementlist(\@sql_list); + $fai_release_db->exec_statementlist(\@sql_list); } - daemon_log("DEBUG: Done with inserting",6); + daemon_log("$session_id DEBUG: Done with inserting",7); } - daemon_log("INFO: create_fai_release_db: finished",5); + daemon_log("$session_id INFO: create_fai_release_db: finished",5); } - + $ldap_handle->disconnect; return $result; } -sub run_create_fai_release_db { - my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0]; - my $task = POE::Wheel::Run->new( - Program => sub { &create_fai_release_db($table_name) }, - StdoutEvent => "session_run_result", - StderrEvent => "session_run_debug", - CloseEvent => "session_run_done", - ); - - $heap->{task}->{ $task->ID } = $task; - return; -} sub get_fai_types { my $tmp_classes = shift || return undef; @@ -1566,20 +1867,21 @@ sub get_fai_state { } sub resolve_fai_classes { + my ($fai_base, $ldap_handle, $session_id) = @_; + if (not defined $session_id) { $session_id = 0; } 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; - daemon_log("DEBUG: Searching for FAI entries in base $fai_base",6); + daemon_log("$session_id DEBUG: Searching for FAI entries in base $fai_base",7); my $mesg= $ldap_handle->search( base => $fai_base, scope => 'sub', attrs => ['cn','objectClass','FAIstate'], filter => $fai_filter, ); - daemon_log("DEBUG: Found ".$mesg->count()." FAI entries",6); + daemon_log("$session_id DEBUG: Found ".$mesg->count()." FAI entries",7); if($mesg->{'resultCode'} == 0 && $mesg->count != 0) { @@ -1770,119 +2072,305 @@ sub session_run_done { delete $heap->{task}->{$task_id}; } + 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 $session_id = shift; + my $ldap_handle = &main::get_ldap_handle; + my $result="/tmp/gosa_si_tmp_sources_list"; + + # Remove old file + if(stat($result)) { + unlink($result); + &main::daemon_log("$session_id DEBUG: remove an old version of '$result'", 7); + } + + my $fh; + open($fh, ">$result"); + if (not defined $fh) { + &main::daemon_log("$session_id DEBUG: cannot open '$result' for writing", 7); + return undef; + } + if(defined($main::ldap_server_dn) and length($main::ldap_server_dn) > 0) { + my $mesg=$ldap_handle->search( + base => $main::ldap_server_dn, + scope => 'base', + attrs => 'FAIrepository', + filter => 'objectClass=FAIrepositoryServer' + ); + if($mesg->count) { + foreach my $entry(@{$mesg->{'entries'}}) { + foreach my $value(@{$entry->get_value('FAIrepository', asref => 1)}) { + my ($server, $tag, $release, $sections)= split /\|/, $value; + my $line = "deb $server $release"; + $sections =~ s/,/ /g; + $line.= " $sections"; + print $fh $line."\n"; + } + } + } + } else { + if (defined $main::ldap_server_dn){ + &main::daemon_log("$session_id ERROR: something wrong with ldap_server_dn '$main::ldap_server_dn', abort create_sources_list", 1); + } else { + &main::daemon_log("$session_id ERROR: no ldap_server_dn found, abort create_sources_list", 1); } - close($fh); } + close($fh); return $result; } + +sub run_create_packages_list_db { + my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP]; + my $session_id = $session->ID; + + my $task = POE::Wheel::Run->new( + Priority => +20, + Program => sub {&create_packages_list_db(undef, undef, $session_id)}, + StdoutEvent => "session_run_result", + StderrEvent => "session_run_debug", + CloseEvent => "session_run_done", + ); + $heap->{task}->{ $task->ID } = $task; +} + + sub create_packages_list_db { - my ($sources_file) = @_ || &create_sources_list; - my $line; - daemon_log("INFO: create_packages_list_db: start", 5); + my ($ldap_handle, $sources_file, $session_id) = @_; + + # it should not be possible to trigger a recreation of packages_list_db + # while packages_list_db is under construction, so set flag packages_list_under_construction + # which is tested befor recreation can be started + if (-r $packages_list_under_construction) { + daemon_log("$session_id WARNING: packages_list_db is right now under construction, please wait until this process is finished", 3); + return; + } else { + daemon_log("$session_id INFO: create_packages_list_db: start", 5); + # set packages_list_under_construction to true + system("touch $packages_list_under_construction"); + @packages_list_statements=(); + } - open(CONFIG, "<$sources_file") or do { - daemon_log( "ERROR: create_packages_list_db: Failed to open '$sources_file'", 1); - return; - }; - - # Read lines - while ($line = ){ - # Unify - chop($line); - $line =~ s/^\s+//; - $line =~ s/^\s+/ /; + if (not defined $session_id) { $session_id = 0; } + if (not defined $ldap_handle) { + $ldap_handle= &get_ldap_handle(); - # Strip comments - $line =~ s/#.*$//g; + if (not defined $ldap_handle) { + daemon_log("$session_id ERROR: no ldap_handle available to create_packages_list_db", 1); + unlink($packages_list_under_construction); + return; + } + } + if (not defined $sources_file) { + &main::daemon_log("$session_id INFO: no sources_file given for creating packages list so trigger creation of it", 5); + $sources_file = &create_sources_list($session_id); + } - # Skip empty lines - if ($line =~ /^\s*$/){ - next; - } + if (not defined $sources_file) { + &main::daemon_log("$session_id ERROR: no sources_file given under '$sources_file', skip create_packages_list_db", 1); + unlink($packages_list_under_construction); + return; + } - # Interpret deb line - if ($line =~ /^deb [^\s]+\s[^\s]+\s[^\s]+/){ - my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/); - my $section; - foreach $section (split(' ', $sections)){ - &parse_package_info( $baseurl, $dist, $section ); - } - } - } + my $line; - close (CONFIG); + open(CONFIG, "<$sources_file") or do { + daemon_log( "$session_id ERROR: create_packages_list_db: Failed to open '$sources_file'", 1); + unlink($packages_list_under_construction); + return; + }; - daemon_log("INFO: create_packages_list_db: finished", 5); - return; + # Read lines + while ($line = ){ + # Unify + chop($line); + $line =~ s/^\s+//; + $line =~ s/^\s+/ /; + + # Strip comments + $line =~ s/#.*$//g; + + # Skip empty lines + if ($line =~ /^\s*$/){ + next; + } + + # Interpret deb line + if ($line =~ /^deb [^\s]+\s[^\s]+\s[^\s]+/){ + my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/); + my $section; + foreach $section (split(' ', $sections)){ + &parse_package_info( $baseurl, $dist, $section, $session_id ); + } + } + } + + close (CONFIG); + + find(\&cleanup_and_extract, keys( %repo_dirs )); + &main::strip_packages_list_statements(); + unshift @packages_list_statements, "VACUUM"; + $packages_list_db->exec_statementlist(\@packages_list_statements); + unlink($packages_list_under_construction); + daemon_log("$session_id INFO: create_packages_list_db: finished", 5); + return; } -sub run_create_packages_list_db { - 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; +# This function should do some intensive task to minimize the db-traffic +sub strip_packages_list_statements { + my @existing_entries= @{$packages_list_db->exec_statement("SELECT * FROM $main::packages_list_tn")}; + my @new_statement_list=(); + my $hash; + my $insert_hash; + my $update_hash; + my $delete_hash; + my $local_timestamp=get_time(); + + foreach my $existing_entry (@existing_entries) { + $hash->{@{$existing_entry}[0]}->{@{$existing_entry}[1]}->{@{$existing_entry}[2]}= $existing_entry; + } + + foreach my $statement (@packages_list_statements) { + if($statement =~ /^INSERT/i) { + # Assign the values from the insert statement + my ($distribution,$package,$version,$section,$description,$template,$timestamp) = ($1,$2,$3,$4,$5,$6,$7) if $statement =~ + /^INSERT\s+?INTO\s+?$main::packages_list_tn\s+?VALUES\s*?\('(.*?)',\s*?'(.*?)',\s*?'(.*?)',\s*?'(.*?)',\s*?'(.*?)',\s*?'(.*?)',\s*?'(.*?)'\s*?\)$/si; + if(exists($hash->{$distribution}->{$package}->{$version})) { + # If section or description has changed, update the DB + if( + (! (@{$hash->{$distribution}->{$package}->{$version}}[3] eq $section)) or + (! (@{$hash->{$distribution}->{$package}->{$version}}[4] eq $description)) + ) { + @{$update_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,undef); + } + } else { + # Insert a non-existing entry to db + @{$insert_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,$template); + } + } elsif ($statement =~ /^UPDATE/i) { + my ($template,$package,$version) = ($1,$2,$3) if $statement =~ + /^update\s+?$main::packages_list_tn\s+?set\s+?template\s*?=\s*?'(.*?)'\s+?where\s+?package\s*?=\s*?'(.*?)'\s+?and\s+?version\s*?=\s*?'(.*?)'\s*?;$/si; + foreach my $distribution (keys %{$hash}) { + if(exists($insert_hash->{$distribution}->{$package}->{$version})) { + # update the insertion hash to execute only one query per package (insert instead insert+update) + @{$insert_hash->{$distribution}->{$package}->{$version}}[5]= $template; + } elsif(exists($hash->{$distribution}->{$package}->{$version})) { + if( ! (@{$hash->{$distribution}->{$package}->{$version}}[5] eq $template)) { + my $section; + my $description; + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[3]) and + length(@{$update_hash->{$distribution}->{$package}->{$version}}[3]) > 0 ) { + $section= @{$update_hash->{$distribution}->{$package}->{$version}}[3]; + } + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[4])) { + $description= @{$update_hash->{$distribution}->{$package}->{$version}}[4]; + } + @{$update_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,$template); + } + } + } + } + } + + # TODO: Check for orphaned entries + + # unroll the insert_hash + foreach my $distribution (keys %{$insert_hash}) { + foreach my $package (keys %{$insert_hash->{$distribution}}) { + foreach my $version (keys %{$insert_hash->{$distribution}->{$package}}) { + push @new_statement_list, "INSERT INTO $main::packages_list_tn VALUES ('$distribution','$package','$version'," + ."'@{$insert_hash->{$distribution}->{$package}->{$version}}[3]'," + ."'@{$insert_hash->{$distribution}->{$package}->{$version}}[4]'," + ."'@{$insert_hash->{$distribution}->{$package}->{$version}}[5]'," + ."'$local_timestamp')"; + } + } + } + + # unroll the update hash + foreach my $distribution (keys %{$update_hash}) { + foreach my $package (keys %{$update_hash->{$distribution}}) { + foreach my $version (keys %{$update_hash->{$distribution}->{$package}}) { + my $set = ""; + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[3])) { + $set .= "section = '@{$update_hash->{$distribution}->{$package}->{$version}}[3]', "; + } + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[4])) { + $set .= "description = '@{$update_hash->{$distribution}->{$package}->{$version}}[4]', "; + } + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[5])) { + $set .= "template = '@{$update_hash->{$distribution}->{$package}->{$version}}[5]', "; + } + if(defined($set) and length($set) > 0) { + $set .= "timestamp = '$local_timestamp'"; + } else { + next; + } + push @new_statement_list, + "UPDATE $main::packages_list_tn SET $set WHERE" + ." distribution = '$distribution'" + ." AND package = '$package'" + ." AND version = '$version'"; + } + } + } + + @packages_list_statements = @new_statement_list; } -sub parse_package_info { - my ($baseurl, $dist, $section)= @_; - my ($package); - my ($path) = ($baseurl =~ m%://[^/]*(.*)$%); - 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 ); - } +sub parse_package_info { + my ($baseurl, $dist, $section, $session_id)= @_; + my ($package); + if (not defined $session_id) { $session_id = 0; } + my ($path) = ($baseurl =~ m%://[^/]*(.*)$%); + $repo_dirs{ "${repo_path}/pool" } = 1; + + foreach $package ("Packages.gz"){ + daemon_log("$session_id DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7); + get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section", $session_id ); + parse_package( "$outdir/$dist/$section", $dist, $path, $session_id ); + } + } -sub get_package { - my ($url, $dest)= @_; - my $tpath = dirname($dest); - -d "$tpath" || mkpath "$tpath"; - # 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'"); - } else { - daemon_log("ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1); - } - return 0; +sub get_package { + my ($url, $dest, $session_id)= @_; + if (not defined $session_id) { $session_id = 0; } + + my $tpath = dirname($dest); + -d "$tpath" || mkpath "$tpath"; + + # 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'"); + daemon_log("$session_id DEBUG: run command: gunzip -cd '$dest' > '$dest.in'", 5); + unlink($dest); + daemon_log("$session_id DEBUG: delete file '$dest'", 5); + } else { + daemon_log("$session_id 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, $session_id)= @_; + if (not defined $session_id) { $session_id = 0;} my ($package, $version, $section, $description); - my @sql_list; my $PACKAGES; + my $timestamp = &get_time(); if(not stat("$path.in")) { - daemon_log("ERROR: create_packages_list: parse_package: file '$path.in' is not readable",1); + daemon_log("$session_id ERROR: create_packages_list: parse_package: file '$path.in' is not readable",1); return; } open($PACKAGES, "<$path.in"); - if(not defined($PACKAGES)) { - daemon_log("ERROR: create_packages_list_db: parse_package: can not open '$path.in'",1); + if(not defined($PACKAGES)) { + daemon_log("$session_id ERROR: create_packages_list_db: parse_package: cannot open '$path.in'",1); return; } @@ -1894,8 +2382,8 @@ 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')"; - push(@sql_list, $sql); + my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '$description', '', '$timestamp')"; + push(@packages_list_statements, $sql); $package = "none"; $version = "none"; $section = "none"; @@ -1917,7 +2405,7 @@ sub parse_package { # Trigger for description if ($line =~ /^Description:\s/){ - ($description)= ($line =~ /^Description: (.*)$/); + ($description)= &encode_base64(($line =~ /^Description: (.*)$/)); next; } @@ -1927,26 +2415,66 @@ 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 ); unlink( "$path.in" ); - - $packages_list_db->exec_statementlist(\@sql_list); + &main::daemon_log("$session_id DEBUG: unlink '$path.in'", 1); } -# -#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';"; + push @packages_list_statements, $sql; + } + } + + return; +} #==== MAIN = main ============================================================== @@ -1994,18 +2522,28 @@ if( 0 != $pid ) { }; } +# parse head url and revision from svn +my $server_status_hash = { 'developmental'=>'revision', 'stable'=>'release'}; +$server_version =~ /^\$HeadURL: (\S+) \$:\$Rev: (\d+) \$$/; +$server_headURL = defined $1 ? $1 : 'unknown' ; +$server_revision = defined $2 ? $2 : 'unknown' ; +if ($server_headURL =~ /\/tag\// || + $server_headURL =~ /\/branches\// ) { + $server_status = "stable"; +} else { + $server_status = "developmental" ; +} + + daemon_log(" ", 1); daemon_log("$0 started!", 1); +daemon_log("status: $server_status", 1); +daemon_log($server_status_hash->{$server_status}.": $server_revision", 1); if ($no_bus > 0) { $bus_activ = "false" } - - -# delete old DBsqlite lock files -#unlink('/tmp/gosa_si_lock*'); - # connect to gosa-si job queue $job_db = GOSA::DBsqlite->new($job_queue_file_name); $job_db->create_table($job_queue_tn, \@job_queue_col_names); @@ -2023,12 +2561,17 @@ $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); $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); + +unlink($fai_release_file_name); +$fai_release_db = GOSA::DBsqlite->new($fai_release_file_name); +$fai_release_db->create_table($fai_release_tn, \@fai_release_col_names); # connect to packages_list_db -unlink($packages_list_file_name); +#unlink($packages_list_file_name); +unlink($packages_list_under_construction); $packages_list_db = GOSA::DBsqlite->new($packages_list_file_name); $packages_list_db->create_table($packages_list_tn, \@packages_list_col_names); @@ -2064,6 +2607,10 @@ 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_messages => \&watch_for_new_messages, + watch_for_delivery_messages => \&watch_for_delivery_messages, + watch_for_done_messages => \&watch_for_done_messages, 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,