X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=f1e33172f6f830ac16bc535e8481f4d85a9030d2;hb=48802a3e0c3e3dc4a26332bf8edd39bab8612eea;hp=374343c92e69fe4cc0caf33267601a7ce0b0c32c;hpb=ee490dc032f75f56baf3816aa8fa6a47b0354285;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 374343c92..f1e33172f 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -1,9 +1,9 @@ #!/usr/bin/perl #=============================================================================== # -# FILE: gosa-sd +# FILE: gosa-si-server # -# USAGE: ./gosa-sd +# USAGE: ./gosa-si-server # # DESCRIPTION: # @@ -39,7 +39,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 +51,7 @@ use POE qw(Component::Server::TCP Wheel::Run Filter::Reference); use Net::LDAP; use Net::LDAP::Util qw(:escape); + # revision number of server and program name my $server_headURL; my $server_revision; @@ -63,7 +64,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"; @@ -94,7 +94,8 @@ our (%cfg_defaults, $log_file, $pid_file, $wake_on_lan_passwd, $job_synchronization, $modified_jobs_loop_delay, $arp_enabled, $arp_interface, $opsi_enabled, $opsi_server, $opsi_admin, $opsi_password, - $new_systems_ou, + $new_systems_ou, + $arch, ); # additional variable which should be globaly accessable @@ -104,7 +105,7 @@ our $gosa_address; our $no_arp; our $forground; our $cfg_file; -our ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn, $ldap_version); +our ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn, $ldap_version, $ldap_retry_sec); our ($mysql_username, $mysql_password, $mysql_database, $mysql_host); our $known_modules; our $known_functions; @@ -151,6 +152,7 @@ my @job_queue_col_names = ("id INTEGER PRIMARY KEY", "plainname VARCHAR(255) DEFAULT 'none'", "siserver VARCHAR(255) DEFAULT 'none'", "modified INTEGER DEFAULT '0'", + "periodic VARCHAR(6) DEFAULT 'none'", ); # holds all other gosa-si-server @@ -194,7 +196,6 @@ our $packages_list_tn = "packages_list"; my $packages_list_file_name; our @packages_list_col_names = ("distribution VARCHAR(255)", "package VARCHAR(255)", "version VARCHAR(255)", "section VARCHAR(255)", "description TEXT", "template LONGBLOB", "timestamp VARCHAR(14)"); my $outdir = "/tmp/packages_list_db"; -my $arch = "i386"; # holds all messages which should be delivered to a user our $messaging_db; @@ -225,6 +226,10 @@ our $logged_in_user_date_of_expiry = 600; # List of month names, used in function daemon_log my @monthnames = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); +# List of accepted periodical xml tags related to cpan modul DateTime +our $check_periodic = {"months"=>'', "weeks"=>'', "days"=>'', "hours"=>'', "minutes"=>''}; + + %cfg_defaults = ( "general" => { "log-file" => [\$log_file, "/var/run/".$prg.".log"], @@ -244,42 +249,44 @@ my @monthnames = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "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'], + "debian-arch" => [\$arch, 'i386'], "ldap-uri" => [\$ldap_uri, ""], "ldap-base" => [\$ldap_base, ""], "ldap-admin-dn" => [\$ldap_admin_dn, ""], "ldap-admin-password" => [\$ldap_admin_password, ""], "ldap-version" => [\$ldap_version, 3], + "ldap-retry-sec" => [\$ldap_retry_sec, 10], "gosa-unit-tag" => [\$gosa_unit_tag, ""], "max-clients" => [\$max_clients, 10], "wol-password" => [\$wake_on_lan_passwd, ""], - "mysql-username" => [\$mysql_username, "gosa_si"], - "mysql-password" => [\$mysql_password, ""], - "mysql-database" => [\$mysql_database, "gosa_si"], - "mysql-host" => [\$mysql_host, "127.0.0.1"], + "mysql-username" => [\$mysql_username, "gosa_si"], + "mysql-password" => [\$mysql_password, ""], + "mysql-database" => [\$mysql_database, "gosa_si"], + "mysql-host" => [\$mysql_host, "127.0.0.1"], }, "GOsaPackages" => { "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'], "job-queue-loop-delay" => [\$job_queue_loop_delay, 3], "messaging-db-loop-delay" => [\$messaging_db_loop_delay, 3], "key" => [\$GosaPackages_key, "none"], - "new-systems-ou" => [\$new_systems_ou, 'ou=workstations,ou=systems'], + "new-systems-ou" => [\$new_systems_ou, 'ou=workstations,ou=systems'], }, "ClientPackages" => { "key" => [\$ClientPackages_key, "none"], "user-date-of-expiry" => [\$logged_in_user_date_of_expiry, 600], }, "ServerPackages"=> { - "enabled" => [\$serverPackages_enabled, "true"], + "enabled" => [\$serverPackages_enabled, "true"], "address" => [\$foreign_server_string, ""], - "dns-lookup" => [\$dns_lookup, "true"], - "domain" => [\$server_domain, ""], - "key" => [\$ServerPackages_key, "none"], + "dns-lookup" => [\$dns_lookup, "true"], + "domain" => [\$server_domain, ""], + "key" => [\$ServerPackages_key, "none"], "key-lifetime" => [\$foreign_servers_register_delay, 120], "job-synchronization-enabled" => [\$job_synchronization, "true"], "synchronization-loop" => [\$modified_jobs_loop_delay, 5], }, "ArpHandler" => { - "enabled" => [\$arp_enabled, "true"], + "enabled" => [\$arp_enabled, "false"], "interface" => [\$arp_interface, "all"], }, "Opsi" => { @@ -312,17 +319,18 @@ 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 128 : main process - + 256 : creation of packages_list_db + 512 : ARP debug information EOF - print "\n" ; + exit(0); } @@ -380,10 +388,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; @@ -431,11 +442,7 @@ sub check_cmdline_param () { } # Exit if an error occour - if( $err_counter > 0 ) - { - &usage( "", 1 ); - exit( -1 ); - } + if( $err_counter > 0 ) { &usage( "", 1 ); } } @@ -996,7 +1003,7 @@ sub send_msg_to_target { if($new_status eq "down"){ daemon_log("$session_id WARNING: set '$address' from status '$act_status' to '$new_status'", 3); } else { - daemon_log("$session_id INFO: set '$address' from status '$act_status' to '$new_status'", 5); + daemon_log("$session_id DEBUG: set '$address' from status '$act_status' to '$new_status'", 138); } } } @@ -1017,7 +1024,7 @@ sub send_msg_to_target { if($new_status eq "down"){ daemon_log("$session_id WARNING: set '$address' from status '$act_status' to '$new_status'", 3); } else { - daemon_log("$session_id INFO: set '$address' from status '$act_status' to '$new_status'", 5); + daemon_log("$session_id DEBUG: set '$address' from status '$act_status' to '$new_status'", 138); } } } @@ -1054,8 +1061,17 @@ sub update_jobdb_status_for_send_msgs { ||($job_header eq "trigger_action_reinstall") ||($job_header eq "trigger_activate_new") ) { - &reactivate_job_with_delay($session_id, $job_target, $job_header, 30 ); - + if ($job_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) { + &reactivate_job_with_delay($session_id, $job_target, $job_header, 30 ); + } else { + # If we don't have the mac adress at this time, we use the plainname + my $plainname_result = $job_db->select_dbentry("SELECT plainname from jobs where id=$jobdb_id"); + my $plainname = $job_target; + if ((keys(%$plainname_result) > 0) ) { + $plainname = $plainname_result->{1}->{$job_target}; + } + &reactivate_job_with_delay($session_id, $plainname, $job_header, 30 ); + } # For all other messages } else { my $sql_statement = "UPDATE $job_queue_tn ". @@ -1097,7 +1113,7 @@ sub reactivate_job_with_delay { if (not defined $delay) { $delay = 30 } ; my $delay_timestamp = &calc_timestamp(&get_time(), "plus", $delay); - my $sql = "UPDATE $job_queue_tn Set timestamp='$delay_timestamp', status='waiting' WHERE (macaddress LIKE 'target' AND headertag='$header')"; + my $sql = "UPDATE $job_queue_tn Set timestamp='$delay_timestamp', status='waiting' WHERE (macaddress LIKE '$target' OR plainname LIKE '$target') AND headertag='$header'"; my $res = $job_db->update_dbentry($sql); daemon_log("$session_id INFO: '$header'-job will be reactivated at '$delay_timestamp' ". "cause client '$target' is currently not available", 5); @@ -1127,7 +1143,7 @@ sub msg_to_decrypt { ($msg, $msg_hash, $module) = &input_from_unknown_host($next_msg, $session_id); # msg is from a gosa-si-server - if(( !$msg ) || ( !$msg_hash ) || ( !$module )){ + if(((!$msg) || (!$msg_hash) || (!$module)) && ($serverPackages_enabled eq "true")){ if (not defined $msg_source) { # Only needed, to be compatible with older gosa-si-server versions @@ -1140,7 +1156,15 @@ sub msg_to_decrypt { } # msg is from a gosa-si-client if(( !$msg ) || ( !$msg_hash ) || ( !$module )){ - ($msg, $msg_hash, $module) = &input_from_known_client($next_msg, $msg_source, $session_id); + if (not defined $msg_source) + { + # Only needed, to be compatible with older gosa-si-server versions + ($msg, $msg_hash, $module) = &input_from_known_client($next_msg, $heap->{'remote_ip'}, $session_id); + } + else + { + ($msg, $msg_hash, $module) = &input_from_known_client($next_msg, $msg_source, $session_id); + } } # an error occurred if(( !$msg ) || ( !$msg_hash ) || ( !$module )){ @@ -1148,7 +1172,7 @@ sub msg_to_decrypt { # or a server. In case of a client, send a ping. If the client could not understand a msg from its # server the client cause a re-registering process. In case of a server, decrease update_time in kown_server_db # and trigger a re-registering process for servers - if (defined $msg_source && $msg_source =~ /:$server_port$/) + if (defined $msg_source && $msg_source =~ /:$server_port$/ && $serverPackages_enabled eq "true") { daemon_log("$session_id WARNING: Cannot understand incoming msg from server '$msg_source'. Cause re-registration process for servers.", 3); my $update_statement = "UPDATE $known_server_tn SET update_time='19700101000000' WHERE hostname='$msg_source'"; @@ -1156,19 +1180,20 @@ sub msg_to_decrypt { my $upadte_res = $known_server_db->exec_statement($update_statement); $kernel->yield("register_at_foreign_servers"); } - elsif (defined $msg_source) + elsif ((defined $msg_source) && (not $msg_source =~ /:$server_port$/)) { daemon_log("$session_id WARNING: Cannot understand incoming msg from client '$msg_source'. Send ping-msg to cause a re-registering of the client if necessary", 3); #my $remote_ip = $heap->{'remote_ip'}; #my $remote_port = $heap->{'remote_port'}; my $ping_msg = "
gosa_ping
$server_address$msg_source"; my ($test_error, $test_error_string) = &send_msg_to_target($ping_msg, "$msg_source", "dummy-key", "gosa_ping", $session_id); - daemon_log("$session_id WARNING: sending msg to cause re-registering: $ping_msg", 3); + daemon_log("$session_id WARNING: Sending msg to cause re-registering: $ping_msg", 3); } else { my $foreign_host = defined $msg_source ? $msg_source : $heap->{'remote_ip'}; - daemon_log("$session_id ERROR: incoming message from host '$foreign_host' cannot be understood. Processing aborted: $tmp_next_msg", 1); + daemon_log("$session_id ERROR: Incoming message from host '$foreign_host' cannot be understood. Processing aborted!", 1); + daemon_log("$session_id DEBUG: Aborted message: $tmp_next_msg", 11); } $error++ @@ -1290,7 +1315,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 @@ -1331,7 +1356,7 @@ sub msg_to_decrypt { $msg =~ s/
gosa_/
/; my $error= &send_msg_to_target($msg, $hostname, $hostkey, $header, $session_id); if ($error) { - &daemon_log("$session_id ERROR: Some problems occurred while trying to send msg to client '$hostkey': $msg", 1); + &daemon_log("$session_id ERROR: Some problems occurred while trying to send msg to client '$hostname': $msg", 1); } } else @@ -1410,6 +1435,7 @@ sub msg_to_decrypt { sessionid=>$session_id, } ); $done = 1; + $kernel->yield('watch_for_next_tasks'); } @@ -1522,8 +1548,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); } @@ -1581,6 +1606,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; @@ -1597,7 +1625,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 and foreign_clients", 5); + daemon_log("$session_id DEBUG: target is mac address '$answer_target', looking for host in known_clients and foreign_clients", 138); # Looking for macaddress in known_clients my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$answer_target'"; @@ -1684,7 +1712,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); @@ -1704,16 +1731,35 @@ sub session_start { sub watch_for_done_jobs { - #CHECK: $heap for what? - my ($kernel,$heap) = @_[KERNEL, HEAP]; + my $kernel = $_[KERNEL]; my $sql_statement = "SELECT * FROM ".$job_queue_tn." WHERE ((status='done') AND (modified='0'))"; my $res = $job_db->select_dbentry( $sql_statement ); - while( my ($id, $hit) = each %{$res} ) { - my $jobdb_id = $hit->{id}; - my $sql_statement = "DELETE FROM $job_queue_tn WHERE id=$jobdb_id"; - my $res = $job_db->del_dbentry($sql_statement); + while( my ($number, $hit) = each %{$res} ) + { + # Non periodical jobs can be deleted. + if ($hit->{periodic} eq "none") + { + my $jobdb_id = $hit->{id}; + my $sql_statement = "DELETE FROM $job_queue_tn WHERE id=$jobdb_id"; + my $res = $job_db->del_dbentry($sql_statement); + } + + # Periodical jobs should not be deleted but reactivated with new timestamp instead. + else + { + my ($p_time, $periodic) = split("_", $hit->{periodic}); + my $reactivated_ts = $hit->{timestamp}; + my $act_ts = int(&get_time()); + while ($act_ts > int($reactivated_ts)) # Redo calculation to avoid multiple jobs in the past + { + $reactivated_ts = &calc_timestamp($reactivated_ts, "plus", $p_time, $periodic); + } + my $sql = "UPDATE $job_queue_tn SET status='waiting', timestamp='$reactivated_ts' WHERE id='".$hit->{id}."'"; + my $res = $job_db->exec_statement($sql); + &daemon_log("J INFO: Update periodical job '".$hit->{headertag}."' for client '".$hit->{targettag}."'. New execution time '$reactivated_ts'.", 5); + } } $kernel->delay_set('watch_for_done_jobs',$job_queue_loop_delay); @@ -1722,7 +1768,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'))"; @@ -1746,10 +1791,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; @@ -1940,7 +1989,7 @@ sub watch_for_new_jobs { my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J"); # update status in job queue to ... - # ... 'processing', for jobs: 'reinstall', 'update' + # ... 'processing', for jobs: 'reinstall', 'update', activate_new if (($header =~ /gosa_trigger_action_reinstall/) || ($header =~ /gosa_trigger_activate_new/) || ($header =~ /gosa_trigger_action_update/)) { @@ -1951,7 +2000,7 @@ sub watch_for_new_jobs { # ... 'done', for all other jobs, they are no longer needed in the jobqueue else { my $sql_statement = "UPDATE $job_queue_tn SET status='done' WHERE id=$jobdb_id"; - my $dbres = $job_db->update_dbentry($sql_statement); + my $dbres = $job_db->exec_statement($sql_statement); } @@ -2237,8 +2286,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); } @@ -2259,8 +2306,8 @@ sub get_ldap_handle { get_handle: my $ldap_handle = Net::LDAP->new( $ldap_uri ); if (not ref $ldap_handle) { - daemon_log("$session_id ERROR: Connection to LDAP URI '$ldap_uri' failed! Retrying!", 1); - usleep(100000); + daemon_log("$session_id ERROR: Connection to LDAP URI '$ldap_uri' failed! Retrying in $ldap_retry_sec seconds.", 1); + sleep($ldap_retry_sec); goto get_handle; } else { daemon_log("$session_id DEBUG: Connection to LDAP URI '$ldap_uri' established.", 42); @@ -3104,7 +3151,7 @@ sub parse_package_info { $repo_dirs{ "${repo_path}/pool" } = 1; foreach $package ("Packages.gz"){ - daemon_log("$session_id DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7); + daemon_log("$session_id DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 266); get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section", $session_id ); parse_package( "$outdir/$dist/$section", $dist, $path, $session_id ); } @@ -3122,9 +3169,9 @@ 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'"); - daemon_log("$session_id DEBUG: run command: gunzip -cd '$dest' > '$dest.in'", 7); + daemon_log("$session_id DEBUG: run command: gunzip -cd '$dest' > '$dest.in'", 266); unlink($dest); - daemon_log("$session_id DEBUG: delete file '$dest'", 7); + daemon_log("$session_id DEBUG: delete file '$dest'", 266); } else { daemon_log("$session_id ERROR: create_packages_list_db: get_packages: fetching '$url' into '$dest' failed!", 1); } @@ -3231,7 +3278,7 @@ sub cleanup_and_extract { if( -f "$dir/DEBIAN/templates" ) { - daemon_log("0 DEBUG: Found debconf templates in '$package' - $newver", 7); + daemon_log("0 DEBUG: Found debconf templates in '$package' - $newver", 266); my $tmpl= ""; { local $/=undef; @@ -3419,7 +3466,7 @@ GetOptions("h|help" => \&usage, "v|verbose+" => \$verbose, "no-arp+" => \$no_arp, "d=s" => \$debug_parts, - ) or (&usage("", 1)&&(exit(-1))); + ) or &usage("", 1); # read and set config parameters &check_cmdline_param ; @@ -3485,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); @@ -3516,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); @@ -3578,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); @@ -3628,9 +3684,14 @@ POE::Component::Server::TCP->new( ClientInput => sub { my ($kernel, $input, $heap, $session) = @_[KERNEL, ARG0, HEAP, SESSION]; my $session_id = $session->ID; - if ($input =~ /;([\d\.]+:[\d]+)$/) + if ($input =~ /;([\d\.]+):([\d]+)$/) { - &daemon_log("$session_id DEBUG: incoming message from '$1'", 11); + # Messages from other servers should be blocked if config option is set + if (($2 eq $server_port) && ($serverPackages_enabled eq "false")) + { + return; + } + &daemon_log("$session_id DEBUG: incoming message from '$1:$2'", 11); } else { @@ -3642,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, @@ -3663,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,