X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-client;h=fd36a5bbf7361f435f95a737af38c7558e6a31cd;hb=d9eeaa2981dd62dc189e9172339f3ef2ef0d58e6;hp=b87220450a2ad42ae3c1d419859a683ff086b9cd;hpb=961146a3c35745f35ed0f3943b9f704124f98761;p=gosa.git

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index b87220450..fd36a5bbf 100755
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -40,7 +40,7 @@ my $event_dir = "/usr/lib/gosa-si/client/events";
 use lib "/usr/lib/gosa-si/client/events";
 
 my ($cfg_file, %cfg_defaults, $foreground, $verbose, $pid_file, $procid, $pid, $log_file);
-my ($server_ip, $server_port, $server_key, $server_timeout, $server_domain);
+my ($server_ip, $server_port, $server_key, $server_timeout, $server_domain, $server_key_lifetime);
 my ($client_ip, $client_port, $client_mac_address, $ldap_enabled, $ldap_config, $pam_config, $nss_config);
 my $xml;
 my $default_server_key;
@@ -77,6 +77,7 @@ our $REGISTERED_FLAG = 1;
     "server_key" => [\$server_key, ""],
     "server_timeout" => [\$server_timeout, 10],
     "server_domain" => [\$server_domain, ""],
+    "server_key_lifetime" => [\$server_key_lifetime, 600], 
     },
 
 );
@@ -379,39 +380,83 @@ sub get_ip {
 #                matches (defaultroute last).
 #===============================================================================
 sub get_local_mac_for_remote_ip {
-    my $server_ip= shift;
-    my $result= "00:00:00:00:00:00";
-    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);
+	my $server_ip= shift;
+	my $result= "00:00:00:00:00:00";
+
+	if($server_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
+		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($server_ip)->within(new NetAddr::IP($destination, $mask))) {
+				# destination matches route, save mac and exit
+				$result= &get_mac($Iface);
+				last;
+			}
+		}
+	} else {
+		daemon_log("get_local_mac_for_remote_ip was called with a non-ip parameter: $server_ip", 1);
+	}
+	return $result;
+}
 
-    # 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($server_ip)->within(new NetAddr::IP($destination, $mask))) {
-            # destination matches route, save mac and exit
-            $result= &get_mac($Iface);
-            last;
-        }
-    }
+sub get_local_ip_for_remote_ip {
+	my $server_ip= shift;
+	my $result="0.0.0.0";
 
-    return $result;
+	if($server_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
+		if($server_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($server_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: $server_ip", 1);
+	}
+	return $result;
 }
 
-
 sub new_ldap_config {
     my ($msg_hash) = @_ ;
     my $element;
@@ -813,7 +858,7 @@ sub register_at_gosa_si_server {
             }
 
             # create registration msg
-            my $register_hash = &create_xml_hash("here_i_am", $client_address, $server);
+            my $register_hash = &create_xml_hash("here_i_am", &get_local_ip_for_remote_ip(sprintf("%s", $server =~ /^([0-9\.]*?):.*$/)).":".$client_port, $server);
             &add_content2xml_hash($register_hash, "new_passwd", $server_key);
 			&add_content2xml_hash($register_hash, "mac_address", &get_local_mac_for_remote_ip(sprintf("%s", $server =~ /^([0-9\.]*?):.*$/)));
             &add_content2xml_hash($register_hash, "events", $events);
@@ -821,10 +866,16 @@ sub register_at_gosa_si_server {
 
             # send xml hash to server with general server passwd
             my $res = &send_msg_hash2address($register_hash, $server, $default_server_key);
-            last;
+			if($res == 0) {
+				last;
+			} else {
+				next;
+			}
         }
         daemon_log("waiting for msg 'register_at_gosa_si_server'",1);
-        $kernel->delay_set('register_at_gosa_si_server',2);
+        $kernel->delay_set('register_at_gosa_si_server',180);
+        # clear old settings and set it again
+        $kernel->delay_set('trigger_new_key', $server_key_lifetime);
     }
     return;
 }
@@ -910,9 +961,26 @@ sub import_events {
     }
 }
 
+sub trigger_new_key {
+    my ($kernel) = $_[KERNEL] ;   
+
+    my $msg = "<xml><header>new_key</header><source>$client_address</source><target>$client_address</target></xml>";
+    &send_msg_to_target($msg, $client_address, $server_key, 'new_key');
+
+    $kernel->delay_set('trigger_new_key', $server_key_lifetime);
+
+}
+
+
+sub _start {
+    my ($kernel) = $_[KERNEL];
+    $kernel->alias_set('client_session');
+    $kernel->yield('register_at_gosa_si_server');
+}
+
 
 sub server_input {
-    my ($heap,$input,$wheel) = @_[HEAP, ARG0, ARG1];
+    my ($kernel, $heap, $input, $wheel) = @_[KERNEL, HEAP, ARG0, ARG1];
     my $error = 0;
     my $answer;
     
@@ -941,11 +1009,20 @@ sub server_input {
     ########
     # answer
     if( $answer ) {
+        # preprocessing
         if( $answer =~ "<header>registered</header>") {
+            # set registered flag to true to stop sending further registered msgs
             $REGISTERED_FLAG = 0;
         } 
         else {
-        &send_msg_to_address($answer, $server_address, $server_key);
+            &send_msg_to_target($answer, $server_address, $server_key);
+        }
+        # postprocessing
+        if( $answer =~ "<header>new_key</header>") {
+            # set new key to global variable
+            $answer =~ /<new_key>(\S*?)<\/new_key>/;
+            my $new_key = $1;
+            $server_key = $new_key;
         }
     }
 
@@ -1056,8 +1133,9 @@ daemon_log("found servers in configuration file and via DNS: $servers_string", 5
 
 POE::Session->create(
 	inline_states => {
-		_start => \&register_at_gosa_si_server ,
+		_start => \&_start, 
         register_at_gosa_si_server => \&register_at_gosa_si_server,
+        trigger_new_key => \&trigger_new_key,
 	}
 );