![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 4d109684f37373877307f7613457f0acda37d2ac..db4773b465f9018d0a5c793f0daea58cf82a991f 100755 (executable)
my $gotoHardwareChecksum;
my $gosa_si_client_fifo;
my %files_to_watch;
+my $servers_string;
$verbose= 1;
# globalise variables which are used in imported events
our $client_dnsname;
our $client_force_hostname;
our $server_key;
+our $opts_dnslookup;
# default variables
our $REGISTERED = 0;
+our $REGISTRATION_IN_PROGRESS = 0;
+our $REGISTRATION_TRIES = 0;
+our $FAILED_CRYPTO = 0;
# path to fifo for non-gosa-si-client messages to gosa-si-server
$gosa_si_client_fifo = "/var/run/gosa-si-client.socket";
my $delay_set_time = 10;
our $prg= basename($0);
+# Threshold for the max number of wrong crypted packages, when triggered
+# a new server is choosen
+my $max_failed_crypto_messages = 5;
+
# all n seconds the client reports logged_in users to gosa-si-server
my $trigger_logged_in_users_report_delay = 600;
"force-hostname" => [\$client_force_hostname, "false"],
},
"server" => {
- "ip" => [\$server_ip, "127.0.0.1"],
+ "ip" => [\$servers_string, "127.0.0.1"],
"port" => [\$server_port, "20081"],
"key" => [\$server_key, ""],
"timeout" => [\$server_timeout, 10],
"key-lifetime" => [\$server_key_lifetime, 600],
+ "dns-lookup" => [\$opts_dnslookup, "true"],
},
);
}
}
-
#=== FUNCTION ================================================================
# NAME: check_pid
# PARAMETERS:
}
-
#=== FUNCTION ================================================================
# NAME: get_local_mac_for_remote_ip
# PARAMETERS: none (takes server_ip from global variable)
if($server_ip =~ /^[a-z][a-z0-9\.]$/i) {
my $ip_address = inet_ntoa(scalar gethostbyname($server_ip));
- if(defined($ip_address) && $ip_address =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ && $port =~ /^\d+$/) {
+ if(defined($ip_address) && $ip_address =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/) {
# Write ip address to $server_ip variable
$server_ip = $ip_address;
}
#===============================================================================
sub register_at_gosa_si_server {
my ($kernel) = $_[KERNEL];
- my $try_to_register = 0;
-
+
# if client is already registered, stop registration process
if ($REGISTERED) {
$kernel->delay('register_at_gosa_si_server');
# client is not registered, start registration process
} else {
+ $REGISTRATION_IN_PROGRESS = 1;
+
# clear all other triggered events and wait till registration was successful
$kernel->delay('trigger_new_key');
my $events = join( ",", keys %{$event_hash} );
while(1) {
- $try_to_register++;
-
- # after one complete round through all server, stop trying to register
- if( $try_to_register > @servers ) { last; }
+ $REGISTRATION_TRIES++;
# fetch first gosa-si-server from @servers
# append shifted gosa-si-server at the end of @servers, so looking for servers never stop if
# a registration never occured
my $server = shift(@servers);
- push( @servers, $server );
+ push(@servers, $server);
+ ($server_ip = $server) =~ s/:.*$//;
+ $server_address = $server;
# Check if our ip is resolvable - if not: don't try to register
if(!(defined($server) && $server =~ m/^[0-9\.]*?:.*$/)) {
&main::daemon_log("ERROR: Server with address '".defined($server)?$server:""."' is invalid!", 1);
- if (length(@servers) == 1) {
+ if (scalar(@servers) == 1) {
&main::daemon_log("ERROR: No valid servers found!", 1);
exit(1);
}
my $res = &send_msg_hash_to_target($register_hash, $server, $default_server_key);
# if delivery of registration msg succeed
- if($res eq "0") {
+ if(defined($res) and $res eq "0") {
# reset try_to_register
- $try_to_register = 0;
+ $REGISTRATION_TRIES = 0;
# Set fixed client address and mac address
$client_ip= &get_local_ip_for_remote_ip(sprintf("%s", $server =~ /^([0-9\.]*?):.*$/));
} # end of while
# one circle through all servers finished and no registration succeed
- if ( $try_to_register >= @servers ) {
+ if ( $REGISTRATION_TRIES >= (scalar(@servers)) ) {
&write_to_file("gosa-si-no-server-available", $fai_logpath);
$kernel->delay_set('register_at_gosa_si_server', $delay_set_time);
# Select all files under /tmp with prefix 'goto_notify'
my $goto_dir = "/tmp";
opendir(DIR, $goto_dir);
- my @goto_files = grep { /^goto_notify_/ && -f "$goto_dir/$_" } readdir(DIR);
+ my @goto_files = grep { /.goto_notify$/ && -f "$goto_dir/$_" } readdir(DIR);
closedir DIR;
# Check if file has 'seen' tag
&send_msg_to_target($clmsg, $server_address, $server_key, "CLMSG_$header");
# if installation finished, save all log files
- if ($file_record eq "TASKBEGIN finish") {
+ if ($file_record eq "TASKBEGIN savelog") {
&save_fai_log($fai_log_dir);
}
sub save_fai_log {
my ($fai_log_dir) = @_ ;
my $FAI_DIR;
+ my $fai_action;
# Directory for log files after a softupdate
my $log_dir = File::Spec->catdir($fai_log_dir, "localhost/last");
daemon_log("ERROR: cannot open directory $log_dir", 1);
return;
}
+ $fai_action = "install";
+ }
+ else {
+ # If we already have a logdir, we can assume that this is a softupdate
+ $fai_action = "softupdate";
}
opendir($FAI_DIR, "$log_dir");
my $all_log_string = join("\n", @log_list);
my $msg_hash = &create_xml_hash("CLMSG_save_fai_log", $client_address, $server_address, $all_log_string);
&add_content2xml_hash($msg_hash, "macaddress", $client_mac_address);
+ &add_content2xml_hash($msg_hash, "fai_action", $fai_action);
my $msg = &create_xml_string($msg_hash);
&send_msg_to_target($msg, $server_address, $server_key, "CLMSG_save_fai_log");
# if client is alread in a registration process, that means not registered, do nothing
# if not, cause re-registration
- if (not $REGISTERED) {
+ if ($REGISTRATION_IN_PROGRESS) {
&daemon_log("WARNING: gosa-si-client is already in a registration process so ignore this message", 3);
} else {
+ if ($FAILED_CRYPTO > $max_failed_crypto_messages) {
+ # Force usage of a new server
+ daemon_log("Failed to decrypt a total of $max_failed_crypto_messages messages from the server. Trying to switch to another one", 3);
+ $REGISTRATION_TRIES = $max_failed_crypto_messages;
+ my $server = shift(@servers);
+ push(@servers, $server);
+ }
+ $FAILED_CRYPTO++;
$REGISTERED = 0;
$kernel->post('client_session', 'register_at_gosa_si_server');
}
######################
# process incoming msg
if( $error == 0 ) {
+ # Reset failed crypto messages state
+ $FAILED_CRYPTO = 0;
+
my $header = @{$msg_hash->{header}}[0];
my $source = @{$msg_hash->{source}}[0];
if( $answer =~ "<header>registered</header>") {
# set registered flag to true to stop sending further registered msgs
$REGISTERED = 1;
+ $REGISTRATION_IN_PROGRESS = 0;
}
else {
$answer =~ /<header>(\S+)<\/header>/;
return;
}
+sub find_servers {
+ # add gosa-si-server address from config file at first position of server list
+ my $server_check_cfg = Config::IniFiles->new( -file => $cfg_file );
+
+ # Parse servers string
+ my @conf_servers = split(',', $servers_string);
+
+ # Now search for fallback servers in the configuration
+ foreach my $cur_server (@conf_servers) {
+ # Remove spaces from the IP
+ $cur_server =~ s/\s//g;
+
+ my $ip = $cur_server;
+ if(not $cur_server =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/) {
+ my $ip_address = inet_ntoa(scalar gethostbyname($ip));
+ if(defined($ip_address) && $ip_address =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/) {
+ # Write ip address to $server_ip variable
+ $ip = $ip_address;
+ }
+ }
+
+ my $server_addr = sprintf("%s:%s", $ip, $server_port);
+ if (not grep { $_ eq $server_addr } @servers) {
+ push(@servers, $server_addr);
+ }
+ }
+
+ my $servers_string = join(", ", @servers);
+ daemon_log("INFO: found servers in configuration file: $servers_string", 1);
+
+ # Last but not least search for fallback servers in the DNS
+ if (defined($opts_dnslookup) and $opts_dnslookup eq "true") {
+ my @tmp_servers;
+ if ( !$server_domain) {
+ # Try our DNS Searchlist
+ my @domain_list = &get_dns_domains();
+ my $tmp_domains;
+ my $error_string;
+ for my $domain (@domain_list) {
+ chomp($domain);
+ ($tmp_domains, $error_string) = &get_server_addresses($domain);
+ if(@$tmp_domains) {
+ for my $tmp_server(@$tmp_domains) {
+ push @tmp_servers, $tmp_server;
+ }
+ }
+ }
+
+ if (0 == @tmp_servers) {
+ daemon_log("INFO: No servers found in DNS.", 1);
+ }
+ else {
+ my $servers_string = join(", ", @tmp_servers);
+ daemon_log("INFO: found servers in DNS: $servers_string", 1);
+ }
+ } else {
+ @tmp_servers = &get_server_addresses($server_domain);
+ if( 0 == @tmp_servers ) {
+ daemon_log("INFO: No servers found in DNS for domain '$server_domain'",1);
+ }
+ }
+
+ if ( 0 != @tmp_servers ) {
+ foreach my $server_addr (@tmp_servers) {
+ if (not grep { $_ eq $server_addr } @servers) {
+ push(@servers, $server_addr);
+ }
+ }
+ }
+ }
+
+ if (0 == scalar(@servers)) {
+ daemon_log("ERROR: No servers found in the configuration or DNS.", 1);
+ exit(1);
+ }
+
+ # Define first server as server_ip
+ $server_ip = $servers[0];
+
+ # prepare variables
+ if( inet_aton($server_ip) ){ $server_ip = inet_ntoa(inet_aton($server_ip)); }
+ if (defined $server_ip && defined $server_port) {
+ $server_address = $server_ip.":".$server_port;
+ }
+}
#==== MAIN = main ==============================================================
# parse commandline options
&read_configfile($cfg_file, %cfg_defaults);
&check_pid;
-
# forward error messages to logfile
if ( ! $foreground ) {
open( STDIN, '+>/dev/null' );
);
daemon_log("INFO: start socket for incoming xml messages at port '$client_port' ", 1);
-
-# prepare variables
-if( inet_aton($server_ip) ){ $server_ip = inet_ntoa(inet_aton($server_ip)); }
-if (defined $server_ip && defined $server_port) {
- $server_address = $server_ip.":".$server_port;
-}
$xml = new XML::Simple();
$default_server_key = $server_key;
-
-# add gosa-si-server address from config file at first position of server list
-my $server_check_cfg = Config::IniFiles->new( -file => $cfg_file );
-my $server_check = (defined($server_check_cfg))?$server_check_cfg->val( "server", "ip"):undef;
-if( defined $server_check ) {
- unshift(@servers, $server_address);
- my $servers_string = join(", ", @servers);
- daemon_log("INFO: found servers in configuration file: $servers_string", 1);
-} else {
- my @tmp_servers;
- if ( !$server_domain) {
- # Try our DNS Searchlist
- my @domain_list = &get_dns_domains();
- my $tmp_domains;
- my $error_string;
- for my $domain (@domain_list) {
- chomp($domain);
- ($tmp_domains, $error_string) = &get_server_addresses($domain);
- if(@$tmp_domains) {
- for my $tmp_server(@$tmp_domains) {
- push @tmp_servers, $tmp_server;
- }
- }
- }
- if (0 == @tmp_servers) {
- my $log_string = "no gosa-si-server found!";
- $log_string .= "\n\tdetermined domains out of /etc/resolv.conf: ".join(", ", @domain_list) if (@domain_list);
- $log_string .= "\n\tdetermined server addresses in domains: ".join(", ",@$tmp_domains) if (defined($tmp_domains));
- daemon_log("ERROR: $log_string", 1) if (defined($log_string));
- daemon_log("ERROR: $error_string", 1) if (defined($error_string));
- daemon_log("ERROR: please specify a gosa-si-server address or a domain in config file", 1);
- kill 2, $$;
- }
- } else {
- @tmp_servers = &get_server_addresses($server_domain);
- if( 0 == @tmp_servers ) {
- daemon_log("ERROR: no gosa-si-server found in DNS for domain '$server_domain'",1);
- daemon_log("ERROR: please specify a gosa-si-server address or a domain in config file", 1);
- kill 2, $$;
- }
- }
-
- foreach my $server (@tmp_servers) {
- unshift(@servers, $server);
- }
- my $servers_string = join(", ", @servers);
- daemon_log("INFO: found servers in DNS: $servers_string", 1);
-}
-
+# Find servers from config and DNS
+&find_servers;
# open fifo for non-gosa-si-client-msgs to gosa-si-server
POSIX::mkfifo("$gosa_si_client_fifo", "0600");