X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=file-fetcher.pl;h=09cdfaa42eb1413b5104d322223d012ac9f46aee;hb=7263fd0318938f3a94f2a0b653e6d283db7a8785;hp=92f4b8f5f941a3caaf46f95b8e62d0e4e4ba86c2;hpb=164cf5c1fb6980dc138e3da7ba5697f03e2a55e1;p=projects%2Fdistfiles.git

diff --git a/file-fetcher.pl b/file-fetcher.pl
index 92f4b8f..09cdfaa 100755
--- a/file-fetcher.pl
+++ b/file-fetcher.pl
@@ -1,13 +1,17 @@
 #!/usr/bin/perl -w
 use IPC::Run qw(run);
 
+use Sys::Syslog;
+
+openlog("distfiles-ff", "pid", "user"); 
+
 $commits_list = "pld-cvs-commit\@lists.pld-linux.org";
 
 $spool_dir = "./spool";
 $copy_dir = "src"; # relative to ftp root
 $no_url_dir = "./upload";
 $df_server = "distfiles.pld-linux.org";
-$df_scp = "plddist\@ep09.pld-linux.org:ftp";
+$df_scp = "plddist\@distfiles.pld-linux.org:ftp";
 $user_agent = "PLD/distfiles";
 
 @md5 = ();
@@ -22,10 +26,18 @@ $req_login = "nobody";
 $spec = "";
 @files = ();
 
