webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Und wieder den Packfire erweitert. Diesesmal:

Browse Source 
* Fortschrittsbalken beim Download
* Einheitliche und strukturierte Fehler- und Logging-Meldungen


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@707 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-07-19 00:48:03 +00:00
parent 3817fbd6da
commit a6d327a74b
2 changed files with 102 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/pakfire/lib/functions.pl
View File

@@ -7,10 +7,17 @@ use File::Basename;
use File::Copy; use File::Copy;
use LWP::UserAgent; use LWP::UserAgent;
use HTTP::Response; use HTTP::Response;
use HTTP::Headers;
use HTTP::Message;
use HTTP::Request;
use Net::Ping; use Net::Ping;
package Pakfire; package Pakfire;
my $final_data;
my $total_size;
my $bfile;
my %pakfiresettings = (); my %pakfiresettings = ();
&General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings); &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
@@ -22,7 +29,7 @@ sub message {
sub logger { sub logger {
my $log = shift; my $log = shift;
system("logger -t pakfire \"$log\""); system("logger -t pakfire \"$log\"") if "$log";
} }
sub usage { sub usage {
@@ -39,10 +46,10 @@ sub pinghost {
$p = Net::Ping->new(); $p = Net::Ping->new();
if ($p->ping($host)) { if ($p->ping($host)) {
logger("$host is alive."); logger("PING INFO: $host is alive");
return 1; return 1;
} else { } else {
logger("$host is dead."); logger("PING INFO: $host is unreachable");
return 0; return 0;
} }
$p->close(); $p->close();
@@ -53,6 +60,7 @@ sub fetchfile {
my $gethost = shift; my $gethost = shift;
my (@server, $host, $proto, $file, $allok, $i); my (@server, $host, $proto, $file, $allok, $i);
logger("DOWNLOAD STARTED: $getfile") unless ($bfile =~ /^counter\?.*/);
use File::Basename; use File::Basename;
$bfile = basename("$getfile"); $bfile = basename("$getfile");
@@ -72,7 +80,10 @@ sub fetchfile {
$proto = "HTTP" unless $proto; $proto = "HTTP" unless $proto;
logger("Trying to get $file from $host ($proto)."); unless ($bfile =~ /^counter\?.*/) {
logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file");
#message("DOWNLOAD INFO: Loading $bfile from ($proto) $host...");
}
my $ua = LWP::UserAgent->new; my $ua = LWP::UserAgent->new;
$ua->agent("Pakfire/$Conf::version"); $ua->agent("Pakfire/$Conf::version");
@@ -82,20 +93,34 @@ sub fetchfile {
&General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings); &General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings);
if ($proxysettings{'UPSTREAM_PROXY'}) { if ($proxysettings{'UPSTREAM_PROXY'}) {
logger("Using upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\""); logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\"") unless ($bfile =~ /^counter\?.*/);
if ($proxysettings{'UPSTREAM_USER'}) { if ($proxysettings{'UPSTREAM_USER'}) {
$ua->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"); $ua->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/");
logger(" Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\""); logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"") unless ($bfile =~ /^counter\?.*/);
} else { } else {
$ua->proxy("http","http://$proxysettings{'UPSTREAM_PROXY'}/"); $ua->proxy("http","http://$proxysettings{'UPSTREAM_PROXY'}/");
} }
} }
my $response = $ua->get("http://$host/$file"); $final_data = undef;
my $url = "http://$host/$file";
my $response;
unless ($bfile =~ /^counter\?.*/) {
my $result = $ua->head($url);
my $remote_headers = $result->headers;
$total_size = $remote_headers->content_length;
logger("DOWNLOAD INFO: $file has size of $total_size bytes");
$response = $ua->get($url, ':content_cb' => \&callback );
message("");
} else {
$response = $ua->get($url);
}
my $code = $response->code(); my $code = $response->code();
my $log = $response->status_line; my $log = $response->status_line;
logger("HTTP-Status-Code: $code - $log"); logger("DOWNLOAD INFO: HTTP-Status-Code: $code - $log");
if ( $code eq "500" ) { if ( $code eq "500" ) {
message("Giving up: There was no chance to get the file \"$getfile\" from any available server.\nThere was an error on the way. Please fix it."); message("Giving up: There was no chance to get the file \"$getfile\" from any available server.\nThere was an error on the way. Please fix it.");
@@ -104,36 +129,36 @@ sub fetchfile {
if ($response->is_success) { if ($response->is_success) {
if (open(FILE, ">$Conf::tmpdir/$bfile")) { if (open(FILE, ">$Conf::tmpdir/$bfile")) {
print FILE $response->content; print FILE $final_data;
close(FILE); close(FILE);
unless ($bfile =~ /^counter\?.*/) { # Don't check out counterfile cause it's empty unless ($bfile =~ /^counter\?.*/) { # Don't check out counterfile cause it's empty
logger("File received. Start checking signature..."); logger("DOWNLOAD INFO: File received. Start checking signature...");
if (system("gpg --verify \"$Conf::tmpdir/$bfile\" &>/dev/null") eq 0) { if (system("gpg --verify \"$Conf::tmpdir/$bfile\" &>/dev/null") eq 0) {
logger("Signature of $bfile is fine."); logger("DOWNLOAD INFO: Signature of $bfile is fine.");
move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile"); move("$Conf::tmpdir/$bfile","$Conf::cachedir/$bfile");
} else { } else {
message("The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting..."); message("DOWNLOAD ERROR: The downloaded file ($file) wasn't verified by IPFire.org. Sorry - Exiting...");
exit 1; exit 1;
} }
} }
logger("Download successfully done from $host (file: $file)."); logger("DOWNLOAD FINISHED: $file") unless ($bfile =~ /^counter\?.*/);
$allok = 1; $allok = 1;
return 0; return 0;
} else { } else {
logger("Could not open $Conf::cachedir/$bfile for writing."); logger("DOWNLOAD ERROR: Could not open $Conf::cachedir/$bfile for writing.");
} }
} else { } else {
logger("Download $file failed from $host ($proto): $log"); logger("DOWNLOAD ERROR: $log");
} }
} }
message("Giving up: There was no chance to get the file \"$getfile\" from any available server.\nMay be you should run \"pakfire update\" to get some new servers."); message("DOWNLOAD ERROR: There was no chance to get the file \"$getfile\" from any available server.\nMay be you should run \"pakfire update\" to get some new servers.");
return 1; return 1;
} }
sub getmirrors { sub getmirrors {
use File::Copy; use File::Copy;
logger("Try to get a mirror list."); logger("MIRROR: Trying to get a mirror list.");
fetchfile("$Conf::version/lists/server-list.db", "$Conf::mainserver"); fetchfile("$Conf::version/lists/server-list.db", "$Conf::mainserver");
move("$Conf::cachedir/server-list.db", "$Conf::dbdir/lists/server-list.db"); move("$Conf::cachedir/server-list.db", "$Conf::dbdir/lists/server-list.db");
@@ -148,7 +173,7 @@ sub selectmirror {
getmirrors(); getmirrors();
} }
if ($count == 5) { if ($count == 5) {
message("Could not find or download a server list."); message("MIRROR ERROR: Could not find or download a server list");
exit 1; exit 1;
} }
my @lines = <FILE>; my @lines = <FILE>;
@@ -163,7 +188,7 @@ sub selectmirror {
$scount++; $scount++;
} }
} }
logger("$scount servers found in list."); logger("MIRROR INFO: $scount servers found in list");
### Choose a random server and test if it is online ### Choose a random server and test if it is online
# If the check fails try a new server. # If the check fails try a new server.
@@ -371,8 +396,6 @@ sub cleanup {
sub getmetafile { sub getmetafile {
my $pak = shift; my $pak = shift;
logger("Going to download meta-$pak.");
unless ( -e "$Conf::dbdir/meta/meta-$pak") { unless ( -e "$Conf::dbdir/meta/meta-$pak") {
fetchfile("meta/meta-$pak", ""); fetchfile("meta/meta-$pak", "");
move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak"); move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak");
@@ -420,9 +443,10 @@ sub decryptpak {
my $file = getpak("$pak", "noforce"); my $file = getpak("$pak", "noforce");
my $return = system("cd $Conf::tmpdir/ && gpg -d < $Conf::cachedir/$file | tar x >/dev/null 2>&1"); logger("DECRYPT STARTED: $pak");
my $return = system("cd $Conf::tmpdir/ && gpg -d < $Conf::cachedir/$file | tar x &>/dev/null");
$return %= 255; $return %= 255;
logger("Decryption process returned the following: $return"); logger("DECRYPT FINISHED: $pak - Status: $return");
if ($return != 0) { exit 1; } if ($return != 0) { exit 1; }
} }
@@ -539,6 +563,7 @@ sub removepak {
open(FILE, "<$Conf::dbdir/rootfiles/$pak"); open(FILE, "<$Conf::dbdir/rootfiles/$pak");
my @file = <FILE>; my @file = <FILE>;
close(FILE); close(FILE);
message("Removing files...");
foreach (@file) { foreach (@file) {
my $line = $_; my $line = $_;
chomp($line); chomp($line);
@@ -546,6 +571,8 @@ sub removepak {
system("cd / && rm -rf $line >> $Conf::logdir/uninstall-$pak.log 2>&1"); system("cd / && rm -rf $line >> $Conf::logdir/uninstall-$pak.log 2>&1");
} }
unlink("$Conf::dbdir/rootfiles/$pak"); unlink("$Conf::dbdir/rootfiles/$pak");
unlink("$Conf::dbdir/installed/meta-$pak");
message("Finished removing files!");
cleanup("tmp"); cleanup("tmp");
message("Uninstall completed. Congratulations!"); message("Uninstall completed. Congratulations!");
} else { } else {
@@ -597,14 +624,38 @@ sub senduuid {
} }
sub checkcryptodb { sub checkcryptodb {
logger("CRYPTO INFO: Checking GnuPG Database");
my $myid = "64D96617"; # Our own gpg-key my $myid = "64D96617"; # Our own gpg-key
my $trustid = "65D0FD58"; # Id of CaCert my $trustid = "65D0FD58"; # Id of CaCert
my $ret = system("gpg --list-keys | grep -q $myid"); my $ret = system("gpg --list-keys | grep -q $myid");
unless ( "$ret" eq "0" ) { unless ( "$ret" eq "0" ) {
message("The GnuPG isn't configured corectly. Trying now to fix this."); message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $myid"); message("CRYPTO WARN: It's normal to see this on first execution.");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $trustid"); system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $myid &>>$Conf::logdir/gnupg-database.log");
system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $trustid &>>$Conf::logdir/gnupg-database.log");
} else {
logger("CRYPTO INFO: Database is okay");
} }
} }
sub callback {
my ($data, $response, $protocol) = @_;
$final_data .= $data;
print progress_bar( length($final_data), $total_size, 25, '=' );
}
sub progress_bar {
my ( $got, $total, $width, $char ) = @_;
my $show_bfile;
$width ||= 25; $char ||= '=';
my $num_width = length $total;
my $len_bfile = length $bfile;
if ("$len_bfile" >= "12") {
$show_bfile = substr($bfile,0,12)."...";
} else {
$show_bfile = $bfile;
}
sprintf "$show_bfile [%-${width}s] Got %${num_width}s bytes of %s (%.2f%%)\r", $char x (($width-1)*$got/$total). '>', $got, $total, 100*$got/+$total;
}
1; 1;

55
src/pakfire/pakfire
View File

@@ -4,7 +4,7 @@
my $interactive = 1; my $interactive = 1;
&Pakfire::logger("### IPFire Pakfire $Conf::version started!"); &Pakfire::logger("PAKFIRE INFO: IPFire Pakfire $Conf::version started!");
&Pakfire::checkcryptodb; &Pakfire::checkcryptodb;
### Check if we are running as root ### Check if we are running as root
@@ -12,27 +12,18 @@
my $user = qx(whoami); my $user = qx(whoami);
chomp($user); chomp($user);
unless ( "$user" eq "root" ) { unless ( "$user" eq "root" ) {
&Pakfire::message("You must run pakfire as user root!"); &Pakfire::message("PAKFIRE ERROR: You must run pakfire as user root!");
exit 1; exit 1;
} }
### Check if there are running some other pakfire processes
#
#my $return = `pidof pakfire`;
#chomp($return);
#if ($return) {
# &Pakfire::message("There are running some other pakfire processes...");
# exit 1;
#}
### Check if we are started by another name ### Check if we are started by another name
# #
if ( $0 =~ /pakfire-update$/ ) { if ( $0 =~ /pakfire-update$/ ) {
&Pakfire::message("Running an update started by fcron."); &Pakfire::message("CRON INFO: Running an update");
$ARGV[0] = "update"; $ARGV[0] = "update";
$interactive = 0; $interactive = 0;
} elsif ( $0 =~ /pakfire-upgrade$/ ) { } elsif ( $0 =~ /pakfire-upgrade$/ ) {
&Pakfire::message("Running an upgrade started by fcron."); &Pakfire::message("CRON INFO: Running an upgrade");
$ARGV[0] = "upgrade"; $ARGV[0] = "upgrade";
$interactive = 0; $interactive = 0;
} }
@@ -71,7 +62,7 @@
unless ("$pak" =~ "^-") { unless ("$pak" =~ "^-") {
$return = &Pakfire::isinstalled($pak); $return = &Pakfire::isinstalled($pak);
if ($return eq 0) { if ($return eq 0) {
&Pakfire::message("Package $pak is already installed."); &Pakfire::message("PAKFIRE INFO: $pak is already installed");
next; next;
} }
$found = 0; $found = 0;
@@ -89,35 +80,37 @@
break; break;
} }
} }
&Pakfire::message(""); if ($found == 0) {
&Pakfire::message("The pak \"$pak\" is not known. Please try running \"pakfire update\".") if ($found == 0); &Pakfire::message("");
&Pakfire::message("PAKFIRE WARN: The pak \"$pak\" is not known. Please try running \"pakfire update\".");
}
} }
} }
unless (@paks) { unless (@paks) {
&Pakfire::message("No packages to install. Exiting..."); &Pakfire::message("PAKFIRE ERROR: No packages to install. Exiting...");
exit 1; exit 1;
} }
&Pakfire::message(""); &Pakfire::message("");
&Pakfire::message(""); &Pakfire::message("");
&Pakfire::message("### Packages to install:"); &Pakfire::message("PAKFIRE INFO: Packages to install:");
foreach $pak (sort @paks) { foreach $pak (sort @paks) {
my $size = &Pakfire::getsize("$pak"); my $size = &Pakfire::getsize("$pak");
$size = &Pakfire::beautifysize($size); $size = &Pakfire::beautifysize($size);
&Pakfire::message("# $pak \t\t - $size"); &Pakfire::message("PAKFIRE INFO: $pak \t\t - $size");
} }
if (@deps) { if (@deps) {
my %sort = map{ $_, 1 } @deps; my %sort = map{ $_, 1 } @deps;
@deps = sort keys %sort; @deps = sort keys %sort;
&Pakfire::message(""); &Pakfire::message("");
&Pakfire::message("### Packages to install for dependencies:"); &Pakfire::message("PAKFIRE INFO: Packages to install for dependencies:");
} }
foreach $dep (sort @deps) { foreach $dep (sort @deps) {
my $size = &Pakfire::getsize("$dep"); my $size = &Pakfire::getsize("$dep");
$size = &Pakfire::beautifysize($size); $size = &Pakfire::beautifysize($size);
&Pakfire::message("# $dep \t\t - $size"); &Pakfire::message("PAKFIRE INFO: $dep \t\t - $size");
} }
my $totalsize; my $totalsize;
@@ -126,18 +119,20 @@
} }
$totalsize = &Pakfire::beautifysize($totalsize); $totalsize = &Pakfire::beautifysize($totalsize);
&Pakfire::message(""); &Pakfire::message("");
&Pakfire::message("### Total size: \t ~ $totalsize"); &Pakfire::message("PAKFIRE INFO: Total size: \t ~ $totalsize");
&Pakfire::message(""); &Pakfire::message("");
if ($interactive) { if ($interactive) {
&Pakfire::message("Is this okay? [y/N]"); &Pakfire::message("PAKFIRE INFO: Is this okay? [y/N]");
my $ret = <STDIN>; my $ret = <STDIN>;
chomp($ret); chomp($ret);
&Pakfire::logger("Answer: $ret"); &Pakfire::logger("PAKFIRE INFO: Answer: $ret");
if ( $ret ne "y" ) { if ( $ret ne "y" ) {
&Pakfire::message("Installation aborted."); &Pakfire::message("PAKFIRE ERROR: Installation aborted.");
exit 1; exit 1;
} }
} else {
&Pakfire::logger("PAKFIRE INFO: Interaction skipped.");
} }
my %sort = map{ $_, 1 } @all; my %sort = map{ $_, 1 } @all;
@@ -145,7 +140,6 @@
### Download first ### Download first
foreach $pak (sort @all) { foreach $pak (sort @all) {
&Pakfire::message("# --> Downloading: $pak");
&Pakfire::getpak("$pak", ""); &Pakfire::getpak("$pak", "");
} }
@@ -163,7 +157,7 @@
unless ("$pak" =~ "^-") { unless ("$pak" =~ "^-") {
$return = &Pakfire::isinstalled($pak); $return = &Pakfire::isinstalled($pak);
if ($return ne 0) { if ($return ne 0) {
&Pakfire::message("Package $pak is not installed."); &Pakfire::message("PAKFIRE WARN: $pak is not installed");
next; next;
} }
@@ -173,7 +167,7 @@
} }
unless (@paks) { unless (@paks) {
&Pakfire::message("No packages to remove. Exiting..."); &Pakfire::message("PAKFIRE ERROR: No packages to remove. Exiting...");
exit 1; exit 1;
} }
@@ -237,7 +231,6 @@
### Download first ### Download first
foreach (sort @upgradepaks) { foreach (sort @upgradepaks) {
&Pakfire::message("# --> Downloading: $_");
&Pakfire::getpak("$_", ""); &Pakfire::getpak("$_", "");
} }
@@ -253,9 +246,9 @@
next if ("$_" eq "resolvedeps"); next if ("$_" eq "resolvedeps");
&Pakfire::resolvedeps("$_"); &Pakfire::resolvedeps("$_");
} }
} else { } else {
&Pakfire::usage; &Pakfire::usage;
} }
&Pakfire::message("");
exit 0; exit 0;