X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-si%2Fmodules%2FGosaPackages.pm;h=b1d207f74230360b0d448b5f7e15db38d32439fb;hb=8d32c2811e256aeea583ef2f04654d6b5e56220f;hp=8314850c7528de65485f44b2afd7b1c68e8e5f56;hpb=0e2de0eb04845891d90f6bf127224ac5110dcf1c;p=gosa.git diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index 8314850c7..b1d207f74 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -7,6 +7,7 @@ use strict; use warnings; use GOSA::GosaSupportDaemon; use IO::Socket::INET; +use Socket; use XML::Simple; use File::Spec; use Data::Dumper; @@ -19,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); @@ -50,7 +51,9 @@ $network_interface= &get_interface_for_ip($server_ip); $gosa_mac_address= &get_mac($network_interface); # complete addresses +if( inet_aton($server_ip) ){ $server_ip = inet_ntoa(inet_aton($server_ip)); } our $server_address = "$server_ip:$server_port"; +if( inet_aton($gosa_ip) ){ $gosa_ip = inet_ntoa(inet_aton($gosa_ip)); } my $gosa_address = "$gosa_ip:$gosa_port"; # create general settings for this module @@ -220,18 +223,19 @@ 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; } # only SI specific events + 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("import of event module '$event' failed", 1); - &main::daemon_log("$@", 8); + &main::daemon_log("G ERROR: import of event module '$event' failed", 1); + &main::daemon_log("$@", 1); next; } @@ -242,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); } } @@ -259,7 +263,7 @@ sub process_incoming_msg { my @msg_l; my @out_msg_l; - &main::daemon_log("GosaPackages: receive '$header'", 1); + &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); @@ -268,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"); + &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_table_name."'". - " SET status='done'". - " 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); } @@ -298,38 +292,25 @@ sub process_incoming_msg { sub process_gosa_msg { my ($msg, $msg_hash, $session_id) = @_ ; my $out_msg; - my @out_msg_l; + my @out_msg_l = ('nohandler'); my $header = @{$msg_hash->{'header'}}[0]; $header =~ s/gosa_//; - # decide wether msg is a core function or a event handler - if ( $header eq 'query_jobdb') { - @out_msg_l = &query_jobdb - } elsif ($header eq 'delete_jobdb_entry') { - @out_msg_l = &delete_jobdb_entry - } elsif ($header eq 'clear_jobdb') { - @out_msg_l = &clear_jobdb - } elsif ($header eq 'update_status_jobdb_entry' ) { - @out_msg_l = &update_status_jobdb_entry - } elsif ($header eq 'count_jobdb' ) { - @out_msg_l = &count_jobdb - } else { - # msg could not be assigned to core function - # maybe it is an eventa - if( exists $event_hash->{$header} ) { - # a event exists with the header as name - &main::daemon_log("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); - } + if( exists $event_hash->{$header} ) { + # a event exists with the header as name + &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); } # if delivery not possible raise error and return - if( not @out_msg_l ) { - &main::daemon_log("ERROR: GosaPackages: no event handler or core function defined for $header", 1); - } elsif( 0 == @out_msg_l) { - &main::daemon_log("ERROR: GosaPackages got not answer from event_handler $header", 1); + 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("$session_id ERROR: GosaPackages: no event handler or core function defined for '$header'", 1); + @out_msg_l = (); } return @out_msg_l; @@ -354,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 = "". @@ -361,20 +344,41 @@ 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 - my $func_dic = {table=>$main::job_queue_table_name, - primkey=>'id', + my $func_dic = {table=>$main::job_queue_tn, + primkey=>['id'], timestamp=>$timestamp, status=>'waiting', result=>'none', + progress=>'none', headertag=>$header, targettag=>$target, xmlmessage=>$msg, @@ -383,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"; } @@ -394,157 +398,6 @@ sub process_job_msg { return @out_msg_l; } - -sub db_res_2_xml { - my ($db_res) = @_ ; - my $xml = "
answer
$server_addressGOSA"; - - my $len_db_res= keys %{$db_res}; - for( my $i= 1; $i<= $len_db_res; $i++ ) { - $xml .= "\n"; - my $hash= $db_res->{$i}; - while ( my ($column_name, $column_value) = each %{$hash} ) { - $xml .= "<$column_name>"; - my $xml_content; - if( $column_name eq "xmlmessage" ) { - $xml_content = &encode_base64($column_value); - } else { - $xml_content = $column_value; - } - $xml .= $xml_content; - $xml .= ""; - } - $xml .= ""; - - } - - $xml .= ""; - return $xml; -} - - -## CORE FUNCTIONS ############################################################ - -sub query_jobdb { - my ($msg) = @_; - my $msg_hash = &transform_msg2hash($msg); - - # prepare query sql statement - my $select= &get_select_statement($msg, $msg_hash); - my $table= $main::job_queue_table_name; - my $where= &get_where_statement($msg, $msg_hash); - my $limit= &get_limit_statement($msg, $msg_hash); - my $orderby= &get_orderby_statement($msg, $msg_hash); - my $sql_statement= "SELECT $select FROM $table $where $orderby $limit"; - - # execute db query - my $res_hash = $main::job_db->select_dbentry($sql_statement); - my $out_xml = &db_res_2_xml($res_hash); - my @out_msg_l = ( $out_xml ); - return @out_msg_l; -} - - -sub count_jobdb { - my ($msg)= @_; - my $out_xml= "error"; - - # prepare query sql statement - my $table= $main::job_queue_table_name; - my $sql_statement= "SELECT * FROM $table "; - - # execute db query - my $res_hash = $main::job_db->select_dbentry($sql_statement); - - my $count = keys(%{$res_hash}); - $out_xml= "
answer
$server_addressGOSA$count"; - my @out_msg_l = ( $out_xml ); - return @out_msg_l; -} - - -sub delete_jobdb_entry { - my ($msg) = @_ ; - my $msg_hash = &transform_msg2hash($msg); - - # prepare query sql statement - my $table= $main::job_queue_table_name; - my $where= &get_where_statement($msg, $msg_hash); - my $sql_statement = "DELETE FROM $table $where"; - - # execute db query - my $db_res = $main::job_db->del_dbentry($sql_statement); - - my $res; - if( $db_res > 0 ) { - $res = 0 ; - } else { - $res = 1; - } - - # prepare xml answer - my $out_xml = "
answer
$server_addressGOSA$res"; - my @out_msg_l = ( $out_xml ); - return @out_msg_l; - -} - - -sub clear_jobdb { - my ($msg) = @_ ; - my $msg_hash = &transform_msg2hash($msg); - my $error= 0; - my $out_xml= "1"; - - my $table= $main::job_queue_table_name; - - my $sql_statement = "DELETE FROM $table"; - my $db_res = $main::job_db->del_dbentry($sql_statement); - if( not $db_res > 0 ) { $error++; }; - - if( $error == 0 ) { - $out_xml = "
answer
$server_addressGOSA0"; - } - my @out_msg_l = ( $out_xml ); - return @out_msg_l; -} - - -sub update_status_jobdb_entry { - my ($msg) = @_ ; - my $msg_hash = &transform_msg2hash($msg); - my $error= 0; - my $out_xml= "
answer
$server_addressGOSA1"; - - my @len_hash = keys %{$msg_hash}; - if( 0 == @len_hash) { $error++; }; - - # prepare query sql statement - if( $error == 0) { - my $table= $main::job_queue_table_name; - my $where= &get_where_statement($msg, $msg_hash); - my $update= &get_update_statement($msg, $msg_hash); - - my $sql_statement = "UPDATE $table $update $where"; - - # execute db query - my $db_res = $main::job_db->update_dbentry($sql_statement); - - # check success of db update - if( not $db_res > 0 ) { $error++; }; - } - - if( $error == 0) { - $out_xml = "
answer
$server_addressGOSA0"; - } - my @out_msg_l = ( $out_xml ); - -print STDERR $out_xml."\n"; - - return @out_msg_l; -} - - 1;