+sub fatal($)
+{
+  my $msg = shift;
+
+  syslog("err","FATAL: $msg");
+  die "$msg";
+}
+
 # try lookup some file in spool, exit if it cannot be done
 sub find_file_in_spool()
 {
-  opendir(DIR, $spool_dir) || die "can't opendir $spool_dir: $!";
+  opendir(DIR, $spool_dir) || fatal("can't opendir $spool_dir: $!");
   while (1) {
     my $f = readdir(DIR);
     defined $f or last;
@@ -43,14 +55,15 @@ sub find_file_in_spool()
 # and @url (map from md5 to urls)
 sub read_spool_file()
 {
+  syslog("info","reading spool file $file");
   open(F, "< $file") || exit 0;
   $requester = <F>;
   chomp $requester;
   $requester =~ /^[a-zA-Z_0-9@.-]+$/
-        or die "$file: evil requester: $requester";
+        or fatal("$file: evil requester: $requester");
   $req_login = "";
   $requester =~ /^([^@]+)\@/ and $req_login = $1;
-  $req_login =~ /^[a-z0-9A-Z_.]+$/ or die "$file: evil requester $requester";
+  $req_login =~ /^[a-z0-9A-Z_.]+$/ or fatal("$file: evil requester $requester");
   $spec = <F>;
   chomp $spec;
   $spec =~ s/\.spec$//;
@@ -64,7 +77,7 @@ sub read_spool_file()
       $problems .= $_;
       next;
     }
-    if (/^([a-f0-9]{32})\s+((ftp|http|https|no-url|no-url-copy):\/\/([a-z0-9A-Z;:\=\?&\@\+\~\.,\-\/_]|\%[0-9])+(#\/[a-zA-Z0-9\._-]+)?)\s*$/) {
+    if (/^([a-f0-9]{32})\s+((ftp|http|https|no-url|no-url-copy):\/\/([a-z0-9A-Z;:\=\?&\@\+\~\.,\-\/\#_]|\%[0-9])+(#\/[a-zA-Z0-9\._-]+)?)\s*$/) {
       if (/\/$/) {
         $problems .= "$file: cannot fetch dir";
       } else {
@@ -98,7 +111,7 @@ sub got_on_distfiles($$)
 {
   my ($md5, $url) = @_;
   my $p = by_md5($md5, $url);
-  my $l = `lftp -c 'debug 0; open $df_server; quote size $p'`;
+  my $l = `lftp -c 'debug 0; open $df_server; quote size \"$p\"'`;
   return $l =~ /^213 /;
 }
 
@@ -106,7 +119,7 @@ sub copy_to_df($$)
 {
   my ($from, $to) = @_;
   my $cmd = "scp -pr -B -q $from $df_scp/$to";
-  open(E, "$cmd 2>&1 |") or die;
+  open(E, "$cmd 2>&1 |") or fatal("$cmd failed");
   my $oops = "";
   while (<E>) {
     $oops .= $_;
@@ -115,6 +128,7 @@ sub copy_to_df($$)
     unless (close (E));
   $problems .= "scp problems: $cmd:\n$oops\n"
     if ($oops ne "");
+  syslog("err","copy_to_df oops for '$cmd': $oops") if ($oops ne "");
   return ($oops ne "");
 }
 
@@ -131,6 +145,9 @@ sub move_file($$$)
     }
     $local_copy = "$tmp_dir/$md5/$bn";
   }
+  # no-url local copy may have wrong permissions (it's created by ftp upload)
+  # always fix them
+  chmod(0644, $local_copy);
 
   if (open(D, "> $tmp_dir/$md5/$bn.desc")) {
     print D "URL: $url\n";
@@ -202,18 +219,18 @@ sub handle_no_url($$)
     return;
   }
   my $basename = $1;
-  my $file = "$no_url_dir/$req_login/$basename";
+  my $file = "$no_url_dir/$basename";
 
   if (-f $file) {
     my $computed_md5 = md5($file);
     if ($computed_md5 ne $md5) {
-      $problems .= "FATAL: $file md5 mismatch, needed $md5, got $computed_md5\n";
+      $problems .= "FATAL: $basename md5 mismatch, needed $md5, got $computed_md5\n";
     } else {
       move_file($md5, $url, $file);
       make_src_symlink($md5, $url);
     }
   } else {
-    $problems .= "FATAL: $file was not uploaded\n";
+    $problems .= "FATAL: $basename was not uploaded\n";
   }
 }
 
@@ -224,8 +241,12 @@ sub fetch_file($$)
   my $all_out = "";
   my $bn = basename($url);
   my $local = "$tmp_dir/$md5/$bn";
-  my $cmd = "wget -nv --no-check-certificate --user-agent=$user_agent -O $local \"$url\"";
-  my $cmd2 = "wget -nv --no-check-certificate --user-agent=$user_agent --passive-ftp -O $local \"$url\"";
+  my @cmd = ("wget", "-nv", "--no-check-certificate", "--user-agent=$user_agent", "-O", $local, $url);
+  my $cmd_joined = join(' ', @cmd);
+  my @cmd2 = ("wget",  "-nv", "--no-check-certificate", "--user-agent=$user_agent", "--passive-ftp", "-O", $local, $url);
+  my $cmd2_joined = join(' ', @cmd2);
+
+  syslog("info","fetch_file($md5,$url)");
 
   push @files, $bn;
 
@@ -251,7 +272,12 @@ sub fetch_file($$)
     return;
   }
 
-  open(W, "$cmd 2>&1 |");
+  my $pid = open(W, "-|");
+  fatal("Cannot fork $!") unless defined $pid;
+  unless ( $pid ) {
+    open STDERR, ">&", \*STDOUT  or fatal("$0: open: $!");
+    exec { $cmd[0] } @cmd or fatal("$0: exec: $!");
+  }
   while (<W>) {
     $all_out .= $_;
     /URL:.*\s+\-\>\s+.*/ and next;
@@ -259,17 +285,23 @@ sub fetch_file($$)
   }
   close(W);
   if ($out ne "") {
-    $problems .= "$cmd:\n$out\n\n";
+    syslog("err","$cmd_joined: $out");
+    $problems .= "$cmd_joined:\n$out\n\n";
   }
   if ( $? ) {
     $problems .= sprintf "%s:\nexited with code %d (0x%02x)\n\n",
-      $cmd,
+      $cmd_joined,
       $? >> 8,
       $? & 0xff;
   }
   if (-f $local && -s $local == 0 && $url =~ /^ftp:/) {
     $out = "";
-    open(W, "$cmd2 2>&1 |");
+    my $pid = open(W, "-|");
+    fatal("Cannot fork $!") unless defined $pid;
+    unless ( $pid ) {
+      open STDERR, ">&", \*STDOUT  or fatal("$0: open: $!");
+      exec { $cmd2[0] } @cmd2 or fatal("$0: exec: $!");
+    }
     while (<W>) {
       $all_out .= "\n\t\t$_";
       /URL:.*\s+\-\>\s+.*/ and next;
@@ -277,11 +309,11 @@ sub fetch_file($$)
     }
     close(W);
     if ($out ne "") {
-      $problems .= "$cmd2:\n$out\n\n";
+      $problems .= "$cmd2_joined:\n$out\n\n";
     }
     if ( $? ) {
       $problems .= sprintf "%s:\nexited with code %d (0x%02x)\n\n",
-        $cmd2,
+        $cmd2_joined,
         $? >> 8,
         $? & 0xff;
     }
@@ -294,7 +326,7 @@ sub fetch_file($$)
       my $testcmd = "file \"$local\" |";
       my $testres = "";
       if ($url =~ /^(http|https):/ && $local =~ /\.(tar\.(bz2|gz)|tgz|zip|jar|xpi)$/) {
-        open(T, $testcmd) or die;
+        open(T, $testcmd) or fatal("$testcmd failed");
         $testres = <T>;
         close(T);
       }
@@ -306,11 +338,11 @@ sub fetch_file($$)
       }
     }
   } elsif (-f $local && -s $local > 0) {
-    $problems .= "FATAL: $url ($md5) was not fetched correctly ($cmd: $all_out): file is not readable\n";
+    $problems .= "FATAL: $url ($md5) was not fetched correctly ($cmd_joined: $all_out): file is not readable\n";
   } elsif (-f $local && not -s $local) {
-    $problems .= "FATAL: $url ($md5) was not fetched correctly ($cmd: $all_out): file fetched but has 0 length\n";
+    $problems .= "FATAL: $url ($md5) was not fetched correctly ($cmd_joined: $all_out): file fetched but has 0 length\n";
   } else {
-    $problems .= "FATAL: $url ($md5) was not fetched correctly ($cmd: $all_out)\n";
+    $problems .= "FATAL: $url ($md5) was not fetched correctly ($cmd_joined: $all_out)\n";
   }
   # save space
   unlink($local);
@@ -326,6 +358,7 @@ sub fetch_files()
 
 sub send_email()
 {
+  syslog("info","sending email to $requester");
   open(EMAIL, "| /usr/sbin/sendmail -t");
   #open(EMAIL, "| cat");
   my $marker = "";
@@ -355,7 +388,7 @@ $normal_out
 -- 
 Virtually Yours: distfiles.
 ";
-  close(EMAIL) or die;
+  close(EMAIL) or fatal("close() failed");
 }
 
 sub make_tmp_dir()
@@ -364,7 +397,7 @@ sub make_tmp_dir()
   chomp $id;
   $id = rand if (!defined $id or $id eq "");
   $tmp_dir = "./tmp/$id";
-  mkdir($tmp_dir) or die;
+  mkdir($tmp_dir) or fatal("mkdir($tmp_dir) failed");
 }
 
 sub clean_tmp_dir()