![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index e69d6e620c5469888e7b95801477d075b63764a2..893ccfb3656f2e10c4df5f1adea880c4bf6a6cad 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
# REVISION: ---
#===============================================================================
+
use strict;
use warnings;
use Getopt::Long;
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);
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
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");
sub _start {
my ($kernel) = $_[KERNEL];
&trigger_db_loop($kernel);
+ $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");
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 } ) {
# 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/<header>job_/<header>gosa_/;
}
-sub refresh_ldap_handle {
- my ($session_id) = @_ ;
- if (not defined $session_id) { $session_id = 0; }
-
- my $mesg;
+sub get_ldap_handle {
+ my ($session_id) = @_;
+ my $heap;
+ my $ldap_handle;
- daemon_log("$session_id DEBUG: Trying to create a connection to URI '$ldap_uri'", 7);
- # 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( "$session_id ERROR: 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( "$session_id ERROR: ch $$: LDAP bind: error (". $mesg->code . ') - ' . $mesg->error . "\n", 1);
- return 0;
- }
- daemon_log("$session_id DEBUG: create a new connection to URI '$ldap_uri'", 7);
- return 1;
+ } else {
+ my $session_reference = $global_kernel->ID_id_to_session($session_id);
+ if( defined $session_reference ) {
+ $heap = $session_reference->get_heap();
+ }
+
+ 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;
}
wake => '',
memcheck => 'memcheck',
sysinfo => 'sysinfo',
- install => 'install',
+ install => 'install',
);
# Return if this is unknown
my $state= $mapActions{ $st };
- &refresh_ldap_handle();
+ my $ldap_handle = &get_ldap_handle($session_id);
if( defined($ldap_handle) ) {
# Build search filter for hosts
}
} else {
- daemon_log("$session_id DEBUG FAIstate at host found with filter statement '$search' already at state '$st'", 7);
+ daemon_log("$session_id DEBUG FAIstate at host '$_' already at state '$st'", 7);
}
}
}
} else {
daemon_log("$session_id ERROR: no LDAP handle defined for update FAIstate", 1);
}
+
}
# 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
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(
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;
}
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(
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) {
}
daemon_log("INFO: create_fai_release_db: finished",5);
}
-
+ $ldap_handle->disconnect;
return $result;
}
sub run_create_fai_release_db {
}
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;
}
sub create_sources_list {
+ my ($ldap_handle) = @_;
my $result="/tmp/gosa_si_tmp_sources_list";
# Remove old file
}
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);
$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);