![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index aac8b3c994bbdd8c3162011c7b84b33a5cf5957d..667a8f8fc1510f4f28ca7fdfafcbdddd7c1cf243 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
use Cwd;
use File::Spec;
use File::Basename;
+use File::Path;
use GOSA::DBsqlite;
use GOSA::GosaSupportDaemon;
use POE qw(Component::Server::TCP);
my ($pid_file, $procid, $pid, $log_file);
my ($arp_activ, $arp_fifo);
my ($xml);
-my ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
-
+my $sources_list;
+my $max_clients;
# variables declared in config file are always set to 'our'
our (%cfg_defaults, $log_file, $pid_file,
$server_ip, $server_port, $SIPackages_key,
our $verbose;
our $forground;
our $cfg_file;
+our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password );
+
# specifies the verbosity of the daemon_log
$verbose = 0 ;
our $fai_server_db;
our $fai_server_tn = "fai_server";
my $fai_server_file_name;
-my @fai_server_col_names = ('timestamp', 'server', 'release', 'tag');
+our @fai_server_col_names = ('timestamp', 'server', 'release', 'tag');
+
+# holds all packages available from different repositories
+our $packages_list_db;
+our $packages_list_tn = "packages_list";
+my $packages_list_file_name;
+our @packages_list_col_names = ('distribution', 'package', 'version', 'section', 'description', 'template', 'timestamp');
+my $outdir = "/tmp/packages_list_db";
+my $arch = "i386";
%cfg_defaults = (
"general" => {
"activ" => [\$bus_activ, "true"],
},
"server" => {
-# "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'],
"fai-server" => [\$fai_server_file_name, '/var/lib/gosa-si/fai.db'],
+ "packages-list" => [\$packages_list_file_name, '/var/lib/gosa-si/packages.db'],
+ "source-list" => [\$sources_list, '/etc/apt/sources.list'],
"ldap-uri" => [\$ldap_uri, ""],
"ldap-base" => [\$ldap_base, ""],
"ldap-admin-dn" => [\$ldap_admin_dn, ""],
"ldap-admin-password" => [\$ldap_admin_password, ""],
"gosa-unit-tag" => [\$gosa_unit_tag, ""],
+ "max-clients" => [\$max_clients, 10],
},
"GOsaPackages" => {
"ip" => [\$gosa_ip, "0.0.0.0"],
}
};
if($@) {
- &main::daemon_log("WARNING: do not understand the message", 5);
- &main::daemon_log("$@", 8);
+ &main::daemon_log("WARNING: do not understand the message: $@", 5);
$msg = undef;
$msg_hash = undef;
}
sub _start {
my ($kernel) = $_[KERNEL];
&trigger_db_loop($kernel);
+ #$kernel->yield('create_fai_server_db', $fai_server_tn );
+ #$kernel->yield('create_packages_list_db', $sources_list );
}
}
-sub get_ldap_handle {
+sub refresh_ldap_handle {
my $mesg;
# Get an ldap handle, if we don't have one
if( defined $ldap_admin_password ) {
$mesg = $ldap_handle->bind( $ldap_admin_dn, password => $ldap_admin_password );
} else {
- $mesg = $ldap_handle->bind( $ldap_admin_dn );#
+ $mesg = $ldap_handle->bind( $ldap_admin_dn );
}
- }
- else {
+ } else {
$mesg = $ldap_handle->bind();
}
if( 0 != $mesg->code ) {
undef( $ldap_handle ) if( 81 == $mesg->code );
- daemon_log( "ch $$: LDAP bind: error ("
- . $mesg->code . ') - ' . $mesg->error . "\n" );
+ daemon_log( "ch $$: LDAP bind: error (". $mesg->code . ') - ' . $mesg->error . "\n", 1);
return 0;
}
- #HIER IST EIN FEHLER.....
+
return 1;
}
sub create_fai_server_db {
+ my ($table_name) = $_[ARG0];
#####################################################################
#
#
# ###################################################################
-
-
$fai_server_db->add_dbentry( {
- table => $fai_server_tn,
+ table => $table_name,
primkey => [],
- server => "dummyserver",
- release => "kleinkind",
- tag => "imwachstum",
+ server => "dummyserver", # neuer fai-server
+ release => "kleinkind", # neuer release
+ tag => "imwachstum", # neues tag
} );
return;
}
+sub create_packages_list_db {
+ my ($sources_file) = $_[ARG0] ;
+ my $line;
+
+ open(CONFIG, "<$sources_file") or do {
+ daemon_log( "ERROR: Failed to open '$sources_file', creating packages.db stopped", 1);
+ return;
+ };
+
+ # Read lines
+ while ($line = <CONFIG>){
+ # Unify
+ chop($line);
+ $line =~ s/^\s+//;
+ $line =~ s/^\s+/ /;
+
+ # Strip comments
+ $line =~ s/#.*$//g;
+
+ # Skip empty lines
+ if ($line =~ /^\s*$/){
+ next;
+ }
+
+ # Interpret deb line
+ if ($line =~ /^deb [^\s]+\s[^\s]+\s[^\s]+/){
+ my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/);
+ my $section;
+ foreach $section (split(' ', $sections)){
+ &parse_package_info( $baseurl, $dist, $section );
+ }
+ }
+ }
+
+ close (CONFIG);
+
+
+ return;
+}
+sub parse_package_info {
+ my ($baseurl, $dist, $section)= @_;
+ my ($package);
+
+ my ($path) = ($baseurl =~ m%://[^/]*(.*)$%);
+
+ foreach $package ("Packages.gz"){
+ print "getting $baseurl , $dist , $section... \n";
+ get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section" );
+ print "done\n";
+ print "parsing packages... \n";
+ parse_package( "$outdir/$dist/$section", $dist, $path );
+ print "done\n";
+ last;
+ }
+}
+sub get_package {
+ my ($url, $dest)= @_;
+
+ my $tpath = dirname($dest);
+ -d "$tpath" || mkpath "$tpath";
+
+ # This is ugly, but I've no time to take a look at "how it works in perl"
+ if( system("wget '$url' -O '$dest' 2>/dev/null") ) {
+ system("gzip -cd '$dest' > '$dest.in'");
+ system("rm -f '$dest'");
+ }
+
+ return 0;
+}
+sub parse_package {
+ my ($path, $dist, $srv_path )= @_;
+ my ($package, $version, $section, $description);
+ my @sql_list;
+
+ open(PACKAGES, "<$path.in") or return;
+
+ # Read lines
+ while (my $line = <PACKAGES>){
+ # Unify
+ chop($line);
+
+ # Use empty lines as a trigger
+ if ($line =~ /^\s*$/){
+ my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', 'xxx', 'none', '0')";
+ push(@sql_list, $sql);
+ $package = "none";
+ $version = "none";
+ $section = "none";
+ $description = "none";
+ next;
+ }
+
+ # Trigger for package name
+ if ($line =~ /^Package:\s/){
+ ($package)= ($line =~ /^Package: (.*)$/);
+ next;
+ }
+
+ # Trigger for version
+ if ($line =~ /^Version:\s/){
+ ($version)= ($line =~ /^Version: (.*)$/);
+ next;
+ }
+
+ # Trigger for description
+ if ($line =~ /^Description:\s/){
+ ($description)= ($line =~ /^Description: (.*)$/);
+ next;
+ }
+
+ # Trigger for section
+ if ($line =~ /^Section:\s/){
+ ($section)= ($line =~ /^Section: (.*)$/);
+ next;
+ }
+
+ }
+
+ close( PACKAGES );
+ unlink( "$path.in" );
+
+ $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 next_task {
+ my ($heap) = $_[HEAP];
+
+ if( keys(%{$heap->{task}}) < $max_clients ) {
+
+ }
+
+ #$heap->{task}->{$task->ID} = $task;
+}
+
+sub task_result {
+
+}
+
#==== MAIN = main ==============================================================
# parse commandline options
Getopt::Long::Configure( "bundling" );
$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
$fai_server_db = GOSA::DBsqlite->new($fai_server_file_name);
$fai_server_db->create_table($fai_server_tn, \@fai_server_col_names);
-&create_fai_server_db;
+
+# connect to packages_list_db
+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);
# create xml object used for en/decrypting
$xml = new XML::Simple();
@@ -1269,7 +1434,11 @@ daemon_log("start socket for incoming xml messages at port '$server_port' ", 1);
POE::Session->create(
inline_states => {
_start => \&_start,
+ next_task => \&next_task,
+ task_result => \&task_result,
watch_for_new_jobs => \&watch_for_new_jobs,
+ create_packages_list_db => \&create_packages_list_db,
+ create_fai_server_db => \&create_fai_server_db,
}
);