X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=f5191fbda5267e9ee31781f42579c5f970ea45df;hb=3040642fd0b7d6f3906de62d23967567151d7c93;hp=e0c98a709bc1ac622436b37aa2662d207deb066e;hpb=4b94073c5b43692a6d862046829d90f11416cefb;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index e0c98a709..f5191fbda 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -542,7 +542,7 @@ sub check_key_and_xml_validity { # check header if( not exists $msg_hash->{'header'} ) { die "no header specified"; } my $header_l = $msg_hash->{'header'}; - if( 1 > @{$header_l} ) { die 'empty header tag'; } + if( (1 > @{$header_l}) || ( ( 'HASH' eq ref @{$header_l}[0]) && (1 > keys %{@{$header_l}[0]}) ) ) { die 'empty header tag'; } if( 1 < @{$header_l} ) { die 'more than one header specified'; } my $header = @{$header_l}[0]; if( 0 == length $header) { die 'empty string in header tag'; } @@ -551,7 +551,7 @@ sub check_key_and_xml_validity { # check source if( not exists $msg_hash->{'source'} ) { die "no source specified"; } my $source_l = $msg_hash->{'source'}; - if( 1 > @{$source_l} ) { die 'empty source tag'; } + if( (1 > @{$source_l}) || ( ( 'HASH' eq ref @{$source_l}[0]) && (1 > keys %{@{$source_l}[0]}) ) ) { die 'empty source tag'; } if( 1 < @{$source_l} ) { die 'more than one source specified'; } my $source = @{$source_l}[0]; if( 0 == length $source) { die 'source error'; } @@ -560,7 +560,7 @@ sub check_key_and_xml_validity { # check target if( not exists $msg_hash->{'target'} ) { die "no target specified"; } my $target_l = $msg_hash->{'target'}; - if( 1 > @{$target_l} ) { die 'empty target tag'; } + if( (1 > @{$target_l}) || ( ('HASH' eq ref @{$target_l}[0]) && (1 > keys %{@{$target_l}[0]}) ) ) { die 'empty target tag'; } } }; if($@) { @@ -1004,29 +1004,82 @@ sub send_msg_to_target { sub update_jobdb_status_for_send_msgs { - my ($answer, $error) = @_; + my ($session_id, $answer, $error) = @_; if( $answer =~ /(\d+)<\/jobdb_id>/ ) { my $jobdb_id = $1; + + $answer =~ /
(.*)<\/header>/; + my $job_header = $1; + + $answer =~ /(.*)<\/target>/; + my $job_target = $1; - # sending msg faild + # sending msg failed if( $error ) { - if (not $answer =~ /
trigger_action_reinstall<\/header>/) { + + # JUST FOR TESTING + daemon_log("D \n$error\n$answer"); + + # set jobs to done, jobs do not need to deliver their message in any case + if (($job_header eq "trigger_action_localboot") + ||($job_header eq "trigger_action_lock") + ||($job_header eq "trigger_action_halt") + ) { + my $sql_statement = "UPDATE $job_queue_tn SET status='done' WHERE id=$jobdb_id"; + my $res = $job_db->update_dbentry($sql_statement); + + # reactivate jobs, jobs need to deliver their message + } elsif (($job_header eq "trigger_action_activate") + ||($job_header eq "trigger_action_update") + ||($job_header eq "trigger_action_reinstall") + ) { + &reactivate_job_with_delay($session_id, $job_target, $job_header, 30 ); + + # for all other messages + } else { my $sql_statement = "UPDATE $job_queue_tn ". "SET status='error', result='can not deliver msg, please consult log file' ". "WHERE id=$jobdb_id"; my $res = $job_db->update_dbentry($sql_statement); + } # sending msg was successful } else { - my $sql_statement = "UPDATE $job_queue_tn ". - "SET status='done' ". - "WHERE id=$jobdb_id AND status='processed'"; - my $res = $job_db->update_dbentry($sql_statement); + # set jobs localboot, lock, activate, halt, reboot and wake to done + # jobs reinstall, update, inst_update do themself setting to done + if (($job_header eq "trigger_action_localboot") + ||($job_header eq "trigger_action_lock") + ||($job_header eq "trigger_action_activate") + ||($job_header eq "trigger_action_halt") + ||($job_header eq "trigger_action_reboot") + ||($job_header eq "trigger_action_wake") + ) { + + my $sql_statement = "UPDATE $job_queue_tn ". + "SET status='done' ". + "WHERE id=$jobdb_id AND status='processed'"; + my $res = $job_db->update_dbentry($sql_statement); + } } } } +sub reactivate_job_with_delay { + my ($session_id, $target, $header, $delay) = @_ ; + # Sometimes the client is still booting or does not wake up, in this case reactivate the job (if it exists) with a delay of n sec + + if (not defined $delay) { $delay = 30 } ; + my $delay_timestamp = &calc_timestamp(&get_time(), "plus", $delay); + + my $sql = "UPDATE $job_queue_tn Set timestamp='$delay_timestamp', status='waiting' WHERE (macaddress='$target' AND headertag='$header')"; + my $res = $job_db->update_dbentry($sql); + daemon_log("$session_id INFO: '$header'-job will be reactivated at '$delay_timestamp' ". + "cause client '$target' is currently not available", 5); + daemon_log("$session_id $sql", 7); + return; +} + sub sig_handler { my ($kernel, $signal) = @_[KERNEL, ARG0] ; @@ -1261,6 +1314,9 @@ sub msg_to_decrypt { && $not_found_in_known_server_db && $not_found_in_known_clients_db) { &daemon_log("$session_id DEBUG: target is not in foreign_clients_db, known_server_db or known_clients_db, maybe it is a complete new one -> process here", 7); + if ($header =~ /^gosa_/ || $header =~ /^job_/) { + $module = "GosaPackages"; + } my $res = $incoming_db->add_dbentry( {table=>$incoming_tn, primkey=>[], headertag=>$header, @@ -1454,6 +1510,8 @@ sub process_task { # 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("$session_id INFO: target is mac address '$answer_target', looking for host in known_clients and foreign_clients", 5); + + # Looking for macaddress in known_clients 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; @@ -1466,6 +1524,8 @@ sub process_task { &update_jobdb_status_for_send_msgs($answer, $error); $found_ip_flag++ ; } + + # Looking for macaddress in foreign_clients if ($found_ip_flag == 0) { my $sql = "SELECT * FROM $foreign_clients_tn WHERE macaddress LIKE '$answer_target'"; my $res = $foreign_clients_db->select_dbentry($sql); @@ -1495,8 +1555,11 @@ sub process_task { } } } + + # No mac to ip matching found if( $found_ip_flag == 0) { - daemon_log("$session_id WARNING: no host found in known_clients with mac address '$answer_target'", 3); + daemon_log("$session_id WARNING: no host found in known_clients or foreign_clients with mac address '$answer_target'", 3); + &reactivate_job_with_delay($session_id, $answer_target, $answer_header, 30); } # Answer is for one specific host @@ -1676,7 +1739,7 @@ sub watch_for_opsi_jobs { sub watch_for_modified_jobs { my ($kernel,$heap) = @_[KERNEL, HEAP]; - my $sql_statement = "SELECT * FROM $job_queue_tn WHERE ((siserver='localhost') AND (modified='1'))"; + my $sql_statement = "SELECT * FROM $job_queue_tn WHERE (modified='1')"; my $res = $job_db->select_dbentry( $sql_statement ); # if db contains no jobs which should be update, do nothing @@ -1787,12 +1850,21 @@ sub watch_for_new_jobs { $job_msg =~ /
(\S+)<\/header>/; my $header = $1 ; - my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J"); + 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 + # update status in job queue to ... + # ... 'processing', for jobs: 'reinstall', 'update' + if (($header =~ /gosa_trigger_action_reinstall/) || ($header =~ /gosa_trigger_action_update/)) { + my $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id=$jobdb_id"; + my $dbres = $job_db->update_dbentry($sql_statement); + } + + # ... 'done', for all other jobs, they are no longer needed in the jobqueue + else { + my $sql_statement = "UPDATE $job_queue_tn SET status='done' WHERE id=$jobdb_id"; + my $dbres = $job_db->update_dbentry($sql_statement); + } + # We don't want parallel processing last; @@ -1823,7 +1895,7 @@ sub watch_for_new_messages { my %receiver_h; foreach my $receiver (@message_to_l) { if ($receiver =~ /^u_([\s\S]*)$/) { - $receiver_h{$1} = 0; + $receiver_h{$receiver} = 0; } elsif ($receiver =~ /^g_([\s\S]*)$/) { my $group_name = $1; # fetch all group members from ldap and add them to receiver hash @@ -1840,7 +1912,7 @@ sub watch_for_new_messages { foreach my $entry (@entries) { my @receivers= $entry->get_value("memberUid"); foreach my $receiver (@receivers) { - $receiver_h{$1} = 0; + $receiver_h{$receiver} = 0; } } } @@ -1913,9 +1985,10 @@ sub watch_for_delivery_messages { #&daemon_log("0 DEBUG: $sql", 7); my $res = $login_users_db->exec_statement($sql); - # reciver is logged in nowhere + # receiver is logged in nowhere if (not ref(@$res[0]) eq "ARRAY") { next; } + # receiver ist logged in at a client registered at local server my $send_succeed = 0; foreach my $hit (@$res) { my $receiver_host = @$hit[0]; @@ -2185,16 +2258,12 @@ sub change_fai_state { my %tmp = map { $_ => 1 } $entry->get_value("objectClass"); if (exists $tmp{'FAIobject'}){ if ($state eq ''){ - $result= $ldap_handle->modify($entry->dn, changes => [ - delete => [ FAIstate => [] ] ]); + $result= $ldap_handle->modify($entry->dn, changes => [ delete => [ FAIstate => [] ] ]); } else { - $result= $ldap_handle->modify($entry->dn, changes => [ - replace => [ FAIstate => $state ] ]); + $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 ] ]); + $result= $ldap_handle->modify($entry->dn, changes => [ add => [ objectClass => 'FAIobject' ], add => [ FAIstate => $state ] ]); } # Errors? @@ -2257,8 +2326,7 @@ sub change_goto_state { 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 ] ]); + $result= $ldap_handle->modify($entry->dn, changes => [replace => [ gotoMode => $state ] ]); # Errors? if ($result->code){ @@ -2793,7 +2861,6 @@ sub create_packages_list_db { close (CONFIG); - if(keys(%repo_dirs)) { find(\&cleanup_and_extract, keys( %repo_dirs )); &main::strip_packages_list_statements(); @@ -2806,12 +2873,13 @@ sub create_packages_list_db { # 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 @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 $known_packages_hash; my $local_timestamp=get_time(); foreach my $existing_entry (@existing_entries) { @@ -2830,6 +2898,9 @@ sub strip_packages_list_statements { (! (@{$hash->{$distribution}->{$package}->{$version}}[4] eq $description)) ) { @{$update_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,undef); + } else { + # package is already present in database. cache this knowledge for later use + @{$known_packages_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,$template); } } else { # Insert a non-existing entry to db @@ -2860,9 +2931,26 @@ sub strip_packages_list_statements { } } - # TODO: Check for orphaned entries + # Check for orphaned entries + foreach my $existing_entry (@existing_entries) { + my $distribution= @{$existing_entry}[0]; + my $package= @{$existing_entry}[1]; + my $version= @{$existing_entry}[2]; + my $section= @{$existing_entry}[3]; + + if( + exists($insert_hash->{$distribution}->{$package}->{$version}) || + exists($update_hash->{$distribution}->{$package}->{$version}) || + exists($known_packages_hash->{$distribution}->{$package}->{$version}) + ) { + next; + } else { + # Insert entry to delete hash + @{$delete_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section); + } + } - # unroll the insert_hash + # 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}}) { @@ -2895,10 +2983,20 @@ sub strip_packages_list_statements { next; } push @new_statement_list, - "UPDATE $main::packages_list_tn SET $set WHERE" - ." distribution = '$distribution'" - ." AND package = '$package'" - ." AND version = '$version'"; + "UPDATE $main::packages_list_tn SET $set WHERE" + ." distribution = '$distribution'" + ." AND package = '$package'" + ." AND version = '$version'"; + } + } + } + + # unroll the delete hash + foreach my $distribution (keys %{$delete_hash}) { + foreach my $package (keys %{$delete_hash->{$distribution}}) { + foreach my $version (keys %{$delete_hash->{$distribution}->{$package}}) { + my $section = @{$delete_hash->{$distribution}->{$package}->{$version}}[3]; + push @new_statement_list, "DELETE FROM $main::packages_list_tn WHERE distribution='$distribution' AND package='$package' AND version='$version' AND section='$section'"; } } } @@ -3042,7 +3140,7 @@ sub cleanup_and_extract { if( -f "$dir/DEBIAN/templates" ) { - daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 7); + daemon_log("0 DEBUG: Found debconf templates in '$package' - $newver", 7); my $tmpl= ""; { local $/=undef;