X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fupdxlrator%2Fdownload;h=6744d9c6e956eecef14ec04ed0528b07f0b42284;hb=f17e1488a1e0001a8ff8586d08718808e56f8d18;hp=87bae3fc44204ed2156a0df25c164fca0d780767;hpb=381f2e7111c90e7c95c9de152c2b4c83e20deeaa;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/config/updxlrator/download b/config/updxlrator/download
index 87bae3fc44..6744d9c6e9 100644
--- a/config/updxlrator/download
+++ b/config/updxlrator/download
@@ -2,67 +2,206 @@
 #
 # This code is distributed under the terms of the GPL
 #
-# (c) 2006 marco.s
+# (c) 2006-2008 marco.s - http://update-accelerator.advproxy.net
 #
-# $Id: download,v 1.0 2006/08/30 00:00:00 marco.s Exp $
+# Portions (c) 2008 by dotzball - http://www.blockouttraffic.de
+#
+# $Id: download,v 2.1 2008/07/23 00:00:00 marco.s Exp $
 #
 
 use strict;
+use HTTP::Date;
+
+require '/var/ipfire/updatexlrator/updxlrator-lib.pl';
 
 my $logfile="/var/log/updatexlrator/download.log";
-my $debug = 1;
-my $updcachedir="/var/updatecache";
-my $updfile='';
-my @metadata=();
+my $logging=0;
+my $repository='/var/updatecache';
+my $login='';
+my $dlrate='';
+my $uuid='';
+my %xlratorsettings=();
+my %proxysettings=();
+my @http_header=();
+my $remote_size=0;
+my $remote_mtime=0;
+my $updatefile='';
+my $unique=0;
+my $mirror=1;
+
+my %dlinfo=();
+my $wgetContinueFlag="";
+
+my $vendorid  = $ARGV[0]; if (!defined($vendorid)  || $vendorid  eq '') { exit; }
+my $sourceurl = $ARGV[1]; if (!defined($sourceurl) || $sourceurl eq '') { exit; }
+my $cfmirror  = $ARGV[2]; if (!defined($cfmirror)  || $cfmirror eq '') { exit; }
+my $restartdl = defined($ARGV[3]) ? $ARGV[3] : 0;
+
+umask(0002);
+
+$sourceurl =~ s@\%2b@+@ig;
+$sourceurl =~ s@\%2f@/@ig;
+$sourceurl =~ s@\%7e@~@ig;
+$updatefile = substr($sourceurl,rindex($sourceurl,"/")+1);
+$updatefile =~ s@\%20@ @ig;
+$vendorid =~ tr/A-Z/a-z/;
+
+unless (-d "$repository/download/$vendorid")
+{
+	system("mkdir -p $repository/download/$vendorid");
+	system("chmod 775 $repository/download/$vendorid");
+}
+
+if($restartdl == 0)
+{
+	# this is a new download
+	exit if (-e "$repository/download/$vendorid/$updatefile");
+
+	# dotzball: Why is this necessary?
+	system("touch $repository/download/$vendorid/$updatefile");
+	$wgetContinueFlag = "-nc";
+
+}
+else
+{
+	# this is a restart of a previous (unfinished) download
+	# -> continue download
+	$wgetContinueFlag = "-c";
+	&writelog("Continue download: $updatefile");
+}
+
+
+if ($cfmirror)
+{
+	$uuid = `echo $updatefile | md5sum`;
+} else {
+	$uuid = `echo $sourceurl  | md5sum`;
+}
+
+$uuid =~ s/[^0-9a-f]//g;
+$uuid =~ s/([a-f\d]{8})([a-f\d]{4})([a-f\d]{4})([a-f\d]{4})([a-f\d]{12})/$1-$2-$3-$4-$5/;
+
+if (-e "$UPDXLT::swroot/updatexlrator/settings")
+{
+	&UPDXLT::readhash("$UPDXLT::swroot/updatexlrator/settings", \%xlratorsettings);
+	if ($xlratorsettings{'MAX_DOWNLOAD_RATE'} ne '') { $dlrate = "--limit-rate=" . int($xlratorsettings{'MAX_DOWNLOAD_RATE'} / 8) . "k" };
+}
 
-my $sfOk="1";
+if (-e "$UPDXLT::swroot/proxy/settings") { &UPDXLT::readhash("$UPDXLT::swroot/proxy/settings", \%proxysettings); }
 
-my $dsturl=@ARGV[0]; if ($dsturl eq '') { exit; }
+if (-e "$UPDXLT::swroot/proxy/advanced/settings")
+{
+	%proxysettings=();
+	&UPDXLT::readhash("$UPDXLT::swroot/proxy/advanced/settings", \%proxysettings);
+}
 
-$dsturl =~ s@\%2f@/@ig;
-$updfile = substr($dsturl,rindex($dsturl,"/")+1);
+if (($proxysettings{'UPSTREAM_PROXY'}) && ($proxysettings{'UPSTREAM_USER'}))
+{
+	$login = "--proxy-user=\"$proxysettings{'UPSTREAM_USER'}\"";
+	if ($proxysettings{'UPSTREAM_PASSWORD'})
+	{
+		$login .= " --proxy-password=\"$proxysettings{'UPSTREAM_PASSWORD'}\"";
+	}
+}
 
