From 0bd5eb71a0a23b27a02af591ba46e4cf2c34aa04 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Sep 2006 18:54:08 +0000 Subject: [PATCH] * `nix-install-package --url': install from a URL (NIX-12). * `nix-install-package --help' (NIX-9). * `nix-install-package --non-interactive': don't prompt or pause. * Tests for nix-install-package. * Security fixes: filter the values obtained from the nixpkg. --- scripts/nix-install-package.in | 124 ++++++++++++++++++++++++++++----- scripts/nix-pack-closure.in | 2 +- scripts/nix-unpack-closure.in | 2 +- tests/Makefile.am | 4 +- tests/common.sh.in | 15 ++++ tests/init.sh | 6 +- tests/install-package.sh | 21 ++++++ tests/nix-pull.sh | 10 --- tests/referrers.sh | 2 +- tests/user-envs.sh | 3 +- 10 files changed, 152 insertions(+), 37 deletions(-) create mode 100644 tests/install-package.sh diff --git a/scripts/nix-install-package.in b/scripts/nix-install-package.in index 7959070c0..4f5b0087f 100644 --- a/scripts/nix-install-package.in +++ b/scripts/nix-install-package.in @@ -3,28 +3,107 @@ use strict; use POSIX qw(tmpnam); -my $pkgFile = $ARGV[0]; -die unless defined $pkgFile; + +sub usageError { + print STDERR < if $interactive; + exit 1; +} + + +# Download the package description, if necessary. +my $pkgFile = $source; +if ($fromURL) { + $pkgFile = "$tmpDir/tmp.nixpkg"; + system ("@curl@", "--silent", $source, "-o", $pkgFile) == 0 + or barf "curl failed: $?"; +} + + # Read and parse the package file. -open PKGFILE, "<$pkgFile" or die "cannot open `$pkgFile': $!"; +open PKGFILE, "<$pkgFile" or barf "cannot open `$pkgFile': $!"; my $contents = ; close PKGFILE; -$contents =~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/ or die "invalid package contents"; +my $urlRE = "(?: [a-zA-Z][a-zA-Z0-9\+\-\.]*\:[a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\!\~\*\']+ )"; +my $nameRE = "(?: [A-Za-z0-9\+\-\.\_\?\=]+ )"; # see checkStoreName() +my $systemRE = "(?: [A-Za-z0-9\+\-\_]+ )"; +my $pathRE = "(?: \/ [\/A-Za-z0-9\+\-\.\_\?\=]* )"; + +# Note: $pathRE doesn't check that whether we're looking at a valid +# store path. We'll let nix-env do that. + +$contents =~ + / ^ \s* (\S+) \s+ ($urlRE) \s+ ($nameRE) \s+ ($systemRE) \s+ ($pathRE) \s+ ($pathRE) /x + or barf "invalid package contents"; my $version = $1; my $manifestURL = $2; my $drvName = $3; @@ -32,22 +111,29 @@ my $system = $4; my $drvPath = $5; my $outPath = $6; -die "invalid package version `$version'" unless $version eq "NIXPKG1"; +barf "invalid package version `$version'" unless $version eq "NIXPKG1"; -# Ask confirmation. -print "Do you want to install `$drvName' (Y/N)? "; -my $reply = ; -chomp $reply; -exit if $reply ne "y" && $reply ne "Y"; +if ($interactive) { + # Ask confirmation. + print "Do you want to install `$drvName' (Y/N)? "; + my $reply = ; + chomp $reply; + exit if $reply ne "y" && $reply ne "Y"; +} + print "\nPulling manifests...\n"; -system "@bindir@/nix-pull '$manifestURL'"; -die if $? != 0; +system ("@bindir@/nix-pull", $manifestURL) == 0 + or barf "nix-pull failed: $?"; + print "\nInstalling package...\n"; -system "@bindir@/nix-env -i '$outPath'"; -die if $? != 0; +system ("@bindir@/nix-env", "--install", $outPath, @extraNixEnvArgs) == 0 + or barf "nix-env failed: $?"; -print "\nInstallation succeeded! Press Enter to continue.\n"; -; + +if ($interactive) { + print "\nInstallation succeeded! Press Enter to continue.\n"; + ; +} diff --git a/scripts/nix-pack-closure.in b/scripts/nix-pack-closure.in index 97de927bf..a29f12021 100644 --- a/scripts/nix-pack-closure.in +++ b/scripts/nix-pack-closure.in @@ -17,7 +17,7 @@ $binDir = "@bindir@" unless defined $binDir; my $tmpDir; do { $tmpDir = tmpnam(); } until mkdir $tmpDir, 0777; -END { system "@coreutils@/rm -rf '$tmpDir'"; } +END { my $x = $?; system ("@coreutils@/rm", "-rf", $tmpDir); $? = $x; } mkdir "$tmpDir/contents", 0777 or die; mkdir "$tmpDir/references", 0777 or die; mkdir "$tmpDir/derivers", 0777 or die; diff --git a/scripts/nix-unpack-closure.in b/scripts/nix-unpack-closure.in index 2c9b4873a..01e8ee30d 100644 --- a/scripts/nix-unpack-closure.in +++ b/scripts/nix-unpack-closure.in @@ -15,7 +15,7 @@ $binDir = "@bindir@" unless defined $binDir; my $tmpDir; do { $tmpDir = tmpnam(); } until mkdir $tmpDir, 0777; -END { system "@coreutils@/rm -rf '$tmpDir'"; } +END { my $x = $?; system ("@coreutils@/rm", "-rf", $tmpDir); $? = $x; } # Unpack the NAR archive on standard input. diff --git a/tests/Makefile.am b/tests/Makefile.am index d55d0690d..b19802d87 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,7 +3,7 @@ TESTS_ENVIRONMENT = $(SHELL) -e extra1 = $(shell pwd)/test-tmp/shared simple.sh: simple.nix -dependencies.sh gc.sh nix-push.sh nix-pull.in logging.sh nix-build.sh: dependencies.nix +dependencies.sh gc.sh nix-push.sh nix-pull.in logging.sh nix-build.sh install-package.sh: dependencies.nix locking.sh: locking.nix parallel.sh: parallel.nix build-hook.sh: build-hook.nix @@ -19,7 +19,7 @@ TESTS = init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \ locking.sh parallel.sh build-hook.sh substitutes.sh substitutes2.sh \ fallback.sh nix-push.sh gc.sh gc-concurrent.sh verify.sh nix-pull.sh \ referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \ - gc-runtime.sh + gc-runtime.sh install-package.sh XFAIL_TESTS = diff --git a/tests/common.sh.in b/tests/common.sh.in index 12162649e..ca4c62d91 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -47,3 +47,18 @@ export nixhash=$TOP/src/nix-hash/nix-hash readLink() { ls -l "$1" | sed 's/.*->\ //' } + +clearStore() { + echo "clearing store..." + chmod -R +w "$NIX_STORE_DIR" + rm -rf "$NIX_STORE_DIR" + mkdir "$NIX_STORE_DIR" + rm -rf "$NIX_DB_DIR" + mkdir "$NIX_DB_DIR" + $nixstore --init +} + +clearProfiles() { + profiles="$NIX_STATE_DIR"/profiles + rm -f $profiles/* +} diff --git a/tests/init.sh b/tests/init.sh index 73d15fd3a..160cb6b0a 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -21,9 +21,12 @@ mkdir $NIX_BIN_DIR ln -s $nixstore $NIX_BIN_DIR/ ln -s $nixinstantiate $NIX_BIN_DIR/ ln -s $nixhash $NIX_BIN_DIR/ +ln -s $nixenv $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-prefetch-url $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-collect-garbage $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-build $NIX_BIN_DIR/ +ln -s $TOP/scripts/nix-install-package $NIX_BIN_DIR/ +ln -s $TOP/scripts/nix-pull $NIX_BIN_DIR/ ln -s $bzip2_bin_test/bzip2 $NIX_BIN_DIR/ ln -s $bzip2_bin_test/bunzip2 $NIX_BIN_DIR/ mkdir $NIX_BIN_DIR/nix @@ -52,8 +55,9 @@ for i in \ $NIX_BIN_DIR/nix-prefetch-url \ $NIX_BIN_DIR/nix-collect-garbage \ $NIX_BIN_DIR/nix-build \ + $NIX_BIN_DIR/nix-install-package \ + $NIX_BIN_DIR/nix-pull \ ; do - echo "$REAL_BIN_DIR" sed < $i > $i.tmp \ -e "s^$REAL_BIN_DIR^$NIX_BIN_DIR^" \ -e "s^$REAL_LIBEXEC_DIR^$NIX_LIBEXEC_DIR^" \ diff --git a/tests/install-package.sh b/tests/install-package.sh new file mode 100644 index 000000000..89d1d71f3 --- /dev/null +++ b/tests/install-package.sh @@ -0,0 +1,21 @@ +source common.sh + +# Note: this test expects to be run *after* nix-push.sh. + +drvPath=$($nixinstantiate ./dependencies.nix) +outPath=$($nixstore -q $drvPath) + +clearStore +clearProfiles + +cat > $TEST_ROOT/foo.nixpkg <