diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 2a0fafabfc34639ac59a42ba5b9c34ed104cb321..bdc990bea7e824f875f57849b8837f195610ba37 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
use Getopt::Long;
use Config::IniFiles;
use POSIX;
use Getopt::Long;
use Config::IniFiles;
use POSIX;
-use Time::HiRes qw( gettimeofday );
use Fcntl;
use IO::Socket::INET;
use Fcntl;
use IO::Socket::INET;
my (%cfg_defaults, $foreground, $verbose, $ping_timeout);
my ($bus, $msg_to_bus, $bus_cipher);
my (%cfg_defaults, $foreground, $verbose, $ping_timeout);
my ($bus, $msg_to_bus, $bus_cipher);
-my ($server, $server_mac_address, $server_events);
+my ($server, $server_mac_address);
my ($gosa_server, $job_queue_timeout, $job_queue_table_name, $job_queue_file_name,$job_queue_loop_delay);
my ($known_modules, $known_clients_file_name, $known_server_file_name);
my ($gosa_server, $job_queue_timeout, $job_queue_table_name, $job_queue_file_name,$job_queue_loop_delay);
my ($known_modules, $known_clients_file_name, $known_server_file_name);
-my ($max_clients);
my ($pid_file, $procid, $pid, $log_file);
my ($pid_file, $procid, $pid, $log_file);
-my (%free_child, %busy_child, $child_max, $child_min, %child_alive_time, $child_timeout);
-my ($arp_activ, $arp_fifo, $arp_fifo_path);
+my ($arp_activ, $arp_fifo);
my ($xml);
# variables declared in config file are always set to 'our'
our (%cfg_defaults, $log_file, $pid_file,
my ($xml);
# variables declared in config file are always set to 'our'
our (%cfg_defaults, $log_file, $pid_file,
- $bus_activ, $bus_passwd, $bus_ip, $bus_port,
- $server_activ, $server_ip, $server_port, $SIPackages_key, $max_clients,
- $arp_activ, $arp_fifo_path,
- $gosa_activ, $GosaPackages_key, $gosa_ip, $gosa_port, $gosa_timeout,
+ $server_ip, $server_port, $SIPackages_key,
+ $arp_activ,
+ $GosaPackages_key, $gosa_ip, $gosa_port, $gosa_timeout,
);
# additional variable which should be globaly accessable
);
# additional variable which should be globaly accessable
# holds all registrated clients
our $known_clients_db;
# holds all registrated clients
our $known_clients_db;
-%cfg_defaults =
-("general" =>
- {"log_file" => [\$log_file, "/var/run/".$0.".log"],
- "pid_file" => [\$pid_file, "/var/run/".$0.".pid"],
- "child_max" => [\$child_max, 10],
- "child_min" => [\$child_min, 3],
- "child_timeout" => [\$child_timeout, 180],
- "job_queue_timeout" => [\$job_queue_timeout, undef],
- "job_queue_file_name" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
- "job_queue_loop_delay" => [\$job_queue_loop_delay, 3],
- "known_clients_file_name" => [\$known_clients_file_name, '/var/lib/gosa-si/known_clients.db' ],
- "known_server_file_name" => [\$known_server_file_name, '/var/lib/gosa-si/known_server.db'],
- },
-"bus" =>
- {"bus_activ" => [\$bus_activ, "on"],
- "bus_passwd" => [\$bus_passwd, ""],
- "bus_ip" => [\$bus_ip, "0.0.0.0"],
- "bus_port" => [\$bus_port, "20080"],
+%cfg_defaults = (
+"general" => {
+ "log-file" => [\$log_file, "/var/run/".$0.".log"],
+ "pid-file" => [\$pid_file, "/var/run/".$0.".pid"],
},
},
-"server" =>
- {"server_activ" => [\$server_activ, "on"],
- "server_ip" => [\$server_ip, "0.0.0.0"],
- "server_port" => [\$server_port, "20081"],
- "SIPackages_key" => [\$SIPackages_key, "none"],
- "max_clients" => [\$max_clients, 100],
+"server" => {
+# "ip" => [\$server_ip, "0.0.0.0"],
+ "port" => [\$server_port, "20081"],
+ "known-clients" => [\$known_clients_file_name, '/var/lib/gosa-si/clients.db' ],
+ "known-servers" => [\$known_server_file_name, '/var/lib/gosa-si/servers.db'],
},
},
-"arp" =>
- {"arp_activ" => [\$arp_activ, "on"],
- "arp_fifo_path" => [\$arp_fifo_path, "/var/run/gosa-si/arp-notify"],
+"GOsaPackages" => {
+ "ip" => [\$gosa_ip, "0.0.0.0"],
+ "port" => [\$gosa_port, "20082"],
+ "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
+ "job-queue-loop-delay" => [\$job_queue_loop_delay, 3],
+ "key" => [\$GosaPackages_key, "none"],
},
},
-"gosa" =>
- {"gosa_activ" => [\$gosa_activ, "on"],
- "gosa_ip" => [\$gosa_ip, "0.0.0.0"],
- "gosa_port" => [\$gosa_port, "20082"],
- "GosaPackages_key" => [\$GosaPackages_key, "none"],
+"SIPackages" => {
+ "key" => [\$SIPackages_key, "none"],
},
},
- );
+);
#=== FUNCTION ================================================================
#=== FUNCTION ================================================================
$hours = $hours < 10 ? $hours = "0".$hours : $hours;
$minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
$seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
$hours = $hours < 10 ? $hours = "0".$hours : $hours;
$minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
$seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
- my @monthnames = ("Jan", "Feb", "Mar", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
+ my @monthnames = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
$month = $monthnames[$month];
$monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
$year+=1900;
$month = $monthnames[$month];
$monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
$year+=1900;
} else {
my $info = eval($mod_name.'::get_module_info()');
# Only load module if get_module_info() returns a non-null object
} else {
my $info = eval($mod_name.'::get_module_info()');
# Only load module if get_module_info() returns a non-null object
- if(defined($info)) {
+ if( $info ) {
my ($input_address, $input_key, $input, $input_active, $input_type) = @{$info};
$known_modules->{$mod_name} = $info;
daemon_log("module $mod_name loaded", 1);
my ($input_address, $input_key, $input, $input_active, $input_type) = @{$info};
$known_modules->{$mod_name} = $info;
daemon_log("module $mod_name loaded", 1);
sub check_key_and_xml_validity {
my ($crypted_msg, $module_key) = @_;
#print STDERR "crypted_msg:$crypted_msg\n";
sub check_key_and_xml_validity {
my ($crypted_msg, $module_key) = @_;
#print STDERR "crypted_msg:$crypted_msg\n";
-#print STDERR "modul:$module\n";
#print STDERR "modul_key:$module_key\n";
my $msg;
my $msg_hash;
eval{
$msg = &decrypt_msg($crypted_msg, $module_key);
#print STDERR "modul_key:$module_key\n";
my $msg;
my $msg_hash;
eval{
$msg = &decrypt_msg($crypted_msg, $module_key);
- &main::daemon_log("decrypted_msg: \n$msg", 8);
-
- $msg_hash = $xml->XMLin($msg, ForceArray=>1);
- # check header
- my $header_l = $msg_hash->{'header'};
- if( 1 != @{$header_l} ) {
- die'header error';
- }
- my $header = @{$header_l}[0];
- if( 0 == length $header) {
- die 'header error';
- }
+ if ($msg =~ /<xml>/i){
+ &main::daemon_log("decrypted_msg: \n$msg", 8);
+ $msg_hash = $xml->XMLin($msg, ForceArray=>1);
- # check source
- my $source_l = $msg_hash->{'source'};
- if( 1 != @{$source_l} ) {
- die'source error';
- }
- my $source = @{$source_l}[0];
- if( 0 == length $source) {
- die 'source error';
- }
+ # check header
+ my $header_l = $msg_hash->{'header'};
+ if( 1 != @{$header_l} ) {
+ die 'header error';
+ }
+ my $header = @{$header_l}[0];
+ if( 0 == length $header) {
+ die 'header error';
+ }
- # check target
- my $target_l = $msg_hash->{'target'};
- if( 1 != @{$target_l} ) {
- die'target error';
- }
- my $target = @{$target_l}[0];
- if( 0 == length $target) {
- die 'target error';
- }
+ # check source
+ my $source_l = $msg_hash->{'source'};
+ if( not defined @{$source_l} or 1 != @{$source_l} ) {
+ die 'source error';
+ }
+ my $source = @{$source_l}[0];
+ if( 0 == length $source) {
+ die 'source error';
+ }
+ # check target
+ my $target_l = $msg_hash->{'target'};
+ if( 1 != @{$target_l} ) {
+ die'target error';
+ }
+ my $target = @{$target_l}[0];
+ if( 0 == length $target) {
+ die 'target error';
+ }
+ }
};
if($@) {
};
if($@) {
- &main::daemon_log("WARNING: do not understand the message:", 5);
+ &main::daemon_log("WARNING: do not understand the message", 5);
&main::daemon_log("$@", 8);
}
&main::daemon_log("$@", 8);
}
my ($input, $remote_ip) = @_ ;
my ($msg, $msg_hash, $module);
my ($input, $remote_ip) = @_ ;
my ($msg, $msg_hash, $module);
-
my $sql_statement= "SELECT * FROM known_server";
my $query_res = $known_server_db->select_dbentry( $sql_statement );
my $sql_statement= "SELECT * FROM known_server";
my $query_res = $known_server_db->select_dbentry( $sql_statement );
+
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
if( not $host_name =~ "^$remote_ip") {
next;
}
my $host_key = $hit->{hostkey};
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
if( not $host_name =~ "^$remote_ip") {
next;
}
my $host_key = $hit->{hostkey};
- daemon_log("ServerPackages: host_name: $host_name", 7);
- daemon_log("ServerPackages: host_key: $host_key", 7);
+ daemon_log("SIPackages: known_server host_name: $host_name", 7);
+ daemon_log("SIPackages: known_server host_key: $host_key", 7);
# check if module can open msg envelope with module key
# check if module can open msg envelope with module key
- my ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key);
- if( (!$msg) || (!$msg_hash) ) {
- daemon_log("ServerPackages: deciphering raise error", 7);
+ my ($tmp_msg, $tmp_msg_hash) = &check_key_and_xml_validity($input, $host_key);
+ if( (!$tmp_msg) || (!$tmp_msg_hash) ) {
+ daemon_log("SIPackages: deciphering raise error", 7);
daemon_log("$@", 8);
next;
}
else {
daemon_log("$@", 8);
next;
}
else {
- $module = "ServerPackages";
+ $msg = $tmp_msg;
+ $msg_hash = $tmp_msg_hash;
+ $module = "SIPackages";
last;
}
}
last;
}
}
my $query_res = $known_clients_db->select_dbentry( $sql_statement );
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
my $query_res = $known_clients_db->select_dbentry( $sql_statement );
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
- if( not $host_name =~ "^$remote_ip") {
+ if( not $host_name =~ /^$remote_ip:\d*$/) {
next;
next;
- }
+ }
my $host_key = $hit->{hostkey};
my $host_key = $hit->{hostkey};
- daemon_log("ServerPackages: host_name: $host_name", 7);
- daemon_log("ServerPackages: host_key: $host_key", 7);
+ &daemon_log("SIPackages: known_client host_name: $host_name", 7);
+ &daemon_log("SIPackages: known_client host_key: $host_key", 7);
# check if module can open msg envelope with module key
# check if module can open msg envelope with module key
- my ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key);
+ ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key);
+
if( (!$msg) || (!$msg_hash) ) {
if( (!$msg) || (!$msg_hash) ) {
- daemon_log("ServerPackages: deciphering raise error", 7);
- daemon_log("$@", 8);
+ &daemon_log("SIPackages: deciphering raise error", 7);
+ &daemon_log("$@", 8);
next;
}
else {
next;
}
else {
- $module = "ServerPackages";
+ $module = "SIPackages";
last;
}
}
if( (!$msg) || (!$msg_hash) || (!$module) ) {
last;
}
}
if( (!$msg) || (!$msg_hash) || (!$module) ) {
- daemon_log("Incoming message is not from a known client", 3);
+ &daemon_log("Incoming message is not from a known client", 3);
}
return ($msg, $msg_hash, $module);
}
return ($msg, $msg_hash, $module);
my %act_modules = %$known_modules;
while( my ($mod, $info) = each(%act_modules)) {
my %act_modules = %$known_modules;
while( my ($mod, $info) = each(%act_modules)) {
+
# check a key exists for this module
my $module_key = ${$mod."_key"};
if( ! $module_key ) {
# check a key exists for this module
my $module_key = ${$mod."_key"};
if( ! $module_key ) {
# check if module can open msg envelope with module key
($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key);
if( (!$msg) || (!$msg_hash) ) {
# check if module can open msg envelope with module key
($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key);
if( (!$msg) || (!$msg_hash) ) {
- daemon_log("$mod: deciphering failed", 5);
+ #daemon_log("$mod: deciphering failed", 5);
next;
}
else {
next;
}
else {
}
if( (!$msg) || (!$msg_hash) || (!$module)) {
}
if( (!$msg) || (!$msg_hash) || (!$module)) {
- daemon_log("Incoming message is not from a unknown host", 3);
+ daemon_log("Incoming message is not from a unknown host", 5);
}
return ($msg, $msg_hash, $module);
}
return ($msg, $msg_hash, $module);
sub create_ciphering {
my ($passwd) = @_;
sub create_ciphering {
my ($passwd) = @_;
+ if((!defined($passwd)) || length($passwd)==0) {
+ $passwd = "";
+ }
$passwd = substr(md5_hex("$passwd") x 32, 0, 32);
my $iv = substr(md5_hex('GONICUS GmbH'),0, 16);
my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC());
$passwd = substr(md5_hex("$passwd") x 32, 0, 32);
my $iv = substr(md5_hex('GONICUS GmbH'),0, 16);
my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC());
sub encrypt_msg {
my ($msg, $key) = @_;
my $my_cipher = &create_ciphering($key);
sub encrypt_msg {
my ($msg, $key) = @_;
my $my_cipher = &create_ciphering($key);
- $msg = "\0"x(16-length($msg)%16).$msg;
+ {
+ use bytes;
+ $msg = "\0"x(16-length($msg)%16).$msg;
+ }
$msg = $my_cipher->encrypt($msg);
chomp($msg = &encode_base64($msg));
# there are no newlines allowed inside msg
$msg = $my_cipher->encrypt($msg);
chomp($msg = &encode_base64($msg));
# there are no newlines allowed inside msg
my $error = 0;
# target can be in known_server
my $error = 0;
# target can be in known_server
- if( !$encrypt_key ) {
- my $sql_statement= "SELECT * FROM known_server";
+ if( not defined $encrypt_key ) {
+ my $sql_statement= "SELECT * FROM known_server WHERE hostname='$target'";
my $query_res = $known_server_db->select_dbentry( $sql_statement );
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
if( $host_name ne $target ) {
next;
}
my $query_res = $known_server_db->select_dbentry( $sql_statement );
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
if( $host_name ne $target ) {
next;
}
- my $host_key = $hit->{hostkey};
+ $encrypt_key = $hit->{hostkey};
last;
}
}
last;
}
}
-
# target can be in known_client
# target can be in known_client
- if( !$encrypt_key ) {
- my $sql_statement= "SELECT * FROM known_clients";
+ if( not defined $encrypt_key ) {
+ my $sql_statement= "SELECT * FROM known_clients WHERE hostname='$target'";
my $query_res = $known_clients_db->select_dbentry( $sql_statement );
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
my $query_res = $known_clients_db->select_dbentry( $sql_statement );
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
}
}
+#=== 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');
+
+ socket SOCKET, PF_INET, SOCK_DGRAM, $proto
+ 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 ($ip && length($ip) > 0) {
+ $result = $ip;
+ }
+ }
+
+ return $result;
+}
+
+sub get_local_ip_for_remote_ip {
+ my $remote_ip= shift;
+ my $result="0.0.0.0";
+
+ if($remote_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
+ if($remote_ip eq "127.0.0.1") {
+ $result = "127.0.0.1";
+ } else {
+ my $PROC_NET_ROUTE= ('/proc/net/route');
+
+ open(PROC_NET_ROUTE, "<$PROC_NET_ROUTE")
+ or die "Could not open $PROC_NET_ROUTE";
+
+ my @ifs = <PROC_NET_ROUTE>;
+
+ close(PROC_NET_ROUTE);
+
+ # Eat header line
+ shift @ifs;
+ chomp @ifs;
+ foreach my $line(@ifs) {
+ my ($Iface,$Destination,$Gateway,$Flags,$RefCnt,$Use,$Metric,$Mask,$MTU,$Window,$IRTT)=split(/\s/, $line);
+ my $destination;
+ my $mask;
+ my ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Destination);
+ $destination= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
+ ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Mask);
+ $mask= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
+ if(new NetAddr::IP($remote_ip)->within(new NetAddr::IP($destination, $mask))) {
+ # destination matches route, save mac and exit
+ $result= &get_ip($Iface);
+ last;
+ }
+ }
+ }
+ } else {
+ daemon_log("get_local_ip_for_remote_ip was called with a non-ip parameter: $remote_ip", 1);
+ }
+ return $result;
+}
+
sub send_msg_to_target {
my ($msg, $address, $encrypt_key, $msg_header) = @_ ;
my $error = 0;
sub send_msg_to_target {
my ($msg, $address, $encrypt_key, $msg_header) = @_ ;
my $error = 0;
-
- if( !$msg_header ) {
- $msg_header = "";
+ my $header;
+ my $new_status;
+ my $act_status;
+ my ($sql_statement, $res);
+
+ if( $msg_header ) {
+ $header = "'$msg_header'-";
+ }
+ else {
+ $header = "";
}
}
+ # Patch the source ip
+ if($msg =~ /<source>0\.0\.0\.0:\d*?<\/source>/) {
+ my $remote_ip = &get_local_ip_for_remote_ip(sprintf("%s", $address =~ /^([0-9\.]*?):.*$/));
+ $msg =~ s/<source>(0\.0\.0\.0):(\d*?)<\/source>/<source>$remote_ip:$2<\/source>/s;
+ }
+
# encrypt xml msg
my $crypted_msg = &encrypt_msg($msg, $encrypt_key);
# opensocket
my $socket = &open_socket($address);
# encrypt xml msg
my $crypted_msg = &encrypt_msg($msg, $encrypt_key);
# opensocket
my $socket = &open_socket($address);
- if(not defined $socket){
- daemon_log("cannot send $msg_header msg to $address , host not reachable", 1);
+ if( !$socket ) {
+ daemon_log("cannot send ".$header."msg to $address , host not reachable", 1);
$error++;
}
if( $error == 0 ) {
$error++;
}
if( $error == 0 ) {
-
# send xml msg
print $socket $crypted_msg."\n";
# send xml msg
print $socket $crypted_msg."\n";
+ daemon_log("send ".$header."msg to $address", 1);
+ daemon_log("message:\n$msg", 8);
+
+ }
+
+ # close socket in any case
+ if( $socket ) {
close $socket;
close $socket;
+ }
- daemon_log("send msg to $address", 1);
- daemon_log("message:\n$msg", 8);
+ if( $error > 0 ) { $new_status = "down"; }
+ else { $new_status = $msg_header; }
+
+
+ # known_clients
+ $sql_statement = "SELECT * FROM known_clients WHERE hostname='$address'";
+ $res = $known_clients_db->select_dbentry($sql_statement);
+ if( keys(%$res) > 0) {
+ $act_status = $res->{1}->{'status'};
+ if( $act_status eq "down" ) {
+ $sql_statement = "DELETE FROM known_clients WHERE hostname='$address'";
+ $res = $known_clients_db->del_dbentry($sql_statement);
+ daemon_log("WARNING: failed 2x to send msg to host '$address', delete host from known_clients", 3);
+ }
+ else {
+ $sql_statement = "UPDATE known_clients SET status='$new_status' WHERE hostname='$address'";
+ $res = $known_clients_db->update_dbentry($sql_statement);
+ if($new_status eq "down"){
+ daemon_log("WARNING: set '$address' from status '$act_status' to '$new_status'", 3);
+ }
+ else {
+ daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5);
+ }
+ }
+ }
+ # known_server
+ $sql_statement = "SELECT * FROM known_server WHERE hostname='$address'";
+ $res = $known_server_db->select_dbentry($sql_statement);
+ if( keys(%$res) > 0 ) {
+ $act_status = $res->{1}->{'status'};
+ if( $act_status eq "down" ) {
+ $sql_statement = "DELETE FROM known_server WHERE hostname='$address'";
+ $res = $known_clients_db->del_dbentry($sql_statement);
+ daemon_log("WARNING: failed 2x to a send msg to host '$address', delete host from known_server", 3);
+ }
+ else {
+ $sql_statement = "UPDATE known_server SET status='$new_status' WHERE hostname='$address'";
+ $res = $known_server_db->update_dbentry($sql_statement);
+ if($new_status eq "down"){
+ daemon_log("WARNING: set '$address' from status '$act_status' to '$new_status'", 3);
+ }
+ else {
+ daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5);
+ }
+ }
}
}
- return;
+ return;
+}
+
+
+sub _start {
+ my ($kernel) = $_[KERNEL];
+ &trigger_db_loop($kernel);
}
}
my ($answer_header, @answer_target_l, $answer_source);
my $client_answer;
my ($answer_header, @answer_target_l, $answer_source);
my $client_answer;
- daemon_log("Incoming msg:\n$input\n", 8);
+ daemon_log("Incoming msg from '".$heap->{'remote_ip'}."'", 7);
+ daemon_log("\n$input", 8);
# msg is from a new client or gosa
($msg, $msg_hash, $module) = &input_from_unknown_host($input);
# msg is from a new client or gosa
($msg, $msg_hash, $module) = &input_from_unknown_host($input);
# msg is from a gosa-si-client
if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
# msg is from a gosa-si-client
if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
- ($msg, $msg_hash, $module) = &input_from_known_client($input);
+ ($msg, $msg_hash, $module) = &input_from_known_client($input, $heap->{'remote_ip'});
}
# an error occurred
}
# an error occurred
######################
# process incoming msg
if( $error == 0) {
######################
# process incoming msg
if( $error == 0) {
- daemon_log("Processing module ".$module, 3);
- $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash);
+ daemon_log("Processing module ".$module, 5);
+ $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $heap->{'remote_ip'});
if ( 0 > @{$answer_l} ) {
my $answer_str = join("\n", @{$answer_l});
if ( 0 > @{$answer_l} ) {
my $answer_str = join("\n", @{$answer_l});
}
if( !$answer_l ) { $error++ };
}
if( !$answer_l ) { $error++ };
- # for each answer in answer list
- foreach my $answer ( @{$answer_l} ) {
-
- # check answer if gosa-si envelope conform
- if( $error == 0 ) {
- my $answer_hash = $xml->XMLin($answer, ForceArray=>1);
- $answer_header = @{$answer_hash->{'header'}}[0];
- @answer_target_l = @{$answer_hash->{'target'}};
- $answer_source = @{$answer_hash->{'source'}}[0];
- if( !$answer_header ) {
- daemon_log('ERROR: module answer is not gosa-si envelope conform: no header', 1);
- $error++;
- }
- if( 0 == length @answer_target_l ) {
- daemon_log('ERROR: module answer is not gosa-si envelope conform: no targets', 1);
- $error++;
- }
- if( !$answer_source ) {
- daemon_log('ERROR: module answer is not gosa-si envelope conform: no source', 1);
- $error++;
- }
- }
+ ########
+ # answer
+ if( $error == 0 ) {
- # deliver msg to all targets
- foreach my $answer_target ( @answer_target_l ) {
- if( $answer_target eq "*" ) {
- # answer is for all clients
- my $sql_statement= "SELECT * FROM known_clients";
- my $query_res = $known_clients_db->select_dbentry( $sql_statement );
- while( my ($hit_num, $hit) = each %{ $query_res } ) {
- my $host_name = $hit->{hostname};
- my $host_key = $hit->{hostkey};
- &send_msg_to_target($answer, $host_name, $host_key);
- }
- }
- elsif( $answer_target eq "GOSA" ) {
- # answer is for GOSA and has to returned to connected client
- my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key);
- $client_answer = $gosa_answer;
- }
- else {
- # answer is for one specific host
- # get encrypt_key
- my $encrypt_key = &get_encrypt_key($answer_target);
- if( !$encrypt_key ) {
- daemon_log("ERROR: no encrypt key found for answer target '$answer_target'", 1);
- next;
- }
- # send_msg
- &send_msg_to_target($answer, $answer_target, $encrypt_key);
- }
- }
+ # for each answer in answer list
+ foreach my $answer ( @{$answer_l} ) {
+
+ my $error = 0;
+ # check answer if gosa-si envelope conform
+ if(defined($answer)) {
+ my $answer_hash = $xml->XMLin($answer, ForceArray=>1);
+ $answer_header = @{$answer_hash->{'header'}}[0];
+ @answer_target_l = @{$answer_hash->{'target'}};
+ $answer_source = @{$answer_hash->{'source'}}[0];
+ if( !$answer_header ) {
+ daemon_log('ERROR: module answer is not gosa-si envelope conform: no header', 1);
+ daemon_log("\n$answer", 8);
+ $error++;
+ }
+ if( 0 == length @answer_target_l ) {
+ daemon_log('ERROR: module answer is not gosa-si envelope conform: no targets', 1);
+ daemon_log("\n$answer", 8);
+ $error++;
+ }
+ if( !$answer_source ) {
+ daemon_log('ERROR: module answer is not gosa-si envelope conform: no source', 1);
+ daemon_log("\n$answer", 8);
+ $error++;
+ }
+
+ if( $error != 0 ) {
+ next;
+ }
+ }
+
+ # deliver msg to all targets
+ foreach my $answer_target ( @answer_target_l ) {
+ if( $answer_target eq "*" ) {
+ # answer is for all clients
+ my $sql_statement= "SELECT * FROM known_clients";
+ my $query_res = $known_clients_db->select_dbentry( $sql_statement );
+ while( my ($hit_num, $hit) = each %{ $query_res } ) {
+ my $host_name = $hit->{hostname};
+ my $host_key = $hit->{hostkey};
+ &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+ }
+ }
+ elsif( $answer_target eq "GOSA" ) {
+ # answer is for GOSA and has to returned to connected client
+ my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key);
+ $client_answer = $gosa_answer;
+ }
+ elsif( $answer_target eq "KNOWN_SERVER" ) {
+ # answer is for all server in known_server
+ my $sql_statement= "SELECT * FROM known_server";
+ my $query_res = $known_server_db->select_dbentry( $sql_statement );
+ while( my ($hit_num, $hit) = each %{ $query_res } ) {
+ my $host_name = $hit->{hostname};
+ my $host_key = $hit->{hostkey};
+ $answer =~ s/KNOWN_SERVER/$host_name/g;
+ &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+ }
+ }
+ elsif( $answer_target =~ /^([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 ) {
+ daemon_log("target is mac address '$answer_target', looking for host in known_clients", 3);
+ my $sql_statement = "SELECT * FROM known_clients WHERE macaddress='$answer_target'";
+ my $query_res = $known_clients_db->select_dbentry( $sql_statement );
+ my $found_ip_flag = 0;
+ while( my ($hit_num, $hit) = each %{ $query_res } ) {
+ my $host_name = $hit->{hostname};
+ my $host_key = $hit->{hostkey};
+ $answer =~ s/$answer_target/$host_name/g;
+ daemon_log("found host '$host_name', assoziated to '$answer_target'", 3);
+ &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+ $found_ip_flag++ ;
+ }
+ if( $found_ip_flag == 0) {
+ daemon_log("WARNING: no host found in known_clients with mac address '$answer_target', forward msg to bus", 1);
+ my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
+ my $query_res = $known_server_db->select_dbentry( $sql_statement );
+ while( my ($hit_num, $hit) = each %{ $query_res } ) {
+ my $bus_address = $hit->{hostname};
+ my $bus_key = $hit->{hostkey};
+ &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+ last;
+ }
+
+ }
+ } else {
+ # ... answer is for one specific host
+
+ # get encrypt_key
+ my $encrypt_key = &get_encrypt_key($answer_target);
+ if( not defined $encrypt_key ) {
+ # unknown target, forward msg to bus
+ daemon_log("WARNING: unknown target '$answer_target', forward msg to bus", 3);
+ my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
+ my $query_res = $known_server_db->select_dbentry( $sql_statement );
+ my $bus_key = $query_res->{1}->{hostkey};
+ &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+ next;
+ }
+ # send_msg
+ &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header);
+ }
+ }
+ }
}
if( $client_answer ) {
}
if( $client_answer ) {
- $heap->{client}->put($client_answer);
+ $heap->{client}->put($client_answer);
}
return;
}
}
return;
}
+
sub trigger_db_loop {
sub trigger_db_loop {
- my ($kernel) = $_[KERNEL];
- $kernel->delay_set('watch_for_new_jobs',3);
+# my ($kernel) = $_[KERNEL];
+ my ($kernel) = @_ ;
+ $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
}
}
daemon_log("$0 started!", 1);
# delete old DBsqlite lock files
daemon_log("$0 started!", 1);
# delete old DBsqlite lock files
-system('rm -f /tmp/gosa_si_lock*');
+#unlink('/tmp/gosa_si_lock*');
# connect to gosa-si job queue
# connect to gosa-si job queue
-my @job_col_names = ("id", "timestamp", "status", "result", "headertag", "targettag", "xmlmessage", "macaddress");
+my @job_col_names = ("id INTEGER", "timestamp", "status", "result", "headertag", "targettag", "xmlmessage", "macaddress");
$job_db = GOSA::DBsqlite->new($job_queue_file_name);
$job_db->create_table('jobs', \@job_col_names);
$job_db = GOSA::DBsqlite->new($job_queue_file_name);
$job_db->create_table('jobs', \@job_col_names);
$known_server_db = GOSA::DBsqlite->new($known_server_file_name);
$known_server_db->create_table('known_server', \@server_col_names);
$known_server_db = GOSA::DBsqlite->new($known_server_file_name);
$known_server_db->create_table('known_server', \@server_col_names);
-# import all modules
-&import_modules;
-
-# check wether all modules are gosa-si valid passwd check
-
# create xml object used for en/decrypting
$xml = new XML::Simple();
# create xml object used for en/decrypting
$xml = new XML::Simple();
+# create socket for incoming xml messages
+POE::Component::Server::TCP->new(
+ Port => $server_port,
+ ClientInput => \&client_input,
+);
+daemon_log("start socket for incoming xml messages at port '$server_port' ", 1);
+
# create session for repeatedly checking the job queue for jobs
POE::Session->create(
inline_states => {
# create session for repeatedly checking the job queue for jobs
POE::Session->create(
inline_states => {
- _start => \&trigger_db_loop,
+ _start => \&_start,
watch_for_new_jobs => \&watch_for_new_jobs,
}
);
watch_for_new_jobs => \&watch_for_new_jobs,
}
);
-# create socket for incoming xml messages
-POE::Component::Server::TCP->new(
- Port => $server_port,
- ClientInput => \&client_input,
-);
-daemon_log("start socket for incoming xml messages at port '$server_port' ", 1);
+
+# import all modules
+&import_modules;
+
+# check wether all modules are gosa-si valid passwd check
POE::Kernel->run();
exit;
POE::Kernel->run();
exit;