X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FGosaPackages.pm;h=772955f122911d1ec279d508c37f70e678eccb36;hb=1224ef3997e0c2c3e9edbdf61ad444e49af6fcfa;hp=f13ed3bc125716495d8831f26acbdc41db6e7bf3;hpb=7055784da1dcd9060ddf4e61cbf6d1e0b7de9043;p=gosa.git

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index f13ed3bc1..772955f12 100644
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -7,46 +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'],
+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],
     },
-"bus" =>
-    {"bus_activ" => [\$bus_activ, "on"],
-    "bus_passwd" => [\$bus_passwd, ""],
-    "bus_ip" => [\$bus_ip, "0.0.0.0"],
-    "bus_port" => [\$bus_port, "20080"],
-    },
-"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'],
     },
 );
  
@@ -59,8 +51,9 @@ $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
@@ -68,14 +61,14 @@ my $gosa_address = "$gosa_ip:$gosa_port";
 my $xml = new XML::Simple();
 
 
+# import events
+&import_events();
+
 ## FUNCTIONS #################################################################
 
 sub get_module_info {
     my @info = ($gosa_address,
                 $gosa_passwd,
-                $gosa_server,
-                $gosa_activ,
-                "socket",
                 );
     return \@info;
 }
@@ -228,6 +221,35 @@ 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);   
+    }
+    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);
+    }
+}
+
+
 #===  FUNCTION  ================================================================
 #         NAME:  process_incoming_msg
 #   PARAMETERS:  crypted_msg - string - incoming crypted message
@@ -235,121 +257,153 @@ sub get_ip {
 #  DESCRIPTION:  handels the proceeded distribution to the appropriated functions
 #===============================================================================
 sub process_incoming_msg {
-    my ($msg, $msg_hash) = @_ ;
+    my ($msg, $msg_hash, $session_id) = @_ ;
     my $header = @{$msg_hash->{header}}[0];
-    my $out_msg;
-    
+    my @msg_l;
+    my @out_msg_l;
+
     &main::daemon_log("GosaPackages: receive '$header'", 1);
     
     if ($header =~ /^job_/) {
-        $out_msg = &process_job_msg($msg, $msg_hash);
+        @msg_l = &process_job_msg($msg, $msg_hash, $session_id);
     } 
     elsif ($header =~ /^gosa_/) {
-        $out_msg = &process_gosa_msg($msg, $header);
+        @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");
     }
-    
-    # keep job queue uptodate and save result and status    
-    if ($out_msg =~ /<jobdb_id>(\d*?)<\/jobdb_id>/) {
-        my $job_id = $1;
-        my $sql = "UPDATE '".$main::job_queue_table_name.
-            "' SET status='done', result='".$out_msg.
-            "' WHERE id='$job_id'";
-        my $res = $main::job_db->exec_statement($sql);
-    } 
 
-    my @out_msg_l;
-    push(@out_msg_l, $out_msg);
+    foreach my $out_msg ( @msg_l ) {
+
+        # keep job queue up-to-date and save result and status
+        if (defined ($out_msg) && $out_msg =~ /<jobdb_id>(\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 <source>GOSA</source> of <source>$server_address</source>
+        $out_msg =~ s/<source>GOSA<\/source>/<source>$server_address<\/source>/g;
+
+        if (defined $out_msg){
+            push(@out_msg_l, $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 'count_jobdb' ) { $out_msg = &count_jobdb }
-    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", 8);
-
-            $out_msg = "";
-            open(PIPE, "$cmd 2>&1 |");
-            while(<PIPE>) {
-                $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 = "<xml>".
+            "<header>answer</header>".
+            "<source>$server_address</source>".
+            "<target>GOSA</target>".
+            "<answer1>1</answer1>".
+            "<error_string>no mac address specified</error_string>".
+            "</xml>";
+    }
+    
     # 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 = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>$res</answer1></xml>";
     }
     
-    &main::daemon_log("GosaPackages: $header job successfully added to job queue", 3);
-    return "<xml><answer1>$res</answer1></xml>";
-
+    my @out_msg_l = ( $out_msg );
+    return @out_msg_l;
 }
 
 
 sub db_res_2_xml {
     my ($db_res) = @_ ;
-
-    my $xml = "<xml>";
+    my $xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target>";
 
     my $len_db_res= keys %{$db_res};
-
     for( my $i= 1; $i<= $len_db_res; $i++ ) {
         $xml .= "\n<answer$i>";
         my $hash= $db_res->{$i};
@@ -390,8 +444,8 @@ sub query_jobdb {
     # 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;
 }
 
 
@@ -407,9 +461,9 @@ sub count_jobdb {
     my $res_hash = $main::job_db->select_dbentry($sql_statement);
 
     my $count = keys(%{$res_hash});
-    $out_xml= "<xml><count>$count</count></xml>";
-
-    return $out_xml;
+    $out_xml= "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><count>$count</count></xml>";
+    my @out_msg_l = ( $out_xml );
+    return @out_msg_l;
 }
 
 
@@ -433,8 +487,9 @@ sub delete_jobdb_entry {
     }
 
     # prepare xml answer
-    my $out_xml = "<xml><answer1>$res</answer1></xml>";
-    return $out_xml;
+    my $out_xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>$res</answer1></xml>";
+    my @out_msg_l = ( $out_xml );
+    return @out_msg_l;
 
 }
 
@@ -452,10 +507,10 @@ sub clear_jobdb {
     if( not $db_res > 0 ) { $error++; };
     
     if( $error == 0 ) {
-        $out_xml = "<xml><answer1>0</answer1></xml>";
+        $out_xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>0</answer1></xml>";
     }
-   
-    return $out_xml;
+    my @out_msg_l = ( $out_xml );
+    return @out_msg_l;
 }
 
 
@@ -463,7 +518,7 @@ sub update_status_jobdb_entry {
     my ($msg) = @_ ;
     my $msg_hash = &transform_msg2hash($msg);
     my $error= 0;
-    my $out_xml= "<xml><answer1>1</answer1></xml>";
+    my $out_xml= "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>1</answer1></xml>";
 
     my @len_hash = keys %{$msg_hash};
     if( 0 == @len_hash) {  $error++; };
@@ -474,8 +529,13 @@ sub update_status_jobdb_entry {
         my $where= &get_where_statement($msg, $msg_hash);
         my $update= &get_update_statement($msg, $msg_hash);
 
-        my $sql_statement = "UPDATE $table $update $where";
+        # conditions
+        # no timestamp update if status eq waiting
+        
 
+        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);
 
@@ -484,46 +544,14 @@ sub update_status_jobdb_entry {
     }
 
     if( $error == 0) {
-        $out_xml = "<xml><answer1>0</answer1></xml>";
+        $out_xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>0</answer1></xml>";
     }
+    my @out_msg_l = ( $out_xml );
 
-    return $out_xml;
-}
+print STDERR $out_xml."\n";
 
-#sub update_timestamp_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} = [];
-#    }
-#
-#    if( not exists $msg_hash->{update}[0]->{timestamp} ) {
-#        return "<xml><answer1>1</answer1></xml>";
-#    }
-#
-#    $update_hash->{update} = [ { timestamp=>$msg_hash->{update}[0]->{timestamp} } ];
-#
-#    # 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 = "<xml><answer1>$res</answer1></xml>";
-#    return $out_xml;
-#
-#}
+    return @out_msg_l;
+}
 
 
 1;