X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=1e56d7ce7066ed3b9cdf0f9ae743cc7880d81eb5;hb=a8f51a95512d866636a6e559a0ab23a5181d8a3f;hp=2efd734780e3006f9f34c0dc1927db7089fcbc67;hpb=ba87ac043b09d7d0f515adf5ee6b4d4540d740e4;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 2efd73478..1e56d7ce7 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -20,8 +20,6 @@ # REVISION: --- #=============================================================================== -my $server_version = '$HeadURL: https://oss.gonicus.de/repositories/gosa/trunk/gosa-si/gosa-si-server $:$Rev$'; - use strict; use warnings; use Getopt::Long; @@ -39,7 +37,7 @@ use Digest::MD5 qw(md5 md5_hex md5_base64); use XML::Simple; use Data::Dumper; use Sys::Syslog qw( :DEFAULT setlogsock); -use Time::HiRes qw( usleep); +use Time::HiRes qw( usleep clock_gettime ); use Cwd; use File::Spec; use File::Basename; @@ -51,6 +49,8 @@ use POE qw(Component::Server::TCP Wheel::Run Filter::Reference); use Net::LDAP; use Net::LDAP::Util qw(:escape); +my $server_version = '$HeadURL: https://oss.gonicus.de/repositories/gosa/trunk/gosa-si/gosa-si-server $:$Rev$'; + # revision number of server and program name my $server_headURL; my $server_revision; @@ -63,7 +63,6 @@ my $db_module = "DBsqlite"; no strict "refs"; require ("GOSA/".$db_module.".pm"); ("GOSA/".$db_module)->import; -daemon_log("0 INFO: importing database module '$db_module'", 1); } my $modules_path = "/usr/lib/gosa-si/modules"; @@ -248,7 +247,7 @@ our $check_periodic = {"months"=>'', "weeks"=>'', "days"=>'', "hours"=>'', "minu "messaging" => [\$messaging_file_name, '/var/lib/gosa-si/messaging.db'], "foreign-clients" => [\$foreign_clients_file_name, '/var/lib/gosa-si/foreign_clients.db'], "source-list" => [\$sources_list, '/etc/apt/sources.list'], - "repo-path" => [\$repo_path, '/srv/www/repository'], + "repo-path" => [\$repo_path, '/srv/www'], "debian-arch" => [\$arch, 'i386'], "ldap-uri" => [\$ldap_uri, ""], "ldap-base" => [\$ldap_base, ""], @@ -286,7 +285,7 @@ our $check_periodic = {"months"=>'', "weeks"=>'', "days"=>'', "hours"=>'', "minu "synchronization-loop" => [\$modified_jobs_loop_delay, 5], }, "ArpHandler" => { - "enabled" => [\$arp_enabled, "true"], + "enabled" => [\$arp_enabled, "false"], "interface" => [\$arp_interface, "all"], }, "Opsi" => { @@ -319,10 +318,10 @@ usage: $prg [-hvf] [-c config] [-d number] 'vvvvvvv': debug plus info logs -no-arp : starts $prg without connection to arp module -d : if verbose level is higher than 7x 'v' specified parts can be debugged - 1 : receiving messages - 2 : sending messages - 4 : encrypting/decrypting messages - 8 : verification if a message complies gosa-si requirements + 1 : report incoming messages + 2 : report unencrypted outgoing messages + 4 : report encrypting key for messages + 8 : report decrypted incoming message and verification if the message complies gosa-si requirements 16 : message processing 32 : ldap connectivity 64 : database status and connectivity @@ -388,10 +387,13 @@ sub daemon_log { $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday; $year+=1900; - + # Microseconds since epoch + my $microSeconds = sprintf("%.2f", &Time::HiRes::clock_gettime()); + $microSeconds =~ s/^\d*(.\d\d)$/$1/; + # Build log message and write it to log file and commandline chomp($msg); - my $log_msg = "$month $monthday $hours:$minutes:$seconds $prg $msg\n"; + my $log_msg = "$month $monthday $hours:$minutes:$seconds$microSeconds $prg $msg\n"; flock(LOG_HANDLE, LOCK_EX); seek(LOG_HANDLE, 0, 2); print LOG_HANDLE $log_msg; @@ -452,28 +454,28 @@ sub check_cmdline_param () { sub check_pid { $pid = -1; # Check, if we are already running - if( open(LOCK_FILE, "<$pid_file") ) { - $pid = ; + if( open( my $LOCK_FILE, "<", "$pid_file" ) ) { + $pid = <$LOCK_FILE>; if( defined $pid ) { chomp( $pid ); if( -f "/proc/$pid/stat" ) { my($stat) = `cat /proc/$pid/stat` =~ m/$pid \((.+)\).*/; if( $stat ) { print STDERR "\nERROR: Already running!\n"; - close( LOCK_FILE ); + close( $LOCK_FILE ); exit -1; } } } - close( LOCK_FILE ); + close( $LOCK_FILE ); unlink( $pid_file ); } # create a syslog msg if it is not to possible to open PID file - if (not sysopen(LOCK_FILE, $pid_file, O_WRONLY|O_CREAT|O_EXCL, 0644)) { + if (not sysopen(my $LOCK_FILE, $pid_file, O_WRONLY|O_CREAT|O_EXCL, 0644)) { my($msg) = "Couldn't obtain lockfile '$pid_file' "; - if (open(LOCK_FILE, '<', $pid_file) - && ($pid = )) + if (open(my $LOCK_FILE, '<', $pid_file) + && ($pid = <$LOCK_FILE>)) { chomp($pid); $msg .= "(PID $pid)\n"; @@ -1312,7 +1314,7 @@ sub msg_to_decrypt { module=>$module, sessionid=>$session_id, } ); - + $kernel->yield('watch_for_next_tasks'); } # target is own address with forward_to_gosa-tag pointing at myself -> forward to gosa @@ -1432,6 +1434,7 @@ sub msg_to_decrypt { sessionid=>$session_id, } ); $done = 1; + $kernel->yield('watch_for_next_tasks'); } @@ -1544,8 +1547,7 @@ sub process_task { while ($answer_str =~ /
(\w+)<\/header>/g) { push(@headers, $1); } - daemon_log("$session_id INFO: got answer message(s) with header: '".join("', '", @headers)."'", 5); - daemon_log("$session_id DEBUG: $module: got answer from module: \n".$answer_str,26); + daemon_log("$session_id DEBUG: got answer message(s) with header: '".join("', '", @headers)."'", 26); } else { daemon_log("$session_id DEBUG: $module: got no answer from module!" ,26); } @@ -1603,6 +1605,9 @@ sub process_task { if( defined $session_id ) { $add_on = ".session_id=$session_id"; } + my $header = ($1) if $answer =~ /
(\S*)<\/header>/; + daemon_log("$session_id INFO: send ".$header." message to GOsa", 5); + daemon_log("$session_id DEBUG: message:\n$answer", 12); # answer is for GOSA and has to returned to connected client my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key); $client_answer = $gosa_answer.$add_on; @@ -1706,7 +1711,6 @@ sub session_start { $kernel->yield('register_at_foreign_servers'); $kernel->yield('create_fai_server_db', $fai_server_tn ); $kernel->yield('create_fai_release_db', $fai_release_tn ); - $kernel->yield('watch_for_next_tasks'); $kernel->sig(USR1 => "sig_handler"); $kernel->sig(USR2 => "recreate_packages_db"); $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay); @@ -1763,7 +1767,6 @@ sub watch_for_done_jobs { sub watch_for_opsi_jobs { my ($kernel) = $_[KERNEL]; - # This is not very nice to look for opsi install jobs, but headertag has to be trigger_action_reinstall. The only way to identify a # opsi install job is to parse the xml message. There is still the correct header. my $sql_statement = "SELECT * FROM ".$job_queue_tn." WHERE ((xmlmessage LIKE '%opsi_install_client
%') AND (status='processing') AND (siserver='localhost'))"; @@ -1787,10 +1790,14 @@ sub watch_for_opsi_jobs { }; my $hres = $opsi_client->call($opsi_url, $callobj); - #my ($hres_err, $hres_err_string) = &check_opsi_res($hres); + # TODO : move all opsi relevant statments to opsi plugin + # The following 3 lines must be tested befor they can replace the rubbish above and below !!! + #my ($res, $err) = &opsi_com::_getProductStates_hash(hostId=>$hostId) + #if (not $err) { + # my $htmp = $res->{$hostId}; + # if (not &check_opsi_res($hres)) { my $htmp= $hres->result->{$hostId}; - # Check state != not_installed or action == setup -> load and add my $products= 0; my $installed= 0; @@ -2278,8 +2285,6 @@ sub watch_for_next_tasks { my $sql = "DELETE FROM $incoming_tn WHERE id=$message_id"; my $res = $incoming_db->exec_statement($sql); } - - $kernel->delay_set('watch_for_next_tasks', 1); } @@ -2874,8 +2879,7 @@ sub create_sources_list { &main::daemon_log("$session_id DEBUG: remove an old version of '$result'", 7); } - my $fh; - open($fh, ">$result"); + open(my $fh, ">", "$result"); if (not defined $fh) { &main::daemon_log("$session_id DEBUG: cannot open '$result' for writing", 7); return undef; @@ -2958,14 +2962,14 @@ sub create_packages_list_db { my $line; - open(CONFIG, "<$sources_file") or do { + open(my $CONFIG, "<", "$sources_file") or do { daemon_log( "$session_id ERROR: create_packages_list_db: Failed to open '$sources_file'", 1); unlink($packages_list_under_construction); return; }; # Read lines - while ($line = ){ + while ($line = <$CONFIG>){ # Unify chop($line); $line =~ s/^\s+//; @@ -2987,9 +2991,12 @@ sub create_packages_list_db { &parse_package_info( $baseurl, $dist, $section, $session_id ); } } + else { + daemon_log("$session_id ERROR: cannot parse line '$line'", 1); + } } - close (CONFIG); + close ($CONFIG); if(keys(%repo_dirs)) { find(\&cleanup_and_extract, keys( %repo_dirs )); @@ -3177,7 +3184,6 @@ sub parse_package { my ($path, $dist, $srv_path, $session_id)= @_; if (not defined $session_id) { $session_id = 0;} my ($package, $version, $section, $description); - my $PACKAGES; my $timestamp = &get_time(); if(not stat("$path.in")) { @@ -3185,7 +3191,7 @@ sub parse_package { return; } - open($PACKAGES, "<$path.in"); + open(my $PACKAGES, "<", "$path.in"); if(not defined($PACKAGES)) { daemon_log("$session_id ERROR: create_packages_list_db: parse_package: cannot open '$path.in'",1); return; @@ -3276,9 +3282,9 @@ sub cleanup_and_extract { my $tmpl= ""; { local $/=undef; - open FILE, "$dir/DEBIAN/templates"; - $tmpl = &encode_base64(); - close FILE; + open(my $FILE, "$dir/DEBIAN/templates"); + $tmpl = &encode_base64(<$FILE>); + close($FILE); } rmtree("$dir/DEBIAN/templates"); @@ -3488,9 +3494,9 @@ if( ! $foreground ) { # Do something useful - put our PID into the pid_file if( 0 != $pid ) { - open( LOCK_FILE, ">$pid_file" ); - print LOCK_FILE "$pid\n"; - close( LOCK_FILE ); + open( my $LOCK_FILE, ">", "$pid_file" ); + print $LOCK_FILE "$pid\n"; + close( $LOCK_FILE ); if( !$foreground ) { exit( 0 ) }; @@ -3510,8 +3516,8 @@ if ($server_headURL =~ /\/tag\// || # Prepare log file and set permissions $root_uid = getpwnam('root'); $adm_gid = getgrnam('adm'); -open(FH, ">>$log_file"); -close FH; +open(my $FH, ">>", "$log_file"); +close($FH); chmod(0440, $log_file); chown($root_uid, $adm_gid, $log_file); chown($root_uid, $adm_gid, "/var/lib/gosa-si"); @@ -3526,6 +3532,9 @@ daemon_log($server_status_hash->{$server_status}.": $server_revision", 1); no strict "refs"; if ($db_module eq "DBmysql") { + + daemon_log("0 INFO: importing database module '$db_module'", 1); + # connect to incoming_db $incoming_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password); @@ -3557,6 +3566,9 @@ daemon_log($server_status_hash->{$server_status}.": $server_revision", 1); $messaging_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password); } elsif ($db_module eq "DBsqlite") { + + daemon_log("0 INFO: importing database module '$db_module'", 1); + # connect to incoming_db unlink($incoming_file_name); $incoming_db = GOSA::DBsqlite->new($incoming_file_name); @@ -3619,6 +3631,9 @@ daemon_log($server_status_hash->{$server_status}.": $server_revision", 1); } # Creating tables + +daemon_log("0 INFO: creating tables in database with '$db_module'", 1); + $messaging_db->create_table($messaging_tn, \@messaging_col_names); $packages_list_db->create_table($packages_list_tn, \@packages_list_col_names); $fai_release_db->create_table($fai_release_tn, \@fai_release_col_names); @@ -3688,6 +3703,7 @@ POE::Component::Server::TCP->new( }, InlineStates => { msg_to_decrypt => \&msg_to_decrypt, + watch_for_next_tasks => \&watch_for_next_tasks, next_task => \&next_task, task_result => \&handle_task_result, task_done => \&handle_task_done, @@ -3709,7 +3725,6 @@ POE::Session->create( task_result => \&handle_task_result, task_done => \&handle_task_done, task_debug => \&handle_task_debug, - watch_for_next_tasks => \&watch_for_next_tasks, watch_for_new_messages => \&watch_for_new_messages, watch_for_delivery_messages => \&watch_for_delivery_messages, watch_for_done_messages => \&watch_for_done_messages,