X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=612e01436e23a97e714b42aeff87bc46e63dad8d;hb=67c1e7245360178883e824c3f7519d0d44863a8f;hp=05b4d47de84e61b337a76afaccf198423a99daac;hpb=f2dc2380aacf28c2ace954d6999764119fb8189f;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 05b4d47de..612e01436 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -106,8 +106,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); @@ -115,12 +117,12 @@ 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", +my @job_queue_col_names = ("id INTEGER PRIMARY KEY", + "timestamp DEFAULT 'none'", "status DEFAULT 'none'", "result DEFAULT 'none'", "progress DEFAULT 'none'", - "headertag DEFAULT 'none'", + "headertag DEFAULT 'none'", "targettag DEFAULT 'none'", "xmlmessage DEFAULT 'none'", "macaddress DEFAULT 'none'", @@ -131,40 +133,44 @@ my @job_queue_col_names = ("id INTEGER", 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', 'message_from', 'message_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 @@ -188,7 +194,8 @@ my $max_children = 2; "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'], @@ -281,6 +288,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); @@ -950,7 +958,7 @@ sub update_jobdb_status_for_send_msgs { if (not $answer =~ /
trigger_action_reinstall<\/header>/) { 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); } @@ -958,7 +966,7 @@ sub update_jobdb_status_for_send_msgs { } else { 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); } } @@ -1042,7 +1050,7 @@ sub process_task { daemon_log("", 5); 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); + #daemon_log("$session_id DEBUG: Incoming msg:\n$input", 9); #################### # check incoming msg @@ -1084,7 +1092,10 @@ sub process_task { if ( 0 < @{$answer_l} ) { my $answer_str = join("\n", @{$answer_l}); 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++ }; @@ -1238,10 +1249,11 @@ 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_new_messages', $messaging_db_loop_delay); - $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay); + $kernel->delay_set('watch_for_new_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]; @@ -1251,91 +1263,107 @@ 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]; - - # 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) + 120) < $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}->{$headertag})) { - push @drops, "DELETE FROM $job_queue_tn WHERE id = '$hits->{$macaddress}->{$headertag}[0]'"; + 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; } - $hits->{$macaddress}->{$headertag}= $hit; - } - # 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]; - 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'"; + # 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); + } } } - } - # Commit deletion - $job_db->exec_statementlist(\@drops); + # Commit deletion + $job_db->exec_statementlist(\@drops); - # Look for new jobs that could be executed - foreach my $macaddress (keys %{$hits}) { + # 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 ); + # 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; - } + # 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]; - my $job_msg = @{$hits->{$macaddress}->{$jobdb_headertag}}[7]; + 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 ); + 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}; + # expect macaddress is unique!!!!!! + my $target = $res_hash->{1}->{hostname}; - # change header - $job_msg =~ s/
job_/
gosa_/; + # change header + $job_msg =~ s/
job_/
gosa_/; - # add sqlite_id - $job_msg =~ s/<\/xml>$/$jobdb_id<\/jobdb_id><\/xml>/; + # 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"); + $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); + # 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; + # We don't want parallel processing + last; + } + } } - } - $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay); + $watch_for_new_jobs_in_progress = 0; + $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay); + } } @@ -1345,37 +1373,36 @@ sub watch_for_new_messages { # check messaging_db for new incoming messages with executable timestamp my $timestamp = &get_time(); - #my $sql_statement = "SELECT * FROM $messaging_tn WHERE (CAST (delivery_time AS INTEGER) + 120) < $timestamp"; 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}[2]; + my $message_to = @{$hit}[3]; # translate message_to to plain login name +# TODO implement reciever translation my @reciever_l = ($message_to); - my $message_id = @{$hit}[8]; + my $message_id = @{$hit}[0]; #add each outgoing msg to messaging_db my $reciever; foreach $reciever (@reciever_l) { - my $sql_statement = "INSERT INTO $messaging_tn (subject, message_from, message_to, flag, direction, delivery_time, message, timestamp, id) ". + my $sql_statement = "INSERT INTO $messaging_tn (id, subject, message_from, message_to, flag, direction, delivery_time, message, timestamp) ". "VALUES ('". - @{$hit}[0]."', '". # subject - @{$hit}[1]."', '". # message_from - $reciever."', '". # message_to - "none"."', '". # flag - "out"."', '". # direction - @{$hit}[5]."', '". # delivery_time - @{$hit}[6]."', '". # message - $timestamp."', '". # timestamp - @{$hit}[8]. # id - "')"; + $message_id."', '". # id + @{$hit}[1]."', '". # subject + @{$hit}[2]."', '". # message_from + $reciever."', '". # 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}[8]."' is prepared for delivery to reciever '$reciever'", 5); + &daemon_log("M INFO: message '".@{$hit}[0]."' is prepared for delivery to reciever '$reciever'", 5); } # send outgoing messages @@ -1383,7 +1410,7 @@ sub watch_for_new_messages { my $res = $messaging_db->exec_statement( $sql_statement ); foreach my $hit (@{$res}) { # add subject, from, to and message to list coll_user_msg - my @user_msg = [@{$hit}[0], @{$hit}[1], $reciever, @{$hit}[6]]; + my @user_msg = [@{$hit}[1], @{$hit}[2], $reciever, @{$hit}[7]]; push( @coll_user_msg, \@user_msg); } @@ -1401,7 +1428,7 @@ sub watch_for_new_messages { $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 '".@{$hit}[8]."' is set to flag 'p' (processed)", 5); + &daemon_log("M INFO: message '$message_id' is set to flag 'p' (processed)", 5); } @@ -1598,12 +1625,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, $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', @@ -1630,11 +1674,11 @@ 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 - if(!defined($dont_create_packages_list)) { - &create_packages_list_db; + if(not defined($dont_create_packages_list)) { + &create_packages_list_db(undef, undef, $session_id); } } @@ -1642,10 +1686,12 @@ sub create_fai_server_db { 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", @@ -1661,7 +1707,7 @@ sub create_fai_release_db { my $result; # used for logging - if (not defined $session_id) { $session_id = "0"; } + if (not defined $session_id) { $session_id = 0; } my $ldap_handle = &get_ldap_handle(); if(defined($ldap_handle)) { @@ -1678,7 +1724,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, $ldap_handle); + 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) { @@ -1698,12 +1744,13 @@ sub create_fai_release_db { } } } - daemon_log("$session_id 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, "DELETE FROM $table_name"; - $fai_server_db->exec_statementlist(\@sql_list); + unshift @sql_list, "DELETE FROM $table_name"; # at first, clear db + $fai_release_db->exec_statementlist(\@sql_list); } - daemon_log("$session_id DEBUG: Done with inserting",6); + daemon_log("$session_id DEBUG: Done with inserting",7); } daemon_log("$session_id INFO: create_fai_release_db: finished",5); } @@ -1711,20 +1758,6 @@ sub create_fai_release_db { 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; my @result; @@ -1759,20 +1792,21 @@ sub get_fai_state { } sub resolve_fai_classes { - my ($fai_base, $ldap_handle) = @_; + my ($fai_base, $ldap_handle, $session_id) = @_; + if (not defined $session_id) { $session_id = 0; } my $result; 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) { @@ -1963,24 +1997,31 @@ sub session_run_done { delete $heap->{task}->{$task_id}; } + sub create_sources_list { - my $ldap_handle = &get_ldap_handle; + 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") or return undef; - if(defined($ldap_server_dn) and length($ldap_server_dn) > 0) { + 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 => $ldap_server_dn, - scope => 'base', - attrs => 'FAIrepository', - filter => 'objectClass=FAIrepositoryServer' - ); + 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)}) { @@ -1992,123 +2033,160 @@ sub create_sources_list { } } } + } else { + &main::daemon_log("$session_id ERROR: something wrong with ldap_server_dn '$main::ldap_server_dn', abort create_sources_list", 1); } close($fh); return $result; } + +sub run_create_packages_list_db { + my ($session, $heap) = @_[SESSION, HEAP]; + my $session_id = $session->ID; + + my $task = POE::Wheel::Run->new( + 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 ($ldap_handle, $sources_file); + 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=undef; + } + if (not defined $session_id) { $session_id = 0; } if (not defined $ldap_handle) { $ldap_handle= &get_ldap_handle(); if (not defined $ldap_handle) { - daemon_log("0 ERROR: no ldap_handle available to create_packages_list_db", 1); + 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); + } - if (not defined $sources_file) { - $sources_file = &create_sources_list; - } + 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; + } - my $line; - daemon_log("INFO: create_packages_list_db: start", 5); + my $line; - 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+/ /; + 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; + }; - # Strip comments - $line =~ s/#.*$//g; + # Read lines + while ($line = ){ + # Unify + chop($line); + $line =~ s/^\s+//; + $line =~ s/^\s+/ /; - # Skip empty lines - if ($line =~ /^\s*$/){ - next; - } + # Strip comments + $line =~ s/#.*$//g; - # 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 ); - } - } - } + # Skip empty lines + if ($line =~ /^\s*$/){ + next; + } - close (CONFIG); + # 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 ); + } + } + } - daemon_log("INFO: create_packages_list_db: finished", 5); - return; -} + close (CONFIG); -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; + find(\&cleanup_and_extract, keys( %repo_dirs )); + $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 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 ) ); + 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'"); - unlink($dest); - } else { - daemon_log("ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1); - } - return 0; + 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; } @@ -2120,8 +2198,8 @@ sub parse_package { # Use empty lines as a trigger if ($line =~ /^\s*$/){ - my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '', 'none', '0')"; - push(@sql_list, $sql); + my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '', 'none', '$timestamp')"; + push(@packages_list_statements, $sql); $package = "none"; $version = "none"; $section = "none"; @@ -2153,66 +2231,69 @@ 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; - } + # 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, $srvdir) = @_; + my( $package, $file, $dist, $path, $vers, $srvdir) = @_; - my %fileinfo = ( - 'package' => $package, - 'dist' => $dist, - 'version' => $vers, - ); + my %fileinfo = ( + 'package' => $package, + 'dist' => $dist, + 'version' => $vers, + ); - $repo_files{ "${srvdir}/$file" } = \%fileinfo; + $repo_files{ "${srvdir}/$file" } = \%fileinfo; } + sub cleanup_and_extract { - my $fileinfo = $repo_files{ $File::Find::name }; + my $fileinfo = $repo_files{ $File::Find::name }; - if( defined $fileinfo ) { + if( defined $fileinfo ) { - my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d"; - my $sql; - my $package = $fileinfo->{ 'package' }; - my $newver = $fileinfo->{ 'version' }; + 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'" ); + mkpath($dir); + system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" ); - if( -f "$dir/DEBIAN/templates" ) { + if( -f "$dir/DEBIAN/templates" ) { - daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 5); + 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"); + 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';"; + $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';"; + } else { + $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';"; + } + + push @packages_list_statements, $sql; } - my $res= $main::packages_list_db->update_dbentry($sql); - } + return; } @@ -2288,10 +2369,14 @@ $login_users_db->create_table($login_users_tn, \@login_users_col_names); 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_under_construction); $packages_list_db = GOSA::DBsqlite->new($packages_list_file_name); $packages_list_db->create_table($packages_list_tn, \@packages_list_col_names);