From aa115e22df1c80e8878237a9e704d7d70783a243 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jul 2012 11:01:17 -0400 Subject: [PATCH] download-from-binary-cache: Print correct URL --- scripts/download-from-binary-cache.pl.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in index 6f4b55766..5fb0419f1 100644 --- a/scripts/download-from-binary-cache.pl.in +++ b/scripts/download-from-binary-cache.pl.in @@ -213,6 +213,8 @@ sub processNARInfo { print STDERR "bad NAR info file ‘$request->{url}’\n"; return undef; } + + # FIXME: validate $url etc. for security. # Cache the result. $insertNAR->execute( @@ -417,8 +419,9 @@ sub downloadBinary { print STDERR "unknown compression method ‘$info->{compression}’\n"; next; } - print STDERR "\n*** Downloading ‘$info->{url}’ into ‘$storePath’...\n"; - if (system("$Nix::Config::curl --fail --location $binaryCacheUrl/$info->{url} | $decompressor | $Nix::Config::binDir/nix-store --restore $storePath") != 0) { + my $url = "$binaryCacheUrl/$info->{url}"; # FIXME: handle non-relative URLs + print STDERR "\n*** Downloading ‘$url’ into ‘$storePath’...\n"; + if (system("$Nix::Config::curl --fail --location '$url' | $decompressor | $Nix::Config::binDir/nix-store --restore $storePath") != 0) { die "download of `$info->{url}' failed" . ($! ? ": $!" : "") . "\n" unless $? == 0; next; }