X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FGosaPackages.pm;h=835eaa520108a5015b9238290436f1cf3b3df8e4;hb=850ef70d7d016480405e610bd698a4b0ffc8d6c7;hp=f5f976284e2915ee73ee035c809d4ac6d55ad378;hpb=7cc3d107061f1d30ca8f882024f6201b072b72d0;p=gosa.git diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index f5f976284..835eaa520 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -7,151 +7,63 @@ 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"; +my $event_dir = "/usr/lib/gosa-si/server/GosaPackages"; +use lib "/usr/lib/gosa-si/server/GosaPackages"; BEGIN{} END{} -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 $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], - }, -"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'], - }, -); - +my $network_interface; +my $gosa_mac_address; ## START ########################## -# read configfile and import variables -&read_configfile(); -$network_interface= &get_interface_for_ip($server_ip); +$network_interface= &get_interface_for_ip($main::server_ip); $gosa_mac_address= &get_mac($network_interface); # complete addresses -my $server_address = "$server_ip:$server_port"; -my $gosa_address = "$gosa_ip:$gosa_port"; +if( inet_aton($main::server_ip) ){ $main::server_ip = inet_ntoa(inet_aton($main::server_ip)); } +$main::server_address = $main::server_ip.":".$main::server_port; -# create general settings for this module -#y $gosa_cipher = &create_ciphering($gosa_passwd); -my $xml = new XML::Simple(); -# import events -&import_events(); - -## FUNCTIONS ################################################################# - -sub get_module_info { - my @info = ($gosa_address, - $gosa_passwd, - ); - return \@info; -} - - -#=== FUNCTION ================================================================ -# NAME: read_configfile -# PARAMETERS: cfg_file - string - -# RETURNS: nothing -# DESCRIPTION: read cfg_file and set variables -#=============================================================================== -sub read_configfile { - my $cfg; - if( defined( $main::cfg_file) && ( length($main::cfg_file) > 0 )) { - if( -r $main::cfg_file ) { - $cfg = Config::IniFiles->new( -file => $main::cfg_file ); - } else { - print STDERR "Couldn't read config file!"; - } +# import local events +my ($error, $result, $event_hash) = &import_events($event_dir); +foreach my $log_line (@$result) { + if ($log_line =~ / succeed: /) { + &main::daemon_log("0 INFO: GosaPackages - $log_line", 5); } else { - $cfg = Config::IniFiles->new() ; - } - foreach my $section (keys %cfg_defaults) { - foreach my $param (keys %{$cfg_defaults{ $section }}) { - my $pinfo = $cfg_defaults{ $section }{ $param }; - ${@$pinfo[0]} = $cfg->val( $section, $param, @$pinfo[1] ); - } + &main::daemon_log("0 ERROR: GosaPackages - $log_line", 1); } } -#=== FUNCTION ================================================================ -# NAME: get_interface_for_ip -# PARAMETERS: ip address (i.e. 192.168.0.1) -# RETURNS: array: list of interfaces if ip=0.0.0.0, matching interface if found, undef else -# DESCRIPTION: Uses proc fs (/proc/net/dev) to get list of interfaces. -#=============================================================================== -sub get_interface_for_ip { - my $result; - my $ip= shift; - if ($ip && length($ip) > 0) { - my @ifs= &get_interfaces(); - if($ip eq "0.0.0.0") { - $result = "all"; - } else { - foreach (@ifs) { - my $if=$_; - if(get_ip($if) eq $ip) { - $result = $if; - } - } - } - } - return $result; -} - -#=== FUNCTION ================================================================ -# NAME: get_interfaces -# PARAMETERS: none -# RETURNS: (list of interfaces) -# DESCRIPTION: Uses proc fs (/proc/net/dev) to get list of interfaces. -#=============================================================================== -sub get_interfaces { - my @result; - my $PROC_NET_DEV= ('/proc/net/dev'); - - open(PROC_NET_DEV, "<$PROC_NET_DEV") - or die "Could not open $PROC_NET_DEV"; - - my @ifs = ; +# build vice versa event_hash, event_name => module +my $event2module_hash = {}; +while (my ($module, $mod_events) = each %$event_hash) { + while (my ($event_name, $nothing) = each %$mod_events) { + $event2module_hash->{$event_name} = $module; + } - close(PROC_NET_DEV); +} - # Eat first two line - shift @ifs; - shift @ifs; - chomp @ifs; - foreach my $line(@ifs) { - my $if= (split /:/, $line)[0]; - $if =~ s/^\s+//; - push @result, $if; - } +## FUNCTIONS ################################################################# - return @result; +sub get_module_info { + my @info = ($main::gosa_address, + $main::gosa_passwd, + $event_hash, + ); + return \@info; } + #=== FUNCTION ================================================================ # NAME: get_mac # PARAMETERS: interface name (i.e. eth0) @@ -159,89 +71,34 @@ sub get_interfaces { # DESCRIPTION: Uses ioctl to get mac address directly from system. #=============================================================================== sub get_mac { - my $ifreq= shift; - my $result; - if ($ifreq && length($ifreq) > 0) { - if($ifreq eq "all") { - $result = "00:00:00:00:00:00"; - } else { - my $SIOCGIFHWADDR= 0x8927; # man 2 ioctl_list - - # A configured MAC Address should always override a guessed value - if ($gosa_mac_address and length($gosa_mac_address) > 0) { - $result= $gosa_mac_address; - } - - socket SOCKET, PF_INET, SOCK_DGRAM, getprotobyname('ip') - or die "socket: $!"; - - if(ioctl SOCKET, $SIOCGIFHWADDR, $ifreq) { - my ($if, $mac)= unpack 'h36 H12', $ifreq; - - if (length($mac) > 0) { - $mac=~ m/^([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])$/; - $mac= sprintf("%s:%s:%s:%s:%s:%s", $1, $2, $3, $4, $5, $6); - $result = $mac; - } - } - } - } - return $result; -} + my $ifreq= shift; + my $result; + if ($ifreq && length($ifreq) > 0) { + if($ifreq eq "all") { + $result = "00:00:00:00:00:00"; + } else { + my $SIOCGIFHWADDR= 0x8927; # man 2 ioctl_list -#=== FUNCTION ================================================================ -# NAME: get_ip -# PARAMETERS: interface name (i.e. eth0) -# RETURNS: (ip address) -# DESCRIPTION: Uses ioctl to get ip address directly from system. -#=============================================================================== -sub get_ip { - my $ifreq= shift; - my $result= ""; - my $SIOCGIFADDR= 0x8915; # man 2 ioctl_list - my $proto= getprotobyname('ip'); + # A configured MAC Address should always override a guessed value + if ($gosa_mac_address and length($gosa_mac_address) > 0) { + $result= $gosa_mac_address; + } - socket SOCKET, PF_INET, SOCK_DGRAM, $proto + socket SOCKET, PF_INET, SOCK_DGRAM, getprotobyname('ip') or die "socket: $!"; - if(ioctl SOCKET, $SIOCGIFADDR, $ifreq) { - my ($if, $sin) = unpack 'a16 a16', $ifreq; - my ($port, $addr) = sockaddr_in $sin; - my $ip = inet_ntoa $addr; + if(ioctl SOCKET, $SIOCGIFHWADDR, $ifreq) { + my ($if, $mac)= unpack 'h36 H12', $ifreq; - if ($ip && length($ip) > 0) { - $result = $ip; + if (length($mac) > 0) { + $mac=~ m/^([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])$/; + $mac= sprintf("%s:%s:%s:%s:%s:%s", $1, $2, $3, $4, $5, $6); + $result = $mac; } + } } - - return $result; -} - - -sub import_events { - if (not -e $event_dir) { - 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; } - - 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; - } - } + return $result; } @@ -252,294 +109,227 @@ sub import_events { # 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; - - &main::daemon_log("GosaPackages: receive '$header'", 1); + my @msg_l; + my @out_msg_l; + + &main::daemon_log("$session_id DEBUG: GosaPackages: msg to process '$header'", 26); 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, $msg_hash); + @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); } - # keep job queue uptodate 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', result='".$out_msg. - "' WHERE id='$job_id'"; - my $res = $main::job_db->exec_statement($sql); - } + foreach my $out_msg ( @msg_l ) { + # determine the correct outgoing source address to the corresponding target address + $out_msg =~ /(\S*)<\/target>/; + my $act_target = $1; + $act_target =~ s/GOSA/$main::server_address/; + my $act_server_ip = &main::get_local_ip_for_remote_ip(sprintf("%s", $act_target =~ /^([0-9\.]*?):.*$/)); - my @out_msg_l; - if (defined $out_msg){ - push(@out_msg_l, $out_msg); - } - return \@out_msg_l; -} + # Patch the correct outgoing source address + if ($out_msg =~ /GOSA<\/source>/ ) { + $out_msg =~ s/GOSA<\/source>/$act_server_ip:$main::server_port<\/source>/g; + } + # Add to each outgoing message the current POE session id + $out_msg =~ s/<\/xml>/$session_id<\/session_id><\/xml>/; -sub process_gosa_msg { - my ($msg, $msg_hash) = @_ ; - my $out_msg; - 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 - } elsif ($header eq 'trigger_action_reboot' ) { - print STDERR "trigger_action_reboot\n"; - print STDERR Dumper($msg); - } elsif ($header eq 'trigger_action_wake' ) { - # Forward messages to all known servers as "trigger_wake" - my $in_hash= &transform_msg2hash($msg); - my %data = ( 'macAddress' => \@{$in_hash->{macAddress}} ); - $out_msg = &send_msg("trigger_wake", $server_address, "KNOWN_SERVER", \%data); - } 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 = &{$event_hash->{$header}."::$header"}($msg, $msg_hash); - } - -# 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() { -# $out_msg.=$_; -# } -# close(PIPE); -# &main::daemon_log("GosaPackages: answer of cmd: $out_msg", 5); -# last; -# } + if (defined $out_msg){ + push(@out_msg_l, $out_msg); + } } - # if delivery not possible raise error and return - if (not defined $out_msg) { - &main::daemon_log("ERROR: GosaPackages: no event handler or core function defined for $header", 1); - } elsif ($out_msg eq "") { - &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 $header = @{$msg_hash->{header}}[0]; - $header =~ s/job_//; - - # 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); - } - - &main::daemon_log("GosaPackages: $header job successfully added to job queue", 3); - return "
answer
$server_addressGOSA$res"; +sub process_gosa_msg { + my ($msg, $msg_hash, $session_id) = @_ ; + my $out_msg; + my @out_msg_l = ('nohandler'); + my $sql_events; -} + # strip gosa_ prefix from header, it is not used any more + @{$msg_hash->{'header'}}[0] =~ s/gosa_//; + $msg =~ s/
gosa_/
/; + my $header = @{$msg_hash->{'header'}}[0]; + my $target = @{$msg_hash->{'target'}}[0]; -sub db_res_2_xml { - my ($db_res) = @_ ; + # check local installed events + if( exists $event2module_hash->{$header} ) { + # a event exists with the header as name + &main::daemon_log("$session_id DEBUG: found event '$header' at event-module '".$event2module_hash->{$header}."'", 26); + no strict 'refs'; + @out_msg_l = &{$event2module_hash->{$header}."::$header"}( $msg, $msg_hash, $session_id ); - my $xml = "
answer
$server_addressGOSA"; + # check client registered events + } else { + $sql_events = "SELECT * FROM $main::known_clients_tn WHERE ( (macaddress LIKE '$target') OR (hostname='$target') )"; + my $res = $main::known_clients_db->select_dbentry( $sql_events ); + my $l = keys(%$res); + + # set error if no or more than 1 hits are found for sql query + if ( $l != 1) { + @out_msg_l = ('knownclienterror'); + # found exact 1 hit in db + } else { + my $client_events = $res->{'1'}->{'events'}; - my $len_db_res= keys %{$db_res}; + # client is registered for this event, deliver this message to client + if (($client_events =~ /^$header,/) || ($client_events =~ /,$header,/) || ($client_events =~ /,$header$/)) { + &main::daemon_log("$session_id DEBUg: client '$target' is registerd for event '$header', forward message to client.", 26); + @out_msg_l = ( $msg ); - 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); + # client is not registered for this event, set error } else { - $xml_content = $column_value; + @out_msg_l = ('noeventerror'); } - $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); + # if delivery not possible raise error and return + if (not defined $out_msg_l[0]) { + @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 = (); + } elsif ($out_msg_l[0] eq 'knownclienterror') { + if ($header eq "ping") { + &main::daemon_log("$session_id WARNING: Cannot send '$header' to '$target'. GOsa-si do not know client. Maybe client is offline or gosa-si-client process is not running.", 3); + } else { + &main::daemon_log("$session_id ERROR: no general event handler found for '$header', check client registration events!", 1); + &main::daemon_log("$session_id ERROR: no or more than 1 hits are found at known_clients_db with sql query: '$sql_events'", 1); + &main::daemon_log("$session_id ERROR: processing is aborted and message will not be forwarded", 1); + } + @out_msg_l = (); + } elsif ($out_msg_l[0] eq 'noeventerror') { + &main::daemon_log("$session_id ERROR: no general event handler found for '$header', check client registration events!", 1); + &main::daemon_log("$session_id ERROR: client '$target' is not registered for event '$header', processing is aborted", 1); + @out_msg_l = (); + } - return $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"; - - return $out_xml; -} - +sub process_job_msg { + my ($msg, $msg_hash, $session_id)= @_ ; + my $out_msg; + my $error = 0; -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"; + my $header = @{$msg_hash->{'header'}}[0]; + $header =~ s/job_//; + my $target = @{$msg_hash->{'target'}}[0]; - # execute db query - my $db_res = $main::job_db->del_dbentry($sql_statement); - - my $res; - if( $db_res > 0 ) { - $res = 0 ; - } else { - $res = 1; + # If no timestamp is specified, use 19700101000000 + my $timestamp = "19700101000000"; + if( exists $msg_hash->{'timestamp'} ) { + $timestamp = @{$msg_hash->{'timestamp'}}[0]; } - # prepare xml answer - my $out_xml = "
answer
$server_addressGOSA$res"; - return $out_xml; - -} - - -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"; + # If no macaddress is specified, raise error + 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 = "". + "
answer
". + "$main::server_address". + "GOSA". + "1". + "no mac address specified, neither in target-tag nor in macaddres-tag". + ""; + + return ($out_msg); } - - return $out_xml; -} - - -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); + # Determine plain_name for host + my $plain_name; + if ($header eq "opsi_install_client") { # Opsi installing clients use hostId as plain_name + if (not exists $msg_hash->{'hostId'}) { + $error++; + &daemon_log("$session_id ERROR: opsi_install_client-message has no xml-tag 'hostID', job was not created: $msg", 1); + } else { + $plain_name = $msg_hash->{'hostId'}[0]; + $header = "trigger_action_reinstall" + } - # check success of db update - if( not $db_res > 0 ) { $error++; }; + } else { # Try to determine plain_name via ldap search + my $ldap_handle=&main::get_ldap_handle(); + my $mesg = $ldap_handle->search( + base => $main::ldap_base, + scope => 'sub', + attrs => ['cn'], + filter => "(macAddress=$macaddress)"); + if($mesg->code || ($mesg->count!=1)) { + &main::daemon_log($mesg->error, 1); + $plain_name = "none"; + } else { + my $entry= $mesg->entry(0); + $plain_name = $entry->get_value("cn"); + } + &main::release_ldap_handle($ldap_handle); } - - if( $error == 0) { - $out_xml = "
answer
$server_addressGOSA0"; + + # Check if it is a periodical job + my $periodic = 'none'; + if (exists $msg_hash->{periodic}) + { + $periodic = $msg_hash->{periodic}[0]; + if ($periodic ne 'none' and not $periodic =~ /[0-9]+_(hours|minutes|days|weeks|months)/) # Periodic tag is not valid + { + &main::daemon_log("$session_id ERROR: Message contains invalid periodic-tag '$periodic'.". + " Please use the following pattern for the tag: 'INTEGER_[minutes|hours|days|weeks|months]'". + " Aborted message: $msg", 1); + $out_msg = "". + "
answer
$main::server_addressGOSA". + "1Message contains invalid periodic-tag '$periodic'". + ""; + return ($out_msg); + } } - return $out_xml; + # Add job to job queue + if( $error == 0 ) { + my $func_dic = {table=>$main::job_queue_tn, + primkey=>['macaddress', 'headertag'], + timestamp=>$timestamp, + status=>'waiting', + result=>'none', + progress=>'none', + headertag=>$header, + targettag=>$target, + xmlmessage=>$msg, + macaddress=>$macaddress, + plainname=>$plain_name, + siserver=>"localhost", + modified=>"1", + periodic=>$periodic, + }; + my $res = $main::job_db->add_dbentry($func_dic); + if (not $res == 0) { + &main::daemon_log("$session_id ERROR: GosaPackages: process_job_msg: $res", 1); + } else { + &main::daemon_log("$session_id INFO: GosaPackages: $header job successfully added to job queue", 5); + } + $out_msg = "
answer
$main::server_addressGOSA$res"; + } + + my @out_msg_l = ( $out_msg ); + return @out_msg_l; } - +# vim:ts=4:shiftwidth:expandtab 1; - - - - - - - - - -