X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-client;h=2252d5960b9e50ef380d149d6b8f1dc8c01e8c12;hb=868da18e0cedcfa12adc928744c2027f947a0fa3;hp=9b0374de264db0b450c8f716dd700f741b50a421;hpb=2609d4826795788ada8a79976807f33c437dd01f;p=gosa.git diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client index 9b0374de2..2252d5960 100755 --- a/gosa-si/gosa-si-client +++ b/gosa-si/gosa-si-client @@ -20,12 +20,13 @@ use strict; use warnings; +use utf8; use Getopt::Long; use Config::IniFiles; use POSIX; use Time::HiRes qw( gettimeofday ); -use POE qw(Component::Server::TCP); +use POE qw(Component::Server::TCP Wheel::FollowTail); use IO::Socket::INET; use NetAddr::IP; use Data::Dumper; @@ -48,6 +49,8 @@ my $default_server_key; my $event_hash; my @servers; my $gotoHardwareChecksum; +my $gosa_si_client_fifo; +my %files_to_watch; $verbose= 1; # globalise variables which are used in imported events @@ -59,6 +62,10 @@ our $server_key; # default variables our $REGISTERED = 0; +# path to fifo for non-gosa-si-client messages to gosa-si-server +$gosa_si_client_fifo = "/var/run/gosa-si-client.socket"; +%files_to_watch = (fifo => $gosa_si_client_fifo); + # in function register_at_gosa_si_server, after which period of seconds a new registration should be tried if a registration was # not successful until now my $delay_set_time = 5; @@ -195,6 +202,15 @@ sub check_pid { } +sub sig_int_handler { + my ($signal) = @_; + + daemon_log("shutting down gosa-si-server", 1); + exit(1); +} +$SIG{INT} = \&sig_int_handler; + + #=== FUNCTION ================================================================ # NAME: logging # PARAMETERS: level - string - default 'info' @@ -464,152 +480,6 @@ sub get_local_ip_for_remote_ip { return $result; } -sub new_ldap_config { - my ($msg_hash) = @_ ; - my $element; - my @ldap_uris; - my $ldap_base; - my @ldap_options; - my @pam_options; - my @nss_options; - my $goto_admin; - my $goto_secret; - my $admin_base= ""; - my $department= ""; - my $release= ""; - my $unit_tag; - - # Transform input into array - while ( my ($key, $value) = each(%$msg_hash) ) { - if ($key =~ /^(source|target|header)$/) { - next; - } - - foreach $element (@$value) { - if ($key =~ /^ldap_uri$/) { - push (@ldap_uris, $element); - next; - } - if ($key =~ /^ldap_base$/) { - $ldap_base= $element; - next; - } - if ($key =~ /^goto_admin$/) { - $goto_admin= $element; - next; - } - if ($key =~ /^goto_secret$/) { - $goto_secret= $element; - next; - } - if ($key =~ /^ldap_cfg$/) { - push (@ldap_options, "$element"); - next; - } - if ($key =~ /^pam_cfg$/) { - push (@pam_options, "$element"); - next; - } - if ($key =~ /^nss_cfg$/) { - push (@nss_options, "$element"); - next; - } - if ($key =~ /^admin_base$/) { - $admin_base= $element; - next; - } - if ($key =~ /^department$/) { - $department= $element; - next; - } - if ($key =~ /^unit_tag$/) { - $unit_tag= $element; - next; - } - if ($key =~ /^release$/) { - $release= $element; - next; - } - } - } - - # Unit tagging enabled? - if (defined $unit_tag){ - push (@pam_options, "pam_filter gosaUnitTag=$unit_tag"); - push (@nss_options, "nss_base_passwd $admin_base?sub?gosaUnitTag=$unit_tag"); - push (@nss_options, "nss_base_group $admin_base?sub?gosaUnitTag=$unit_tag"); - } - - # Setup ldap.conf - my $file1; - my $file2; - open(file1, "> $ldap_config"); - print file1 "# This file was automatically generated by gosa-si-client. Do not change.\n"; - print file1 "URI"; - foreach $element (@ldap_uris) { - print file1 " $element"; - } - print file1 "\nBASE $ldap_base\n"; - foreach $element (@ldap_options) { - print file1 "$element\n"; - } - close (file1); - daemon_log("wrote $ldap_config", 5); - - # Setup pam_ldap.conf / libnss_ldap.conf - open(file1, "> $pam_config"); - open(file2, "> $nss_config"); - print file1 "# This file was automatically generated by gosa-si-client. Do not change.\n"; - print file2 "# This file was automatically generated by gosa-si-client. Do not change.\n"; - print file1 "uri"; - print file2 "uri"; - foreach $element (@ldap_uris) { - print file1 " $element"; - print file2 " $element"; - } - print file1 "\nbase $ldap_base\n"; - print file2 "\nbase $ldap_base\n"; - foreach $element (@pam_options) { - print file1 "$element\n"; - } - foreach $element (@nss_options) { - print file2 "$element\n"; - } - close (file2); - daemon_log("wrote $nss_config", 5); - close (file1); - daemon_log("wrote $pam_config", 5); - - # Create goto.secrets if told so - for compatibility reasons - if (defined $goto_admin){ - open(file1, "> /etc/goto/secret"); - close(file1); - chown(0,0, "/etc/goto/secret"); - chmod(0600, "/etc/goto/secret"); - open(file1, "> /etc/goto/secret"); - print file1 "GOTOADMIN=\"$goto_admin\"\nGOTOSECRET=\"$goto_secret\"\n"; - close(file1); - daemon_log("wrote /etc/goto/secret", 5); - } - - - - # Write shell based config - my $cfg_name= dirname($ldap_config)."/ldap-shell.conf"; - open(file1, "> $cfg_name"); - print file1 "LDAP_BASE=\"$ldap_base\"\n"; - print file1 "ADMIN_BASE=\"$admin_base\"\n"; - print file1 "DEPARTMENT=\"$department\"\n"; - print file1 "RELEASE=\"$release\"\n"; - print file1 "UNIT_TAG=\"".(defined $unit_tag ? "$unit_tag" : "")."\"\n"; - print file1 "UNIT_TAG_FILTER=\"".(defined $unit_tag ? "(gosaUnitTag=$unit_tag)" : "")."\"\n"; - close(file1); - daemon_log("wrote $cfg_name", 5); - - return; - -} - sub generate_hw_digest { my $hw_data; @@ -630,13 +500,52 @@ sub create_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()); + $my_cipher->set_iv($iv); + return $my_cipher; +} + + +sub encrypt_msg { + my ($msg, $key) = @_; + my $my_cipher = &create_ciphering($key); + { + 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=~ s/\n//g; + return $msg; +} + + +sub decrypt_msg { + + my ($msg, $key) = @_ ; + $msg = &decode_base64($msg); + my $my_cipher = &create_ciphering($key); + $msg = $my_cipher->decrypt($msg); + $msg =~ s/\0*//g; + return $msg; +} + + sub get_server_addresses { my $domain= shift; my @result; my $error = 0; my $res = Net::DNS::Resolver->new; - my $query = $res->send("_gosad._tcp.".$domain, "SRV"); + my $query = $res->send("_gosa-si._tcp.".$domain, "SRV"); my @hits; if ($query) { @@ -662,7 +571,7 @@ sub get_server_addresses { } } -# my $dig_cmd= 'dig +nocomments srv _gosad._tcp.'.$domain; +# my $dig_cmd= 'dig +nocomments srv _gosa-si._tcp.'.$domain; # # my $output= `$dig_cmd 2>&1`; # open (PIPE, "$dig_cmd 2>&1 |"); @@ -1090,6 +999,11 @@ sub import_events { } } + + my @all_events = keys %$event_hash; + my $all_events_string = join(", ", @all_events); + + daemon_log("INFO: imported events: $all_events_string", 5); } sub trigger_new_key { @@ -1103,10 +1017,69 @@ sub trigger_new_key { } +sub generic_file_reset { + my ( $heap, $wheel_id ) = @_[ HEAP, ARG0 ]; + + my $service = $heap->{services}->{$wheel_id}; + daemon_log("INFO: '$service' watching reset", 5); + return; +} + +sub generic_file_error { + my ( $heap, $operation, $errno, $error_string, $wheel_id ) = + @_[ HEAP, ARG0, ARG1, ARG2, ARG3 ]; + + my $service = $heap->{services}->{$wheel_id}; + daemon_log("ERROR: '$service' watcher $operation error $errno: $error_string", 1); + daemon_log("ERROR: shutting down '$service' file watcher", 1); + + delete $heap->{services}->{$wheel_id}; + delete $heap->{watchers}->{$wheel_id}; + return; +} + +sub fifo_got_record { + my $file_record = $_[ARG0]; + my $header; + my $content = ""; + + $file_record =~ /^(\S+)[ ]?([\s\S]+)?$/; + if( defined $1 ) { + $header = $1; + } else { + return; + } + + if( defined $2 ) { + $content = $2; + } + + my $clmsg_hash = &create_xml_hash("CLMSG_$header", $client_address, $server_address, $content); + &add_content2xml_hash($clmsg_hash, "macaddress", $client_mac_address); + my $clmsg = &create_xml_string($clmsg_hash); + &send_msg_to_target($clmsg, $server_address, $server_key); + return; +} + + sub _start { - my ($kernel) = $_[KERNEL]; + my ($kernel, $heap) = @_[KERNEL, HEAP]; $kernel->alias_set('client_session'); + + # force a registration at a gosa-si-server $kernel->yield('register_at_gosa_si_server'); + + # install all file watcher defined + while( my($file_name, $file) = each %files_to_watch ) { + my $file_watcher = POE::Wheel::FollowTail->new( + Filename => $file, + InputEvent => $file_name."_record", + ResetEvent => "file_reset", + ErrorEvent => "file_error", + ); + $heap->{services}->{ $file_watcher->ID } = $file_name; + $heap->{watchers}->{ $file_watcher->ID } = $file_watcher; + } } @@ -1224,6 +1197,11 @@ daemon_log("$prg started!", 1); system('rm -f /tmp/gosa_si_lock*gosa-si-client*'); # detect ip and mac address and complete host address +#if( inet_aton($client_ip) ){ +#print STDERR "ip: $client_ip\n"; +# $client_ip = inet_ntoa(inet_aton($client_ip)); +#print STDERR "ip: $client_ip\n"; +#} $client_address = $client_ip.":".$client_port; my $network_interface= &get_interface_for_ip($client_ip); $client_mac_address= &get_mac($network_interface); @@ -1250,6 +1228,11 @@ daemon_log("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)); } +############################################################ +# to change +if( $server_ip eq "127.0.1.1" ) { $server_ip = "127.0.0.1" } +############################################################ if (defined $server_ip && defined $server_port) { $server_address = $server_ip.":".$server_port; } @@ -1258,7 +1241,9 @@ $default_server_key = $server_key; # add gosa-si-server address from config file at first position of server list -if (defined $server_address) { +my $server_check_cfg = Config::IniFiles->new( -file => $cfg_file ); +my $server_check = $server_check_cfg->val( "server", "ip"); +if( defined $server_check ) { unshift(@servers, $server_address); my $servers_string = join(", ", @servers); daemon_log("found servers in configuration file: $servers_string", 5); @@ -1266,9 +1251,15 @@ if (defined $server_address) { else { if ( !$server_domain) { daemon_log("ERROR: please specify a gosa-si-server address or a domain in config file", 1); - exit( 1 ); + kill 2, $$; } my @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); } @@ -1277,6 +1268,8 @@ else { } +# open fifo for non-gosa-si-client-msgs to gosa-si-server +POSIX::mkfifo("$gosa_si_client_fifo", "0600"); POE::Session->create( @@ -1284,6 +1277,13 @@ POE::Session->create( _start => \&_start, register_at_gosa_si_server => \®ister_at_gosa_si_server, trigger_new_key => \&trigger_new_key, + + # handle records from each defined file differently + fifo_record => \&fifo_got_record, + + # handle file resets and errors the same way for each file + file_reset => \&generic_file_reset, + file_error => \&generic_file_error, } );