![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 2fbc8be721324cb6ff7373f5df620ca0079306a4..dc82ecbef8735aa547fab5266472648e633bf9b1 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
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
if(not defined $level) { $level = 1 }
if(defined $log_file){
open(LOG_HANDLE, ">>$log_file");
+ chmod 0600, $log_file;
if(not defined open( LOG_HANDLE, ">>$log_file" )) {
print STDERR "cannot open $log_file: $!";
return }
$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_delivery_messages', $messaging_db_loop_delay);
$kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay);
}
defined($hits->{$macaddress}->{$headertag}) &&
defined($hits->{$macaddress}->{$headertag}[0])
) {
- push @drops, "DELETE FROM $job_queue_tn WHERE id = '$hits->{$macaddress}->{$headertag}[0]'";
+ push @drops, "DELETE FROM $job_queue_tn WHERE id = $hits->{$macaddress}->{$headertag}[0]";
}
$hits->{$macaddress}->{$headertag}= $hit;
}
# create outgoing messages
my $message_to = @{$hit}[3];
-
# translate message_to to plain login name
-# TODO implement reciever translation
- my @reciever_l = ($message_to);
+ 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 $reciever;
- foreach $reciever (@reciever_l) {
+ 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
- $reciever."', '". # message_to
+ $receiver."', '". # message_to
"none"."', '". # flag
"out"."', '". # direction
@{$hit}[6]."', '". # delivery_time
")";
&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 reciever '$reciever'", 5);
- }
-
- # send outgoing messages
- my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' )";
- 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}[1], @{$hit}[2], $reciever, @{$hit}[7]];
- push( @coll_user_msg, \@user_msg);
+ &daemon_log("M INFO: message '".@{$hit}[0]."' is prepared for delivery to receiver '$receiver'", 5);
}
- # send outgoing list to myself (gosa-si-server) to deliver each message to user
- # reason for this workaround: if to much messages have to be delivered, it can come to
- # denial of service problems of the server. so, the incoming message list can be processed
- # by a forked child and gosa-si-server is always ready to work.
- my $collection_out_msg = &create_xml_hash("collection_user_messages", $server_address, $server_address);
- # add to hash 'msg1' => [subject, from, to, message]
- # hash to string
- # send msg to myself
-# TODO
-
# 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_messages', $messaging_db_loop_delay);
+ return;
+}
+
+sub watch_for_delivery_messages {
+ my ($kernel, $heap) = @_[KERNEL, HEAP];
+ # 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);
+ }
+ }
+
+ $kernel->delay_set('watch_for_delivery_messages', $messaging_db_loop_delay);
return;
}
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);
+
+ }
+
$kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay);
return;
}
daemon_log("$session_id DEBUG: Inserting ".scalar @sql_list." entries to DB",8);
if(@sql_list) {
- unshift @sql_list, "DELETE FROM $table_name"; # at first, clear db
+ unshift @sql_list, "VACUUM";
+ unshift @sql_list, "DELETE FROM $table_name";
$fai_release_db->exec_statementlist(\@sql_list);
}
daemon_log("$session_id DEBUG: Done with inserting",7);
}
}
} else {
- &main::daemon_log("$session_id ERROR: something wrong with ldap_server_dn '$main::ldap_server_dn', abort create_sources_list", 1);
+ 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);
sub run_create_packages_list_db {
- my ($session, $heap) = @_[SESSION, HEAP];
+ 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",
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;
+ @packages_list_statements=();
}
if (not defined $session_id) { $session_id = 0; }
close (CONFIG);
- find(\&cleanup_and_extract, keys( %repo_dirs ));
- $packages_list_db->exec_statementlist(\@packages_list_statements);
- unlink($packages_list_under_construction);
+ find(\&cleanup_and_extract, keys( %repo_dirs ));
+ eval {
+ &main::strip_packages_list_statements();
+ };
+ if($@) {
+ daemon_log("$session_id ERROR: Preparation of statement list failed with '$@'!", 1);
+ }
+ unshift @packages_list_statements, "VACUUM";
+ eval {
+ $packages_list_db->exec_statementlist(\@packages_list_statements);
+ };
+ if($@) {
+ daemon_log("$session_id ERROR: Updating package_list_db failed with '$@'!", 1);
+ }
+ unlink($packages_list_under_construction);
daemon_log("$session_id INFO: create_packages_list_db: finished", 5);
return;
}
+# 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, $session_id)= @_;
my ($package);
# Use empty lines as a trigger
if ($line =~ /^\s*$/){
- my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '', 'none', '$timestamp')";
+ my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '$description', '', '$timestamp')";
push(@packages_list_statements, $sql);
$package = "none";
$version = "none";
# Trigger for description
if ($line =~ /^Description:\s/){
- ($description)= ($line =~ /^Description: (.*)$/);
+ ($description)= &encode_base64(($line =~ /^Description: (.*)$/));
next;
}
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(<FILE>);
- close FILE;
- }
- rmtree("$dir/DEBIAN/templates");
-
- $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';";
-
- } else {
- $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';";
- }
+ my $tmpl= "";
+ {
+ local $/=undef;
+ open FILE, "$dir/DEBIAN/templates";
+ $tmpl = &encode_base64(<FILE>);
+ close FILE;
+ }
+ rmtree("$dir/DEBIAN/templates");
- push @packages_list_statements, $sql;
+ $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';";
+ push @packages_list_statements, $sql;
+ }
}
return;
};
}
+# 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"
$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);
_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,