X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FServerPackages.pm;h=ceb9268257eeaee5302622ae0bacf1380a79a385;hb=6e7c37f8affa32f73e01a162f6426b32aefa14e7;hp=074a0ddf855a30e3de3cdee4fc425341825be8da;hpb=87b94cf5fa17f4d15be20de5e3bcfa167a437b18;p=gosa.git diff --git a/gosa-si/modules/ServerPackages.pm b/gosa-si/modules/ServerPackages.pm index 074a0ddf8..ceb926825 100644 --- a/gosa-si/modules/ServerPackages.pm +++ b/gosa-si/modules/ServerPackages.pm @@ -3,7 +3,7 @@ package ServerPackages; use Exporter; @ISA = ("Exporter"); -# Each module has to have a function 'process_incoming_msg'. This function works as a interface to gosa-sd and recieves the msg hash from gosa-sd. 'process_incoming_function checks, wether it has a function to process the incoming msg and forward the msg to it. +# Each module has to have a function 'process_incoming_msg'. This function works as a interface to gosa-sd and receives the msg hash from gosa-sd. 'process_incoming_function checks, wether it has a function to process the incoming msg and forward the msg to it. use strict; @@ -58,9 +58,6 @@ my %cfg_defaults = $network_interface= &get_interface_for_ip($server_ip); $server_mac_address= &get_mac($network_interface); -&main::daemon_log("server ip address detected: $server_ip", 1); -&main::daemon_log("server mac address detected: $server_mac_address", 1); - # complete addresses my $server_address = "$server_ip:$server_port"; my $bus_address = "$bus_ip:$bus_port"; @@ -68,49 +65,16 @@ my $bus_address = "$bus_ip:$bus_port"; # create general settings for this module my $xml = new XML::Simple(); -# open server socket -if($server_activ eq "on"){ - &main::daemon_log(" ", 1); - $server = IO::Socket::INET->new(LocalPort => $server_port, - Type => SOCK_STREAM, - Reuse => 1, - Listen => 20, - ); - if(not defined $server){ - &main::daemon_log("cannot be a tcp server at $server_port : $@"); - die; - } else { - &main::daemon_log("start server: $server_address", 1); - } -} - -# TODO -# füge den server selbst zu known_server hinzu, msgs können nämlich auch von sich selbst kommen (gosa!!!) - - # register at bus if ($main::no_bus > 0) { $bus_activ = "off" } if($bus_activ eq "on") { - &main::daemon_log(" ", 1); ®ister_at_bus(); } ### functions ################################################################# -#sub get_module_tags { -# -# # lese config file aus dort gibt es eine section Basic -# # dort stehen drei packettypen, für die sich das modul anmelden kann, gosa-admin-packages, -# # server-packages, client-packages -# my %tag_hash = (gosa_admin_packages => "yes", -# server_packages => "yes", -# client_packages => "yes", -# ); -# return \%tag_hash; -#} - sub get_module_info { my @info = ($server_address, @@ -302,23 +266,23 @@ sub get_ip { # RETURNS: socket IO::Socket::INET # DESCRIPTION: open a socket to PeerAddr #=============================================================================== -sub open_socket { - my ($PeerAddr, $PeerPort) = @_ ; - if(defined($PeerPort)){ - $PeerAddr = $PeerAddr.":".$PeerPort; - } - my $socket; - $socket = new IO::Socket::INET(PeerAddr => $PeerAddr , - Porto => "tcp" , - Type => SOCK_STREAM, - Timeout => 5, - ); - if(not defined $socket) { - return; - } - &main::daemon_log("open_socket to: $PeerAddr", 7); - return $socket; -} +#sub open_socket { +# my ($PeerAddr, $PeerPort) = @_ ; +# if(defined($PeerPort)){ +# $PeerAddr = $PeerAddr.":".$PeerPort; +# } +# my $socket; +# $socket = new IO::Socket::INET(PeerAddr => $PeerAddr , +# Porto => "tcp" , +# Type => SOCK_STREAM, +# Timeout => 5, +# ); +# if(not defined $socket) { +# return; +# } +# &main::daemon_log("open_socket to: $PeerAddr", 7); +# return $socket; +#} #=== FUNCTION ================================================================ # NAME: register_at_bus @@ -328,6 +292,10 @@ sub open_socket { #=============================================================================== sub register_at_bus { + + + print STDERR ">>>>>>>>>>>>>>>>>>>>>>>>1\n"; + # add bus to known_server_db my $res = $main::known_server_db->add_dbentry( {table=>'known_server', primkey=>'hostname', @@ -336,16 +304,7 @@ sub register_at_bus { hostkey=>$bus_passwd, timestamp=>&get_time, } ); -# if ($res == 3) { -# my $update_hash = { table=>'known_server' }; -# $update_hash->{where} = [ { hostname=>[$bus_address] } ]; -# $update_hash->{update} = [ { -# hostkey=>[$bus_passwd], -# timestamp=>[&get_time], -# } ]; -# $res = $main::known_server_db->update_dbentry( $update_hash ); -# } - + print STDERR ">>>>>>>>>>>>>>>>>>>>>>>>2\n"; my $msg_hash = &create_xml_hash("here_i_am", $server_address, $bus_address); my $answer = ""; $answer = &send_msg_hash2address($msg_hash, $bus_address, $bus_passwd); @@ -369,11 +328,14 @@ sub process_incoming_msg { &main::daemon_log("function 'process_incoming_msg': got no msg", 7); } - &main::daemon_log("ServerPackages: incoming msg: \n$crypted_msg", 7); + &main::daemon_log("ServerPackages: incoming msg: \n$crypted_msg", 8); $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); + my $host="0.0.0.0"; + if($1 && $2 && $3 && $4) { + $host = sprintf("%s.%s.%s.%s", $2, $3, $4, $5); + } my $msg; my $msg_hash; @@ -387,7 +349,7 @@ sub process_incoming_msg { &main::daemon_log("ServerPackage: host_key: $host_key", 7); eval{ my $key_cipher = &create_ciphering($host_key); - $msg = &decrypt_msg($crypted_msg, $key_cipher); + $msg = &decrypt_msg($crypted_msg, $key_cipher); $msg_hash = &transform_msg2hash($msg); }; if($@) { @@ -401,7 +363,9 @@ sub process_incoming_msg { # check wether incoming msg is from a known_server if( not defined $msg ) { - my $query_res = $main::known_server_db->select_dbentry( {table=>'known_server'} ); + #my $query_res = $main::known_server_db->select_dbentry( {table=>'known_server'} ); + my $sql_statement= "SELECT * FROM known_server"; + my $query_res = $main::known_server_db->select_dbentry( $sql_statement ); while( my ($hit_num, $hit) = each %{ $query_res } ) { $host_name = $hit->{hostname}; if( not $host_name =~ "^$host") { @@ -430,7 +394,9 @@ sub process_incoming_msg { # check wether incoming msg is from a known_client if( not defined $msg ) { - my $query_res = $main::known_clients_db->select_dbentry( {table=>'known_clients'} ); + #my $query_res = $main::known_clients_db->select_dbentry( {table=>'known_clients'} ); + my $sql_statement= "SELECT * FROM known_clients"; + my $query_res = $main::known_clients_db->select_dbentry( $sql_statement ); while( my ($hit_num, $hit) = each %{ $query_res } ) { $host_name = $hit->{hostname}; if( not $host_name =~ "^$host") { @@ -459,7 +425,7 @@ sub process_incoming_msg { if( not defined $msg ) { &main::daemon_log("WARNING: ServerPackage do not understand the message:", 5); - &main::daemon_log("$@", 7); + &main::daemon_log("$@", 8); return; } @@ -467,7 +433,7 @@ sub process_incoming_msg { my $header = @{$msg_hash->{header}}[0]; my $source = @{$msg_hash->{source}}[0]; - &main::daemon_log("recieve '$header' at ServerPackages from $host", 1); + &main::daemon_log("receive '$header' at ServerPackages from $host", 1); &main::daemon_log("ServerPackages: msg to process: \n$msg", 5); my @targets = @{$msg_hash->{target}}; @@ -480,52 +446,59 @@ sub process_incoming_msg { my $target = $targets[0]; &main::daemon_log("SeverPackages: msg is for: $target", 7); - if ($target eq $server_address) { - # msg is for server - if ($header eq 'new_passwd'){ &new_passwd($msg_hash)} - elsif ($header eq 'here_i_am') { &here_i_am($msg_hash)} - elsif ($header eq 'who_has') { &who_has($msg_hash) } - elsif ($header eq 'who_has_i_do') { &who_has_i_do($msg_hash)} - elsif ($header eq 'update_status') { &update_status($msg_hash) } - elsif ($header eq 'got_ping') { &got_ping($msg_hash)} - elsif ($header eq 'get_load') { &execute_actions($msg_hash)} - else { &main::daemon_log("ERROR: ServerPackages: no function assigned to this msg", 5) } - - } elsif ($target eq "*") { - # msg is for all clients - my $query_res = $main::known_clients_db->select_dbentry( {table=>'known_clients'} ); - while( my ($hit_num, $hit) = each %{ $query_res } ) { - $host_name = $hit->{hostname}; - $host_key = $hit->{hostkey}; - $msg_hash->{target} = [$host_name]; - &send_msg_hash2address($msg_hash, $host_name, $host_key); - } - return; - - } else { - # msg is for one host - my $query_res; - $query_res = $main::known_clients_db->select_dbentry( {table=>'known_clients', hostname=>$target} ); - if( 1 == keys %{$query_res} ) { - $host_key = $query_res->{1}->{host_key}; - &send_msg_hash2address($msg_hash, $target, $host_key); - return; - } + # msg is for server + if ($header eq 'new_passwd'){ &new_passwd($msg_hash)} + elsif ($header eq 'here_i_am') { &here_i_am($msg_hash)} + elsif ($header eq 'who_has') { &who_has($msg_hash) } + elsif ($header eq 'who_has_i_do') { &who_has_i_do($msg_hash)} + elsif ($header eq 'update_status') { &update_status($msg_hash) } + elsif ($header eq 'got_ping') { &got_ping($msg_hash)} + elsif ($header eq 'get_load') { &execute_actions($msg_hash)} + else { + if ($target eq "*") { + # msg is for all clients + my $sql_statement = "SELECT * FROM known_clients"; + my $query_res = $main::known_clients_db->select_dbentry( $sql_statement ); + while( my ($hit_num, $hit) = each %{ $query_res } ) { + $host_name = $hit->{hostname}; + $host_key = $hit->{hostkey}; + $msg_hash->{target} = [$host_name]; + &send_msg_hash2address($msg_hash, $host_name, $host_key); + } - $query_res = $main::known_server_db->select_dbentry( {table=>'known_server', hostname=>$target} ); - if( 1 == keys %{$query_res} ) { - $host_key = $query_res->{1}->{host_key}; - &send_msg_hash2address($msg_hash, $target, $host_key); - return; + } else { + # msg is for one host + my $host_key; + + + if( not defined $host_key ) { + my $sql_statement = "SELECT * FROM known_clients WHERE hostname='$target'"; + my $query_res = $main::known_clients_db->select_dbentry( $sql_statement ); + if( 1 == keys %{$query_res} ) { + $host_key = $query_res->{1}->{host_key}; + } + } + + if( not defined $host_key ) { + my $sql_statement = "SELECT * FROM known_server WHERE hostname='$target'"; + my $query_res = $main::known_server_db->select_dbentry( $sql_statement ); + if( 1 == keys %{$query_res} ) { + $host_key = $query_res->{1}->{host_key}; + } + } + + if( not defined $host_key ) { + &main::daemon_log("ERROR: ServerPackages: target '".$target. + "' is not known neither in known_clients nor in known_server",1); + } else { + &send_msg_hash2address($msg_hash, $target, $host_key); + } } - - &main::daemon_log("ERROR: ServerPackages: target '$target' is not known neither in known_clients nor in known_server",1); - return; } } elsif ($len_targets > 1 ) { # we have more than one target - return; + # TODO to be implemented } return ; @@ -570,7 +543,8 @@ sub new_passwd { my $query_res; # check known_clients_db - $query_res = $main::known_clients_db->select_dbentry( {table=>'known_clients', hostname=>$source_name} ); + my $sql_statement = "SELECT * FROM known_clients WHERE hostname='$source_name'"; + $query_res = $main::known_clients_db->select_dbentry( $sql_statement ); if( 1 == keys %{$query_res} ) { my $update_hash = { table=>'known_clients' }; $update_hash->{where} = [ { hostname=>[$source_name] } ]; @@ -630,7 +604,7 @@ sub here_i_am { my $out_hash; # number of known clients - my $nu_clients = keys %{$main::known_clients_db->select_dbentry( {table=>'known_clients'} )}; + my $nu_clients = keys %{ $main::known_clients_db->select_dbentry( {table=>'known_clients'} ) }; # check wether client address or mac address is already known if (exists $main::known_clients->{$source}) {