maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do some validation of URLs

Browse source
This commit is contained in:
Eelco Dolstra 2012-07-30 17:09:36 -04:00
parent f3eb29c653
commit 9cd63d2244
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/download-from-binary-cache.pl.in
View file

@ -5,6 +5,7 @@ use File::Basename;
use IO::Select;
use Nix::Config;
use Nix::Store;
use Nix::Utils;
use WWW::Curl::Easy;
use WWW::Curl::Multi;
use strict;
@ -249,8 +250,6 @@ sub processNARInfo {
return undef;
}
# FIXME: validate $url etc. for security.
# Cache the result.
$insertNAR->execute(
$cache->{id}, basename($storePath), $url, $compression, $fileHash, $fileSize,
@ -455,6 +454,7 @@ sub downloadBinary {
}
my $url = "$cache->{url}/$info->{url}"; # FIXME: handle non-relative URLs
print STDERR "\n*** Downloading ‘$url’ into ‘$storePath’...\n";
Nix::Utils::checkURL $url;
if (system("$Nix::Config::curl --fail --location --insecure '$url' | $decompressor | $Nix::Config::binDir/nix-store --restore $storePath") != 0) {
die "download of `$info->{url}' failed" . ($! ? ": $!" : "") . "\n" unless $? == 0;
next;