X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FGosaPackages.pm;h=772955f122911d1ec279d508c37f70e678eccb36;hb=1224ef3997e0c2c3e9edbdf61ad444e49af6fcfa;hp=ffc99840c0ca5496ac9c4dd00dff843449a42b22;hpb=4e0d8b80d940e9d759addecf2909a2ec53d420b5;p=gosa.git diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index ffc99840c..772955f12 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -7,45 +7,38 @@ use strict; use warnings; use GOSA::GosaSupportDaemon; use IO::Socket::INET; +use Socket; use XML::Simple; use File::Spec; use Data::Dumper; use GOSA::DBsqlite; use MIME::Base64; +my $event_dir = "/usr/lib/gosa-si/server/events"; +use lib "/usr/lib/gosa-si/server/events"; + BEGIN{} END{} -my ($server_activ, $server_ip, $server_mac_address, $server_port, $server_passwd, $max_clients, $server_event_dir); -my ($bus_activ, $bus_passwd, $bus_ip, $bus_port); -my ($gosa_activ, $gosa_ip, $gosa_mac_address, $gosa_port, $gosa_passwd, $network_interface); +my ($server_ip, $server_mac_address, $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); my $gosa_server; - -my %cfg_defaults = -("general" => - {"job_queue_file_name" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'], - }, -"server" => - {"server_activ" => [\$server_activ, "on"], - "server_ip" => [\$server_ip, "0.0.0.0"], - "server_port" => [\$server_port, "20081"], - "server_passwd" => [\$server_passwd, ""], - "max_clients" => [\$max_clients, 100], - "server_event_dir" => [\$server_event_dir, '/usr/lib/gosa-si/server/events'], - }, -"bus" => - {"bus_activ" => [\$bus_activ, "on"], - "bus_passwd" => [\$bus_passwd, ""], - "bus_ip" => [\$bus_ip, "0.0.0.0"], - "bus_port" => [\$bus_port, "20080"], +my $event_hash; + +my %cfg_defaults = ( +"server" => { + "ip" => [\$server_ip, "0.0.0.0"], + "port" => [\$server_port, "20081"], + "key" => [\$server_passwd, ""], + "max-clients" => [\$max_clients, 100], }, -"gosa" => - {"gosa_activ" => [\$gosa_activ, "on"], - "gosa_ip" => [\$gosa_ip, "0.0.0.0"], - "gosa_port" => [\$gosa_port, "20082"], - "gosa_passwd" => [\$gosa_passwd, "none"], +"GOsaPackages" => { + "ip" => [\$gosa_ip, "0.0.0.0"], + "port" => [\$gosa_port, "20082"], + "key" => [\$gosa_passwd, "none"], + "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'], }, ); @@ -58,46 +51,24 @@ $network_interface= &get_interface_for_ip($server_ip); $gosa_mac_address= &get_mac($network_interface); # complete addresses -my $server_address = "$server_ip:$server_port"; -my $bus_address = "$bus_ip:$bus_port"; +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 -my $gosa_cipher = &create_ciphering($gosa_passwd); +#y $gosa_cipher = &create_ciphering($gosa_passwd); my $xml = new XML::Simple(); -# open gosa socket -if ($gosa_activ eq "on") { - &main::daemon_log(" ",1); - $gosa_server = IO::Socket::INET->new(LocalPort => $gosa_port, - Type => SOCK_STREAM, - Reuse => 1, - Listen => 1, - ); - if (not defined $gosa_server) { - &main::daemon_log("cannot start tcp server at $gosa_port for communication to gosa: $@", 1); - die; - } else { - &main::daemon_log("start server for communication to gosa: $gosa_address", 1); - - } -} - -# create gosa job queue as a SQLite DB -my $table_name = "jobs"; -my $sqlite = GOSA::DBsqlite->new($job_queue_file_name); - - +# import events +&import_events(); ## FUNCTIONS ################################################################# sub get_module_info { my @info = ($gosa_address, $gosa_passwd, - $gosa_server, - $gosa_activ, - "socket", ); return \@info; } @@ -249,29 +220,33 @@ sub get_ip { return $result; } -#=== FUNCTION ================================================================ -# NAME: open_socket -# PARAMETERS: PeerAddr string something like 192.168.1.1 or 192.168.1.1:10000 -# [PeerPort] string necessary if port not appended by PeerAddr -# RETURNS: socket IO::Socket::INET -# DESCRIPTION: open a socket to PeerAddr -#=============================================================================== -sub open_socket { - my ($PeerAddr, $PeerPort) = @_ ; - if(defined($PeerPort)){ - $PeerAddr = $PeerAddr.":".$PeerPort; + +sub import_events { + if (not -e $event_dir) { + &main::daemon_log("ERROR: cannot find directory or directory is not readable: $event_dir", 1); } - my $socket; - $socket = new IO::Socket::INET(PeerAddr => $PeerAddr , - Porto => "tcp" , - Type => SOCK_STREAM, - Timeout => 5, - ); - if(not defined $socket) { - return; + 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 + + eval{ require $event; }; + if( $@ ) { + &main::daemon_log("import of event module '$event' failed", 1); + &main::daemon_log("$@", 8); + next; + } + + $event =~ /(\S*?).pm$/; + my $event_module = $1; + my $events_l = eval( $1."::get_events()") ; + foreach my $event_name (@{$events_l}) { + $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("open_socket to: $PeerAddr", 7); - return $socket; } @@ -282,156 +257,156 @@ sub open_socket { # DESCRIPTION: handels the proceeded distribution to the appropriated functions #=============================================================================== sub process_incoming_msg { - my ($crypted_msg) = @_ ; - if( (not(defined($crypted_msg))) || (length($crypted_msg) <= 0)) { - &main::daemon_log("function 'process_incoming_msg': got no msg", 7); - return; - } - - $crypted_msg =~ /^([\s\S]*?)\.(\d{1,3}?)\.(\d{1,3}?)\.(\d{1,3}?)\.(\d{1,3}?)$/; - $crypted_msg = $1; - my $host = sprintf("%s.%s.%s.%s", $2, $3, $4, $5); - - # collect addresses from possible incoming clients - # only gosa is allowd as incoming client - &main::daemon_log("GosaPackages: host_key: $host", 7); - &main::daemon_log("GosaPackages: key_passwd: $gosa_passwd", 7); - - $gosa_cipher = &create_ciphering($gosa_passwd); - - # determine the correct passwd for deciphering of the incoming msgs - my $msg = ""; - my $msg_hash; - eval{ - $msg = &decrypt_msg($crypted_msg, $gosa_cipher); - &main::daemon_log("GosaPackages: decrypted_msg: \n$msg", 7); - - $msg_hash = $xml->XMLin($msg, ForceArray=>1); - }; - if($@) { - &main::daemon_log("WARNING: GosaPackages do not understand the message:", 5); - &main::daemon_log("$@", 7); - return; - } - + my ($msg, $msg_hash, $session_id) = @_ ; my $header = @{$msg_hash->{header}}[0]; + my @msg_l; + my @out_msg_l; + + &main::daemon_log("GosaPackages: receive '$header'", 1); - &main::daemon_log("GosaPackages: receive '$header' from $host", 1); - - my $out_msg; if ($header =~ /^job_/) { - $out_msg = &process_job_msg($msg, $msg_hash); - } elsif ($header =~ /^gosa_/) { - $out_msg = &process_gosa_msg($msg, $header); - } else { + @msg_l = &process_job_msg($msg, $msg_hash, $session_id); + } + elsif ($header =~ /^gosa_/) { + @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"); } - - if (not defined $out_msg) { - return; - } - if ($out_msg =~ /(\d*?)<\/jobdb_id>/) { - my $job_id = $1; - my $sql = "BEGIN TRANSATION; UPDATE '".$main::job_queue_table_name. - "' SET status='done', result='".$out_msg. - "' WHERE id='$job_id'; COMMIT;"; - my $res = $main::job_db->exec_statement($sql); - return; + foreach my $out_msg ( @msg_l ) { - } else { + # 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='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; + + if (defined $out_msg){ + push(@out_msg_l, $out_msg); + } - my $out_cipher = &create_ciphering($gosa_passwd); - $out_msg = &encrypt_msg($out_msg, $out_cipher); - return $out_msg; } + return \@out_msg_l; } + sub process_gosa_msg { - my ($msg, $header) = @_ ; + my ($msg, $msg_hash, $session_id) = @_ ; my $out_msg; + my @out_msg_l; + + 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 = &query_jobdb } - elsif ($header eq 'delete_jobdb_entry') { $out_msg = &delete_jobdb_entry } - elsif ($header eq 'clear_jobdb') { $out_msg = &clear_jobdb } - elsif ($header eq 'update_status_jobdb_entry' ) { $out_msg = &update_status_jobdb_entry } - elsif ($header eq 'update_timestamp_jobdb_entry' ) { $out_msg = &update_timestamp_jobdb_entry } - else { + 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 - # fetch all available eventhandler under $server_event_dir - opendir (DIR, $server_event_dir) or &main::daemon_log("ERROR cannot open $server_event_dir: $!\n", 1) and return; - while (defined (my $file = readdir (DIR))) { - if (not $file eq $header) { - next; - } - # try to deliver incoming msg to eventhandler - my $cmd = File::Spec->join($server_event_dir, $header)." '$msg'"; - &main::daemon_log("GosaPackages: execute event_handler $header", 3); - &main::daemon_log("GosaPackages: cmd: $cmd", 7); - - $out_msg = ""; - open(PIPE, "$cmd 2>&1 |"); - while() { - $out_msg.=$_; - } - close(PIPE); - &main::daemon_log("GosaPackages: answer of cmd: $out_msg", 5); - last; - } + # 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 delivery not possible raise error and return - if (not defined $out_msg) { + if( not @out_msg_l ) { &main::daemon_log("ERROR: GosaPackages: no event handler or core function defined for $header", 1); - } elsif ($out_msg eq "") { + } elsif( 0 == @out_msg_l) { &main::daemon_log("ERROR: GosaPackages got not answer from event_handler $header", 1); - } - return $out_msg; - + } + + return @out_msg_l; } sub process_job_msg { - my ($msg, $msg_hash)= @_ ; + my ($msg, $msg_hash, $session_id)= @_ ; + my $out_msg; + my $error = 0; - my $header = @{$msg_hash->{header}}[0]; + my $header = @{$msg_hash->{'header'}}[0]; $header =~ s/job_//; + # if no timestamp is specified, use 19700101000000 + my $timestamp = "19700101000000"; + if( exists $msg_hash->{'timestamp'} ) { + $timestamp = @{$msg_hash->{'timestamp'}}[0]; + } + + #if no macaddress is specified, raise error + my $macaddress; + if( exists $msg_hash->{'macaddress'} ) { + $macaddress = @{$msg_hash->{'macaddress'}}[0]; + } else { + $error ++; + $out_msg = "". + "
answer
". + "$server_address". + "GOSA". + "1". + "no mac address specified". + "
"; + } + # check wether mac address is already known in known_daemons or known_clients my $target = 'none'; - # add job to job queue - my $func_dic = {table=>$main::job_queue_table_name, - primkey=>'id', - timestamp=>@{$msg_hash->{timestamp}}[0], - status=>'waiting', - result=>'none', - headertag=>$header, - targettag=>$target, - xmlmessage=>$msg, - macaddress=>@{$msg_hash->{mac}}[0], - }; - my $res = $main::job_db->add_dbentry($func_dic); - if (not $res == 0) { - &main::daemon_log("ERROR: GosaPackages: process_job_msg: $res", 1); + if( $error == 0 ) { + # add job to job queue + my $func_dic = {table=>$main::job_queue_table_name, + primkey=>'id', + timestamp=>$timestamp, + status=>'waiting', + result=>'none', + progress=>'none', + headertag=>$header, + targettag=>$target, + xmlmessage=>$msg, + macaddress=>$macaddress, + }; + + my $res = $main::job_db->add_dbentry($func_dic); + if (not $res == 0) { + &main::daemon_log("ERROR: GosaPackages: process_job_msg: $res", 1); + } else { + &main::daemon_log("INFO: GosaPackages: $header job successfully added to job queue", 5); + } + $out_msg = "
answer
$server_addressGOSA$res
"; } - &main::daemon_log("GosaPackages: $header job successfully added to job queue", 3); - return "<1>$res"; - + my @out_msg_l = ( $out_msg ); + return @out_msg_l; } sub db_res_2_xml { my ($db_res) = @_ ; - my $xml = ""; - - while ( my ($hit, $hash) = each %{ $db_res } ) { - $xml .= "\n"; + 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; @@ -443,8 +418,8 @@ sub db_res_2_xml { $xml .= $xml_content; $xml .= ""; } + $xml .= ""; - $xml .= "
"; } $xml .= "
"; @@ -459,38 +434,50 @@ sub query_jobdb { my $msg_hash = &transform_msg2hash($msg); # prepare query sql statement - my @where = @{$msg_hash->{where}}; - my $where_hash = {table=>$main::job_queue_table_name }; - foreach my $where_pram (@where) { - my $where_val = @{$msg_hash->{$where_pram}}[0]; - if (defined $where_val) { - $where_hash->{$where_pram} = $where_val; - } - } - - # execute db query - my $res_hash = $main::job_db->select_dbentry($where_hash); + 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); - return $out_xml; + 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 @where = @{$msg_hash->{where}}; - my $where_hash = {table=>$main::job_queue_table_name }; - foreach my $where_pram (@where) { - my $where_val = @{$msg_hash->{$where_pram}}[0]; - if (defined $where_val) { - $where_hash->{$where_pram} = $where_val; - } - } + 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($where_hash); + my $db_res = $main::job_db->del_dbentry($sql_statement); my $res; if( $db_res > 0 ) { @@ -500,98 +487,70 @@ sub delete_jobdb_entry { } # prepare xml answer - my $out_xml = "$res"; - return $out_xml; + 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 $where_hash = {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++; }; - # execute db query - my $db_res = $main::job_db->del_dbentry($where_hash); - print STDERR "db_res=$db_res\n"; - my $res; - if( $db_res eq '0E0' ) { - $res = 0 ; - } else { - $res = 1; + if( $error == 0 ) { + $out_xml = "
answer
$server_addressGOSA0
"; } - - # prepare xml answer - my $out_xml = "$res"; - return $out_xml; + my @out_msg_l = ( $out_xml ); + return @out_msg_l; } + sub update_status_jobdb_entry { my ($msg) = @_ ; my $msg_hash = &transform_msg2hash($msg); - - # prepare query sql statement - my $update_hash = {table=>$main::job_queue_table_name }; - if( exists $msg_hash->{where} ) { - $update_hash->{where} = $msg_hash->{where}; - } else { - $update_hash->{where} = []; - } + my $error= 0; + my $out_xml= "
answer
$server_addressGOSA1
"; - if( not exists $msg_hash->{update}[0]->{status} ) { - return "1"; - } - $update_hash->{update} = [ { status=>$msg_hash->{update}[0]->{status} } ]; - - # execute db query - my $db_res = $main::job_db->update_dbentry($update_hash); - - # transform db answer to error returnment - my $res; - if( $db_res > 0 ) { - $res = 0 ; - } else { - $res = 1; - } - - # prepare xml answer - my $out_xml = "$res"; - return $out_xml; -} - -sub update_timestamp_jobdb_entry { - my ($msg) = @_ ; - my $msg_hash = &transform_msg2hash($msg); + my @len_hash = keys %{$msg_hash}; + if( 0 == @len_hash) { $error++; }; # prepare query sql statement - my $update_hash = {table=>$main::job_queue_table_name }; - if( exists $msg_hash->{where} ) { - $update_hash->{where} = $msg_hash->{where}; - } else { - $update_hash->{where} = []; - } + 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); - if( not exists $msg_hash->{update}[0]->{timestamp} ) { - return "1"; - } + # conditions + # no timestamp update if status eq waiting + - $update_hash->{update} = [ { timestamp=>$msg_hash->{update}[0]->{timestamp} } ]; + my $sql_statement = "UPDATE $table $update $where"; +print STDERR "================================================\n"; +print STDERR "$sql_statement\n"; + # execute db query + my $db_res = $main::job_db->update_dbentry($sql_statement); - # execute db query - my $db_res = $main::job_db->update_dbentry($update_hash); + # check success of db update + if( not $db_res > 0 ) { $error++; }; + } - # transform db answer to error returnment - my $res; - if( $db_res > 0 ) { - $res = 0 ; - } else { - $res = 1; + if( $error == 0) { + $out_xml = "
answer
$server_addressGOSA0
"; } + my @out_msg_l = ( $out_xml ); - # prepare xml answer - my $out_xml = "$res"; - return $out_xml; +print STDERR $out_xml."\n"; + return @out_msg_l; }