X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=893ccfb3656f2e10c4df5f1adea880c4bf6a6cad;hb=4eeb0d22bb703e4dbbe4bd34349e5e8d8fc816c5;hp=47dc89b4161ee8ba5adb1ade4353fa353b796114;hpb=f79339e4269f219dd33f1ba4cd9a98817d7d810b;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 47dc89b41..893ccfb36 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -20,12 +20,12 @@ # REVISION: --- #=============================================================================== + use strict; use warnings; use Getopt::Long; use Config::IniFiles; use POSIX; -use utf8; use Fcntl; use IO::Socket::INET; @@ -41,6 +41,8 @@ use Sys::Syslog qw( :DEFAULT setlogsock); use Cwd; use File::Spec; use File::Basename; +use File::Find; +use File::Copy; use File::Path; use GOSA::DBsqlite; use GOSA::GosaSupportDaemon; @@ -51,9 +53,16 @@ use Net::LDAP::Util qw(:escape); my $modules_path = "/usr/lib/gosa-si/modules"; use lib "/usr/lib/gosa-si/modules"; +# TODO es gibt eine globale funktion get_ldap_handle +# - ist in einer session dieses ldap handle schon vorhanden, wird es zurückgegeben +# - ist es nicht vorhanden, wird es erzeugt, im heap für spätere ldap anfragen gespeichert und zurückgegeben +# - sessions die kein ldap handle brauchen, sollen auch keins haben +# - wird eine session geschlossen, muss das ldap verbindung vorher beendet werden +our $global_kernel; + my (%cfg_defaults, $foreground, $verbose, $ping_timeout); my ($bus_activ, $bus, $msg_to_bus, $bus_cipher); -my ($server, $server_mac_address); +my ($server); my ($gosa_server, $job_queue_timeout, $job_queue_loop_delay); my ($known_modules); my ($pid_file, $procid, $pid, $log_file); @@ -61,6 +70,9 @@ my ($arp_activ, $arp_fifo); my ($xml); my $sources_list; my $max_clients; +my %repo_files=(); +my $repo_path; +my %repo_dirs=(); # variables declared in config file are always set to 'our' our (%cfg_defaults, $log_file, $pid_file, $server_ip, $server_port, $SIPackages_key, @@ -70,6 +82,7 @@ our (%cfg_defaults, $log_file, $pid_file, # additional variable which should be globaly accessable our $server_address; +our $server_mac_address; our $bus_address; our $gosa_address; our $no_bus; @@ -77,7 +90,8 @@ our $no_arp; our $verbose; our $forground; our $cfg_file; -our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn); +#our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn); +our ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn); # specifies the verbosity of the daemon_log @@ -100,8 +114,16 @@ our $prg= basename($0); our $job_db; our $job_queue_tn = 'jobs'; my $job_queue_file_name; -my @job_queue_col_names = ("id INTEGER", "timestamp", "status", "result", "progress INTEGER", - "headertag", "targettag", "xmlmessage", "macaddress"); +my @job_queue_col_names = ("id INTEGER", + "timestamp", + "status DEFAULT 'none'", + "result DEFAULT 'none'", + "progress DEFAULT 'none'", + "headertag DEFAULT 'none'", + "targettag DEFAULT 'none'", + "xmlmessage DEFAULT 'none'", + "macaddress DEFAULT 'none'", + ); # holds all other gosa-sd as well as the gosa-sd-bus our $known_server_db; @@ -168,6 +190,7 @@ my $max_children = 2; "packages-list" => [\$packages_list_file_name, '/var/lib/gosa-si/packages.db'], "messaging" => [\$messaging_file_name, '/var/lib/gosa-si/messaging.db'], "source-list" => [\$sources_list, '/etc/apt/sources.list'], + "repo-path" => [\$repo_path, '/srv/www/repository'], "ldap-uri" => [\$ldap_uri, ""], "ldap-base" => [\$ldap_base, ""], "ldap-admin-dn" => [\$ldap_admin_dn, ""], @@ -407,9 +430,11 @@ sub import_modules { sub sig_int_handler { my ($signal) = @_; - if(defined($ldap_handle)) { - $ldap_handle->disconnect; - } +# if (defined($ldap_handle)) { +# $ldap_handle->disconnect; +# } + # TODO alle verbliebenden ldap verbindungen aus allen heaps beenden + daemon_log("shutting down gosa-si-server", 1); system("killall gosa-si-server"); @@ -417,7 +442,6 @@ sub sig_int_handler { $SIG{INT} = \&sig_int_handler; - sub check_key_and_xml_validity { my ($crypted_msg, $module_key, $session_id) = @_; my $msg; @@ -940,8 +964,17 @@ sub update_jobdb_status_for_send_msgs { sub _start { my ($kernel) = $_[KERNEL]; &trigger_db_loop($kernel); - #$kernel->yield('create_fai_server_db', $fai_server_tn ); - #$kernel->yield('create_fai_release_db', $fai_release_tn ); + $global_kernel = $kernel; + $kernel->yield('create_fai_server_db', $fai_server_tn ); + $kernel->yield('create_fai_release_db', $fai_release_tn ); + $kernel->sig(USR1 => "sig_handler"); +} + +sub sig_handler { + my ($kernel, $signal) = @_[KERNEL, ARG0] ; + daemon_log("0 INFO got signal '$signal'", 1); + $kernel->sig_handled(); + return; } sub next_task { @@ -1023,6 +1056,7 @@ sub process_task { if(( !$msg ) || ( !$msg_hash ) || ( !$module )){ # if an incoming msg could not be decrypted (maybe a wrong key), send client a ping. If the client # could not understand a msg from its server the client cause a re-registering process + daemon_log("$session_id INFO cannot understand incoming msg, send 'ping'-msg to all host with ip '".$heap->{remote_ip}."' to cause a re-registering of the client if necessary", 5); my $sql_statement = "SELECT * FROM $main::known_clients_tn WHERE (hostname LIKE '".$heap->{'remote_ip'}."%')"; my $query_res = $known_clients_db->select_dbentry( $sql_statement ); while( my ($hit_num, $hit) = each %{ $query_res } ) { @@ -1038,7 +1072,8 @@ sub process_task { ###################### # process incoming msg if( $error == 0) { - daemon_log("$session_id INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]."'", 5); + daemon_log("$session_id INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]. + "' from '".$heap->{'remote_ip'}."'", 5); daemon_log("$session_id DEBUG: Processing module ".$module, 7); $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $session_id); @@ -1120,7 +1155,7 @@ sub process_task { # target of msg is a mac address elsif( $answer_target =~ /^([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})$/i ) { daemon_log("$session_id INFO: target is mac address '$answer_target', looking for host in known_clients", 5); - my $sql_statement = "SELECT * FROM known_clients WHERE macaddress='$answer_target'"; + my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$answer_target'"; my $query_res = $known_clients_db->select_dbentry( $sql_statement ); my $found_ip_flag = 0; while( my ($hit_num, $hit) = each %{ $query_res } ) { @@ -1236,16 +1271,6 @@ sub watch_for_new_jobs { # expect macaddress is unique!!!!!! my $target = $res_hash->{1}->{hostname}; -# if (not defined $target) { -# &daemon_log("ERROR: no host found for mac address: $macaddress", 1); -# &daemon_log("$hit->{xmlmessage}", 8); -# my $sql_statement = "UPDATE $job_queue_tn ". -# "SET status='error', result='no host found for mac address' ". -# "WHERE id='$jobdb_id'"; -# my $res = $job_db->update_dbentry($sql_statement); -# next; -# } -# # change header $job_msg =~ s/
job_/
gosa_/; @@ -1265,44 +1290,44 @@ sub watch_for_new_jobs { } -sub refresh_ldap_handle { - my $mesg; +sub get_ldap_handle { + my ($session_id) = @_; + my $heap; + my $ldap_handle; - # Get an ldap handle, if we don't have one - if( ! defined $ldap_handle ){ - $ldap_handle = Net::LDAP->new( $ldap_uri ); - } - # Still not defined? - if( ! defined $ldap_handle ) { - daemon_log( "ch $$: Net::LDAP constructor failed: $!\n" ); - return 0; - } + if (not defined $session_id ) { $session_id = 0 }; - # Bind to ldap server - eventually authenticate - if( defined $ldap_admin_dn ) { - if( defined $ldap_admin_password ) { - $mesg = $ldap_handle->bind( $ldap_admin_dn, password => $ldap_admin_password ); - } else { - $mesg = $ldap_handle->bind( $ldap_admin_dn ); - } - } else { - $mesg = $ldap_handle->bind(); - } + if ($session_id == 0) { + daemon_log("$session_id DEBUG: get_ldap_handle invoked without a session_id, create a new ldap_handle", 7); + $ldap_handle = Net::LDAP->new( $ldap_uri ); + $ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password); - if( 0 != $mesg->code ) { - undef( $ldap_handle ) if( 81 == $mesg->code ); - daemon_log( "ch $$: LDAP bind: error (". $mesg->code . ') - ' . $mesg->error . "\n", 1); - return 0; - } + } else { + my $session_reference = $global_kernel->ID_id_to_session($session_id); + if( defined $session_reference ) { + $heap = $session_reference->get_heap(); + } - return 1; + if (not defined $heap) { + daemon_log("$session_id DEBUG: cannot get heap for session_id '$session_id'", 7); + return; + } + + # TODO: This "if" is nonsense, because it doesn't prove that the + # used handle is still valid - or if we've to reconnect... + #if (not exists $heap->{ldap_handle}) { + $ldap_handle = Net::LDAP->new( $ldap_uri ); + $ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password); + $heap->{ldap_handle} = $ldap_handle; + #} + } + return $ldap_handle; } sub change_fai_state { my ($st, $targets, $session_id) = @_; $session_id = 0 if not defined $session_id; - # Set FAI state to localboot my %mapActions= ( reboot => '', @@ -1313,29 +1338,32 @@ sub change_fai_state { wake => '', memcheck => 'memcheck', sysinfo => 'sysinfo', + install => 'install', ); # Return if this is unknown if (!exists $mapActions{ $st }){ + daemon_log("$session_id ERROR: unknown action '$st', can not translate ot FAIstate", 1); return; } my $state= $mapActions{ $st }; - &refresh_ldap_handle(); + my $ldap_handle = &get_ldap_handle($session_id); if( defined($ldap_handle) ) { # Build search filter for hosts - my $search= "(&(objectClass=GOhard)"; - foreach (@{$targets}){ - $search.= "(macAddress=$_)"; - } - $search.= ")"; + my $search= "(&(objectClass=GOhard)"; + foreach (@{$targets}){ + $search.= "(macAddress=$_)"; + } + $search.= ")"; # If there's any host inside of the search string, procress them - if (!($search =~ /macAddress/)){ - return; - } + if (!($search =~ /macAddress/)){ + daemon_log("$session_id ERROR: no macAddress found in filter statement for LDAP search: '$search'", 1); + return; + } # Perform search for Unit Tag my $mesg = $ldap_handle->search( @@ -1372,10 +1400,16 @@ sub change_fai_state { daemon_log("$session_id Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1); } - } + } else { + daemon_log("$session_id DEBUG FAIstate at host '$_' already at state '$st'", 7); + } } } + # if no ldap handle defined + } else { + daemon_log("$session_id ERROR: no LDAP handle defined for update FAIstate", 1); } + } @@ -1386,7 +1420,7 @@ sub change_goto_state { # Switch on or off? my $state= $st eq 'active' ? 'active': 'locked'; - &refresh_ldap_handle(); + my $ldap_handle = &get_ldap_handle($session_id); if( defined($ldap_handle) ) { # Build search filter for hosts @@ -1437,7 +1471,7 @@ sub change_goto_state { sub create_fai_server_db { my ($table_name, $kernel) = @_; my $result; - + my $ldap_handle = &get_ldap_handle(); if(defined($ldap_handle)) { daemon_log("INFO: create_fai_server_db: start", 5); my $mesg= $ldap_handle->search( @@ -1469,9 +1503,10 @@ sub create_fai_server_db { daemon_log("INFO: create_fai_server_db: finished", 5); # TODO: Find a way to post the 'create_packages_list_db' event - &create_packages_list_db(); + &create_packages_list_db($ldap_handle); } - + + $ldap_handle->disconnect; return $result; } @@ -1493,6 +1528,7 @@ sub create_fai_release_db { my ($table_name) = @_; my $result; + my $ldap_handle = &get_ldap_handle(); if(defined($ldap_handle)) { daemon_log("INFO: create_fai_release_db: start",5); my $mesg= $ldap_handle->search( @@ -1507,7 +1543,7 @@ sub create_fai_release_db { my @sql_list; my $timestamp= &get_time(); foreach my $ou (@{$mesg->{entries}}) { - my $tmp_classes= resolve_fai_classes($ou->dn); + my $tmp_classes= resolve_fai_classes($ou->dn, $ldap_handle); if(defined($tmp_classes) && ref($tmp_classes) eq 'HASH') { my @tmp_array=get_fai_release_entries($tmp_classes); if(@tmp_array) { @@ -1536,7 +1572,7 @@ sub create_fai_release_db { } daemon_log("INFO: create_fai_release_db: finished",5); } - + $ldap_handle->disconnect; return $result; } sub run_create_fai_release_db { @@ -1586,8 +1622,8 @@ sub get_fai_state { } sub resolve_fai_classes { + my ($fai_base, $ldap_handle) = @_; my $result; - my $fai_base= shift; my @possible_fai_classes= ("FAIscript", "FAIhook", "FAIpartitionTable", "FAItemplate", "FAIvariable", "FAIprofile", "FAIpackageList"); my $fai_filter= "(|(&(objectClass=FAIclass)(|(objectClass=".join(")(objectClass=", @possible_fai_classes).")))(objectClass=FAIbranch))"; my $fai_classes; @@ -1791,6 +1827,7 @@ sub session_run_done { } sub create_sources_list { + my ($ldap_handle) = @_; my $result="/tmp/gosa_si_tmp_sources_list"; # Remove old file @@ -1800,13 +1837,13 @@ sub create_sources_list { my $fh; open($fh, ">$result") or return undef; - if(defined($ldap_server_dn) && length($ldap_server_dn)>0) { + if(defined($ldap_server_dn) and length($ldap_server_dn) > 0) { my $mesg=$ldap_handle->search( - base => $ldap_server_dn, - scope => 'base', - attrs => 'FAIrepository', - ); - + base => $ldap_server_dn, + scope => 'base', + attrs => 'FAIrepository', + filter => 'objectClass=FAIrepositoryServer' + ); if($mesg->count) { foreach my $entry(@{$mesg->{'entries'}}) { my ($server, $tag, $release, $sections)= split /\|/, $entry->get_value('FAIrepository'); @@ -1823,7 +1860,16 @@ sub create_sources_list { } sub create_packages_list_db { - my ($sources_file) = @_ || &create_sources_list; + my ($ldap_handle, $sources_file) = @_ ; + + if (not defined $ldap_handle) { + daemon_log("0 ERROR: no ldap_handle available to create_packages_list_db", 1); + return; + } + if (not defined $sources_file) { + $sources_file = &create_sources_list($ldap_handle); + } + my $line; daemon_log("INFO: create_packages_list_db: start", 5); @@ -1862,6 +1908,7 @@ sub create_packages_list_db { daemon_log("INFO: create_packages_list_db: finished", 5); return; } + sub run_create_packages_list_db { my ($session, $heap) = @_[SESSION, HEAP]; my $task = POE::Wheel::Run->new( @@ -1872,18 +1919,22 @@ sub run_create_packages_list_db { ); $heap->{task}->{ $task->ID } = $task; } + sub parse_package_info { my ($baseurl, $dist, $section)= @_; my ($package); my ($path) = ($baseurl =~ m%://[^/]*(.*)$%); + $repo_dirs{ "${repo_path}/pool" } = 1; foreach $package ("Packages.gz"){ daemon_log("DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7); get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section" ); parse_package( "$outdir/$dist/$section", $dist, $path ); } + find(\&cleanup_and_extract, keys( %repo_dirs ) ); } + sub get_package { my ($url, $dest)= @_; @@ -1893,14 +1944,15 @@ sub get_package { # This is ugly, but I've no time to take a look at "how it works in perl" if(0 == system("wget '$url' -O '$dest' 2>/dev/null") ) { system("gunzip -cd '$dest' > '$dest.in'"); - system("rm -f '$dest'"); + unlink($dest); } else { daemon_log("ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1); } return 0; } + sub parse_package { - my ($path, $dist, $srv_path )= @_; + my ($path, $dist, $srv_path)= @_; my ($package, $version, $section, $description); my @sql_list; my $PACKAGES; @@ -1924,7 +1976,7 @@ sub parse_package { # Use empty lines as a trigger if ($line =~ /^\s*$/){ - my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', 'xxx', 'none', '0')"; + my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '', 'none', '0')"; push(@sql_list, $sql); $package = "none"; $version = "none"; @@ -1957,6 +2009,12 @@ sub parse_package { next; } + # Trigger for filename + if ($line =~ /^Filename:\s/){ + my ($filename) = ($line =~ /^Filename: (.*)$/); + store_fileinfo( $package, $filename, $dist, $srv_path, $version, $repo_path ); + next; + } } close( $PACKAGES ); @@ -1965,18 +2023,53 @@ sub parse_package { $packages_list_db->exec_statementlist(\@sql_list); } -# -#sub store_fileinfo { -# my( $package, $file, $dist, $path, $vers ) = @_; -# -# my %fileinfo = ( -# 'package' => $package, -# 'dist' => $dist, -# 'version' => $vers -# ); -# -# $repo_files{ "${srvdir}${path}/$file" } = \%fileinfo; -#} +sub store_fileinfo { + my( $package, $file, $dist, $path, $vers, $srvdir) = @_; + + my %fileinfo = ( + 'package' => $package, + 'dist' => $dist, + 'version' => $vers, + ); + + $repo_files{ "${srvdir}/$file" } = \%fileinfo; +} + +sub cleanup_and_extract { + my $fileinfo = $repo_files{ $File::Find::name }; + + if( defined $fileinfo ) { + + my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d"; + my $sql; + my $package = $fileinfo->{ 'package' }; + my $newver = $fileinfo->{ 'version' }; + + mkpath($dir); + system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" ); + + if( -f "$dir/DEBIAN/templates" ) { + + daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 5); + + my $tmpl= ""; + { + local $/=undef; + open FILE, "$dir/DEBIAN/templates"; + $tmpl = &encode_base64(); + close FILE; + } + rmtree("$dir/DEBIAN/templates"); + + $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';"; + + } else { + $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';"; + } + + my $res= $main::packages_list_db->update_dbentry($sql); + } +} #==== MAIN = main ============================================================== @@ -2031,38 +2124,40 @@ if ($no_bus > 0) { $bus_activ = "false" } - - -# delete old DBsqlite lock files -#unlink('/tmp/gosa_si_lock*'); - # connect to gosa-si job queue +unlink($job_queue_file_name.".si.lock"); $job_db = GOSA::DBsqlite->new($job_queue_file_name); $job_db->create_table($job_queue_tn, \@job_queue_col_names); # connect to known_clients_db +unlink($known_clients_file_name.".si.lock"); $known_clients_db = GOSA::DBsqlite->new($known_clients_file_name); $known_clients_db->create_table($known_clients_tn, \@known_clients_col_names); # connect to known_server_db +unlink($known_server_file_name.".si.lock"); $known_server_db = GOSA::DBsqlite->new($known_server_file_name); $known_server_db->create_table($known_server_tn, \@known_server_col_names); # connect to login_usr_db +unlink($login_users_file_name.".si.lock"); $login_users_db = GOSA::DBsqlite->new($login_users_file_name); $login_users_db->create_table($login_users_tn, \@login_users_col_names); # connect to fai_server_db and fai_release_db +unlink($fai_server_file_name.".si.lock"); $fai_server_db = GOSA::DBsqlite->new($fai_server_file_name); $fai_server_db->create_table($fai_server_tn, \@fai_server_col_names); $fai_server_db->create_table($fai_release_tn, \@fai_release_col_names); # connect to packages_list_db +unlink($packages_list_file_name.".si.lock"); unlink($packages_list_file_name); $packages_list_db = GOSA::DBsqlite->new($packages_list_file_name); $packages_list_db->create_table($packages_list_tn, \@packages_list_col_names); # connect to messaging_db +unlink($messaging_file_name.".si.lock"); $messaging_db = GOSA::DBsqlite->new($messaging_file_name); $messaging_db->create_table($messaging_tn, \@messaging_col_names); @@ -2094,6 +2189,7 @@ daemon_log("start socket for incoming xml messages at port '$server_port' ", 1); POE::Session->create( inline_states => { _start => \&_start, + sig_handler => \&sig_handler, watch_for_new_jobs => \&watch_for_new_jobs, watch_for_done_jobs => \&watch_for_done_jobs, create_packages_list_db => \&run_create_packages_list_db,