![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index c445ad4c7d672928b9c0be34c5234dab2536f479..9860dcfc4b7275d1d344e5b5d724b420bc9d7647 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
use Getopt::Long;
use Config::IniFiles;
use POSIX;
+use utf8;
use Fcntl;
use IO::Socket::INET;
my (%cfg_defaults, $foreground, $verbose, $ping_timeout);
my ($bus_activ, $bus, $msg_to_bus, $bus_cipher);
my ($server, $server_mac_address);
-my ($gosa_server, $job_queue_timeout, $job_queue_table_name, $job_queue_file_name,$job_queue_loop_delay);
-my ($known_modules, $known_clients_file_name, $known_server_file_name);
+my ($gosa_server, $job_queue_timeout, $job_queue_loop_delay);
+my ($known_modules);
my ($pid_file, $procid, $pid, $log_file);
my ($arp_activ, $arp_fifo);
my ($xml);
$no_arp = 0;
+our $prg= basename($0);
+
# holds all gosa jobs
+my $job_queue_file_name;
our $job_db;
-our $job_queue_table_name = 'jobs';
+our $job_queue_tn = 'jobs';
# holds all other gosa-sd as well as the gosa-sd-bus
+my $known_server_file_name;
our $known_server_db;
+our $known_server_tn = "known_server";
# holds all registrated clients
+my $known_clients_file_name;
our $known_clients_db;
-our $prg= basename($0);
+our $known_clients_tn = "known_clients";
+
+# holds all logged in user at each client
+my $login_users_file_name;
+our $login_users_db;
+our $login_users_tn = "login_users";
%cfg_defaults = (
"general" => {
"activ" => [\$bus_activ, "true"],
},
"server" => {
-# "ip" => [\$server_ip, "0.0.0.0"],
+# "ip" => [\$server_ip, "0.0.0.0"],
"port" => [\$server_port, "20081"],
"known-clients" => [\$known_clients_file_name, '/var/lib/gosa-si/clients.db' ],
"known-servers" => [\$known_server_file_name, '/var/lib/gosa-si/servers.db'],
+ "login-users" => [\$login_users_file_name, '/var/lib/gosa-si/users.db'],
"gosa-unit-tag" => [\$gosa_unit_tag, ""],
},
"GOsaPackages" => {
}
close( LOG_HANDLE );
}
-#log into syslog
-# my ($msg, $level, $facility) = @_;
-# if(not defined $msg) {return}
-# if(not defined $level) {$level = "info"}
-# if(not defined $facility) {$facility = "LOG_DAEMON"}
-# openlog($0, "pid,cons,", $facility);
-# syslog($level, $msg);
-# closelog;
-# return;
}
if( $info ) {
my ($input_address, $input_key, $input, $input_active, $input_type) = @{$info};
$known_modules->{$mod_name} = $info;
- daemon_log("module $mod_name loaded", 1);
+ daemon_log("INFO: module $mod_name loaded", 5);
}
}
}
next;
}
my $host_key = $hit->{hostkey};
- daemon_log("SIPackages: known_server host_name: $host_name", 7);
- daemon_log("SIPackages: known_server host_key: $host_key", 7);
+ daemon_log("DEBUG: input_from_known_server: host_name: $host_name", 7);
+ daemon_log("DEBUG: input_from_known_server: host_key: $host_key", 7);
# check if module can open msg envelope with module key
my ($tmp_msg, $tmp_msg_hash) = &check_key_and_xml_validity($input, $host_key);
if( (!$tmp_msg) || (!$tmp_msg_hash) ) {
- daemon_log("SIPackages: deciphering raise error", 7);
+ daemon_log("DEBUG: input_from_known_server: deciphering raise error", 7);
daemon_log("$@", 8);
next;
}
}
if( (!$msg) || (!$msg_hash) || (!$module) ) {
- daemon_log("Incoming message is not from a known server", 3);
+ daemon_log("INFO: Incoming message is not from a known server", 5);
}
return ($msg, $msg_hash, $module);
while( my ($hit_num, $hit) = each %{ $query_res } ) {
my $host_name = $hit->{hostname};
if( not $host_name =~ /^$remote_ip:\d*$/) {
- next;
+ next;
}
my $host_key = $hit->{hostkey};
- &daemon_log("SIPackages: known_client host_name: $host_name", 7);
- &daemon_log("SIPackages: known_client host_key: $host_key", 7);
+ &daemon_log("DEBUG: input_from_known_client: host_name: $host_name", 7);
+ &daemon_log("DEBUG: input_from_known_client: host_key: $host_key", 7);
# check if module can open msg envelope with module key
($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key);
if( (!$msg) || (!$msg_hash) ) {
- &daemon_log("SIPackages: deciphering raise error", 7);
+ &daemon_log("DEGUG: input_from_known_client: deciphering raise error", 7);
&daemon_log("$@", 8);
next;
}
}
if( (!$msg) || (!$msg_hash) || (!$module) ) {
- &daemon_log("Incoming message is not from a known client", 3);
+ &daemon_log("INFO: Incoming message is not from a known client", 5);
}
return ($msg, $msg_hash, $module);
daemon_log("ERROR: no key specified in config file for $mod", 1);
next;
}
- daemon_log("$mod: $module_key", 5);
+ daemon_log("DEBUG: $mod: $module_key", 7);
# check if module can open msg envelope with module key
($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key);
}
if( (!$msg) || (!$msg_hash) || (!$module)) {
- daemon_log("Incoming message is not from an unknown host", 5);
+ daemon_log("INFO: Incoming message is not from an unknown host", 5);
}
return ($msg, $msg_hash, $module);
sub encrypt_msg {
my ($msg, $key) = @_;
my $my_cipher = &create_ciphering($key);
+ my $len;
{
- use bytes;
- $msg = "\0"x(16-length($msg)%16).$msg;
+ use bytes;
+ $len= 16-length($msg)%16;
}
+ $msg = "\0"x($len).$msg;
$msg = $my_cipher->encrypt($msg);
chomp($msg = &encode_base64($msg));
# there are no newlines allowed inside msg
if(not defined $socket) {
return;
}
- &daemon_log("open_socket: $PeerAddr", 7);
+# &daemon_log("DEBUG: open_socket: $PeerAddr", 7);
return $socket;
}
# opensocket
my $socket = &open_socket($address);
if( !$socket ) {
- daemon_log("cannot send ".$header."msg to $address , host not reachable", 1);
+ daemon_log("ERROR: cannot send ".$header."msg to $address , host not reachable", 1);
$error++;
}
# send xml msg
print $socket $crypted_msg."\n";
- daemon_log("send ".$header."msg to $address", 1);
+ daemon_log("INFO: send ".$header."msg to $address", 5);
daemon_log("message:\n$msg", 8);
}
}
}
}
-
- return;
+ return $error;
}
my ($answer_header, @answer_target_l, $answer_source);
my $client_answer;
- daemon_log("Incoming msg from '".$heap->{'remote_ip'}."'", 7);
- daemon_log("message:\n$input", 8);
+ daemon_log("INFO: Incoming msg from '".$heap->{'remote_ip'}."'", 5);
+ daemon_log("DEBUG: Incoming message:\n$input", 8);
####################
# check incoming msg
######################
# process incoming msg
if( $error == 0) {
- daemon_log("Processing module ".$module, 5);
+ daemon_log("DEBUG: Processing module ".$module, 7);
$answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $session_id);
if ( 0 > @{$answer_l} ) {
my $answer_str = join("\n", @{$answer_l});
- daemon_log("$module: Got answer from module: \n".$answer_str,8);
+ daemon_log("DEGUB: $module: Got answer from module: \n".$answer_str,8);
}
}
if( !$answer_l ) { $error++ };
# check gosa job queue for jobs with executable timestamp
my $timestamp = &get_time();
- my $sql_statement = "SELECT * FROM ".$job_queue_table_name.
+ my $sql_statement = "SELECT * FROM ".$job_queue_tn.
" WHERE status='waiting' AND timestamp<'$timestamp'";
my $res = $job_db->select_dbentry( $sql_statement );
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_table_name ".
+ 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);
# add sqlite_id
$job_msg =~ s/<\/xml>$/<jobdb_id>$jobdb_id<\/jobdb_id><\/xml>/;
-
-print STDERR "=======================================================\n$job_msg\n";
-
- &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header);
-
-# my $error = 1;
-# if ($error == 0) {
-# my $sql_statement = "UPDATE $job_queue_table_name ".
-# "SET status='done', targettag='$target' ".
-# "WHERE id='$jobdb_id'";
-# my $res = $job_db->update_dbentry($sql_statement);
-# } else {
-# my $sql_statement = "UPDATE $job_queue_table_name ".
-# "SET status='error' ".
-# "WHERE id='$jobdb_id'";
-# my $res = $job_db->update_dbentry($sql_statement);
-# }
- }
+ my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header);
+ }
$kernel->delay_set('watch_for_new_jobs',3);
}
#unlink('/tmp/gosa_si_lock*');
# connect to gosa-si job queue
-my @job_col_names = ("id INTEGER", "timestamp", "status", "result", "headertag", "targettag", "xmlmessage", "macaddress");
+my @job_col_names = ("id INTEGER", "timestamp", "status", "result", "progress INTEGER", "headertag", "targettag", "xmlmessage", "macaddress");
$job_db = GOSA::DBsqlite->new($job_queue_file_name);
$job_db->create_table('jobs', \@job_col_names);
$known_server_db = GOSA::DBsqlite->new($known_server_file_name);
$known_server_db->create_table('known_server', \@server_col_names);
+# connect to login_usr_db
+my @login_users_col_names = ('client', 'user', 'timestamp');
+$login_users_db = GOSA::DBsqlite->new($login_users_file_name);
+$login_users_db->create_table("login_users", \@login_users_col_names);
+
# create xml object used for en/decrypting
$xml = new XML::Simple();