-# ---------------------------------------------------------------
-#  Retrieve file
-# ---------------------------------------------------------------
+if ($xlratorsettings{'MAX_DOWNLOAD_RATE'} eq '')
+{
+	&writelog("Retrieving file for local cache: $updatefile");
+} else {
+	&writelog("Retrieving file for local cache at max. " . $xlratorsettings{'MAX_DOWNLOAD_RATE'} . " kBit/s: $updatefile");
+}
+
+$ENV{'http_proxy'} = $proxysettings{'UPSTREAM_PROXY'};
+@http_header = `$UPDXLT::wget $login --user-agent="$UPDXLT::useragent" --spider -S $sourceurl 2>&1`;
+$ENV{'http_proxy'} = '';
 
-if ($debug)
+foreach (@http_header)
 {
-	&writelog("Retrieving file for local cache: $updfile");
-	`/usr/bin/wget -nc -nd -nv -P $updcachedir/download $dsturl >>$logfile 2>&1`;
-} else
+	chomp;
+	if (/^\s*Content-Length:\s/) { s/[^0-9]//g; $remote_size=$_; &writelog("Remote file size: $_ bytes"); }
+	if (/^\s*Last-Modified:\s/)
+	{
+		s/^\s*Last-Modified:\s//;
+		$remote_mtime = HTTP::Date::str2time($_);
+		&writelog("Remote file date: $_");
+	}
+}
+
+$ENV{'http_proxy'} = $proxysettings{'UPSTREAM_PROXY'};
+
+unless($restartdl)
 {
-	`/usr/bin/wget -nc -nd -nv -P $updcachedir/download $dsturl 2>&1`;
+	# this is a new download
+	# -> download from scratch
+	unlink "$repository/download/$vendorid/$updatefile";
+	unlink "$repository/download/$vendorid/$updatefile.info";
 }
 
-if ($debug) { &writelog("Moving file into the cache directory -> \"$updcachedir/$updfile\""); }
-system("mv $updcachedir/download/$updfile $updcachedir");
+# save file informations while downloading
+$dlinfo{'VENDORID'} = $vendorid;
+$dlinfo{'SRCURL'} = $sourceurl;
+$dlinfo{'FILENAME'} = $updatefile;
+$dlinfo{'CFMIRROR'} = $cfmirror;
+$dlinfo{'REMOTETIME'} = $remote_mtime;
+$dlinfo{'REMOTESIZE'} = $remote_size;
+$dlinfo{'STATUS'} = "1";
+&UPDXLT::writehash("$repository/download/$vendorid/$updatefile.info", \%dlinfo);
+
+my $cmd = "$UPDXLT::wget $login $dlrate --user-agent=\"$UPDXLT::useragent\" -q -P $repository/download/$vendorid $wgetContinueFlag $sourceurl";
+
+$_ = system("$cmd");
+$ENV{'http_proxy'} = '';
+
+if ($_ == 0)
+{
+	&writelog("Download finished with result code: OK");
+
+	unless (-d "$repository/$vendorid")
+	{
+		system("mkdir -p $repository/$vendorid");
+		system("chmod 775 $repository/$vendorid");
+	}
 
-# ---------------------------------------------------------------
-#  Write metadata
-# ---------------------------------------------------------------
+	unless (-d "$repository/$vendorid/$uuid")
+	{
+		system("mkdir -p $repository/$vendorid/$uuid");
+		system("chmod 775 $repository/$vendorid/$uuid");
+	}
 
-if ($debug) { &writelog("Writing metadata \"$updcachedir/metadata/$updfile\""); }
+	&writelog("Moving file to the cache directory: $vendorid/$uuid");
+	$updatefile =~ s@ @\\ @ig;
+	system("mv $repository/download/$vendorid/$updatefile $repository/$vendorid/$uuid");
+	# Workaround for IPCop's mv bug:
+	utime time,$remote_mtime,"$repository/$vendorid/$uuid/$updatefile";
+	$updatefile =~ s@\\ @ @ig;
+
+	&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/source.url",$sourceurl);
+	&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/status",$UPDXLT::sfOk);
+	&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/checkup.log",time);
+	&UPDXLT::setcachestatus("$repository/$vendorid/$uuid/access.log",time);
+
+	system("/usr/local/bin/updxsetperms");
+	system("chmod 775 $repository/$vendorid/$uuid/*");
+
+	unlink ("$repository/download/$vendorid/$updatefile.info");
+
+} else {
+	&writelog("Download finished with result code: ERROR");
+	if (-e "$repository/download/$vendorid/$updatefile") { unlink ("$repository/download/$vendorid/$updatefile"); }
+}
 
-open(FILE,"$updcachedir/metadata/$updfile");
-@metadata = <FILE>;
-close(FILE);
-chomp @metadata;
-$metadata[2]="$sfOk";
-$metadata[3]=time;
-open(FILE,">$updcachedir/metadata/$updfile");
-foreach (@metadata) { print FILE "$_\n"; }
-print FILE time."\n";
-close(FILE);
 
-# ===============================================================
+# -------------------------------------------------------------------
 
 sub writelog
 {
-	open (LOGFILE,">>$logfile");
-	my @now = localtime(time);
-	printf LOGFILE "%02d:%02d:%02d %s\n",$now[2],$now[1],$now[0],$_[0];
-	close LOGFILE;
+	if ($logging)
+	{
+        	open (LOGFILE,">>$logfile");
+	        my @now = localtime(time);
+        	printf LOGFILE "%04d-%02d-%02d %02d:%02d:%02d [%d] %s\n",$now[5]+1900,$now[4]+1,$now[3],$now[2],$now[1],$now[0],$$,$_[0];
+	        close LOGFILE;
+	}
 }
 
-# ===============================================================
+# -------------------------------------------------------------------