X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FGosaPackages.pm;h=b1d207f74230360b0d448b5f7e15db38d32439fb;hb=8d32c2811e256aeea583ef2f04654d6b5e56220f;hp=9f1f256969cc5fd7d1ec3c216ecb6246f0b835e2;hpb=8e4217406606e569372d8a6a08bf1bf89cb16669;p=gosa.git diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index 9f1f25696..b1d207f74 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -13,7 +13,6 @@ use File::Spec; use Data::Dumper; use GOSA::DBsqlite; use MIME::Base64; -use utf8; my $event_dir = "/usr/lib/gosa-si/server/events"; use lib "/usr/lib/gosa-si/server/events"; @@ -21,7 +20,7 @@ use lib "/usr/lib/gosa-si/server/events"; BEGIN{} END{} -my ($server_ip, $server_mac_address, $server_port, $server_passwd, $max_clients); +my ($server_ip, $server_port, $server_passwd, $max_clients); my ($gosa_ip, $gosa_mac_address, $gosa_port, $gosa_passwd, $network_interface); my ($job_queue_timeout, $job_queue_file_name); @@ -224,18 +223,18 @@ sub get_ip { sub import_events { if (not -e $event_dir) { - &main::daemon_log("ERROR: cannot find directory or directory is not readable: $event_dir", 1); + &main::daemon_log("G ERROR: cannot find directory or directory is not readable: $event_dir", 1); } opendir (DIR, $event_dir) or die "ERROR while loading gosa-si-events from directory $event_dir : $!\n"; while (defined (my $event = readdir (DIR))) { if( $event eq "." || $event eq ".." ) { next; } - if( $event eq "siTriggered.pm" ) { next; } # SI specific events not needed in GosaPackages.pm - if( $event eq "clMessages.pm" ) { next; } # SI specific events not needed in GosaPackages.pm + if( $event eq "siTriggered.pm" ) { next; } # SI specific events not needed in GosaPackages.pm + if( $event eq "clMessages.pm" ) { next; } # SI specific events not needed in GosaPackages.pm eval{ require $event; }; if( $@ ) { - &main::daemon_log("ERROR: import of event module '$event' failed", 1); + &main::daemon_log("G ERROR: import of event module '$event' failed", 1); &main::daemon_log("$@", 1); next; } @@ -247,7 +246,7 @@ sub import_events { $event_hash->{$event_name} = $event_module; } my $events_string = join( ", ", @{$events_l}); - &main::daemon_log("INFO: GosaPackages imported events $events_string", 5); + &main::daemon_log("G DEBUG: GosaPackages from '$1' imported events $events_string", 8); } } @@ -264,7 +263,7 @@ sub process_incoming_msg { my @msg_l; my @out_msg_l; - &main::daemon_log("DEBUG: GosaPackages: receive '$header'", 8); + &main::daemon_log("$session_id DEBUG: GosaPackages: msg to process '$header'", 7); if ($header =~ /^job_/) { @msg_l = &process_job_msg($msg, $msg_hash, $session_id); @@ -273,23 +272,13 @@ sub process_incoming_msg { @msg_l = &process_gosa_msg($msg, $msg_hash, $session_id); } else { - &main::daemon_log("ERROR: $header is not a valid GosaPackage-header, need a 'job_' or a 'gosa_' prefix", 1); + &main::daemon_log("$session_id ERROR: $header is not a valid GosaPackage-header, need a 'job_' or a 'gosa_' prefix", 1); } foreach my $out_msg ( @msg_l ) { - - # keep job queue up-to-date and save result and status - if (defined ($out_msg) && $out_msg =~ /(\d+)<\/jobdb_id>/) { - my $job_id = $1; - my $sql = "UPDATE '".$main::job_queue_tn."'". - " SET status='processing'". - " WHERE id='$job_id'"; - my $res = $main::job_db->exec_statement($sql); - } - # substitute in all outgoing msg GOSA of $server_address $out_msg =~ s/GOSA<\/source>/$server_address<\/source>/g; - + $out_msg =~ s/<\/xml>/$session_id<\/session_id><\/xml>/; if (defined $out_msg){ push(@out_msg_l, $out_msg); } @@ -310,20 +299,17 @@ sub process_gosa_msg { if( exists $event_hash->{$header} ) { # a event exists with the header as name - &main::daemon_log("INFO: found event '$header' at event-module '".$event_hash->{$header}."'", 5); + &main::daemon_log("$session_id INFO: found event '$header' at event-module '".$event_hash->{$header}."'", 5); no strict 'refs'; @out_msg_l = &{$event_hash->{$header}."::$header"}($msg, $msg_hash, $session_id); } -print STDERR "===============================\n"; -print STDERR Dumper(@out_msg_l); - # if delivery not possible raise error and return - if( not defined @out_msg_l[0] ) { - &main::daemon_log("WARNING: GosaPackages got no answer from event handler '$header'", 3); + if( not defined $out_msg_l[0] ) { +# &main::daemon_log("WARNING: GosaPackages got no answer from event handler '$header'", 3); @out_msg_l = (); } elsif( $out_msg_l[0] eq 'nohandler') { - &main::daemon_log("ERROR: GosaPackages: no event handler or core function defined for '$header'", 1); + &main::daemon_log("$session_id ERROR: GosaPackages: no event handler or core function defined for '$header'", 1); @out_msg_l = (); } @@ -349,6 +335,8 @@ sub process_job_msg { my $macaddress; if( exists $msg_hash->{'macaddress'} ) { $macaddress = @{$msg_hash->{'macaddress'}}[0]; + } elsif (@{$msg_hash->{'target'}}[0] =~ /^([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 ) { + $macaddress = $1; } else { $error ++; $out_msg = "". @@ -356,12 +344,32 @@ sub process_job_msg { "$server_address". "GOSA". "1". - "no mac address specified". + "no mac address specified, neither in target-tag nor in macaddres-tag". ""; } - # check wether mac address is already known in known_daemons or known_clients - my $target = 'none'; + # if mac address is already known in ldap, set targettag to 'cn' + my $target; + my $ldap_handle = &main::get_ldap_handle($session_id); + if( not defined $ldap_handle ) { + &main::daemon_log("$session_id ERROR: cannot connect to ldap", 1); + $target = "none"; + + # try to fetch a 'real name' + } else { + my $mesg = $ldap_handle->search( + base => $main::ldap_base, + scope => 'sub', + attrs => ['cn'], + filter => "(macAddress=$macaddress)"); + if($mesg->code) { + &main::daemon_log($mesg->error, 1); + $target = "none"; + } else { + my $entry= $mesg->entry(0); + $target = $entry->get_value("cn"); + } + } if( $error == 0 ) { # add job to job queue @@ -379,9 +387,9 @@ sub process_job_msg { my $res = $main::job_db->add_dbentry($func_dic); if (not $res == 0) { - &main::daemon_log("ERROR: GosaPackages: process_job_msg: $res", 1); + &main::daemon_log("$session_id ERROR: GosaPackages: process_job_msg: $res", 1); } else { - &main::daemon_log("INFO: GosaPackages: $header job successfully added to job queue", 5); + &main::daemon_log("$session_id INFO: GosaPackages: $header job successfully added to job queue", 5); } $out_msg = "
answer
$server_addressGOSA$res"; }