lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

Security: Also check paths in the web server

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-13 18:34:33 +01:00
parent cd83b8e3aa
commit eb9d0c8992
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib/Hydra/Controller/Build.pm
View file

@ -10,6 +10,7 @@ use File::stat;
use File::Slurp; use File::Slurp;
use Data::Dump qw(dump); use Data::Dump qw(dump);
use Nix::Store; use Nix::Store;
use Nix::Config;
use List::MoreUtils qw(all); use List::MoreUtils qw(all);
@ -169,6 +170,14 @@ sub defaultUriForProduct {
} }
sub checkPath {
my ($self, $c, $path) = @_;
my $storeDir = $Nix::Config::storeDir . "/";
error($c, "Invalid path in build product.")
if substr($path, 0, length($storeDir)) ne $storeDir || $path =~ /\/\.\./;
}
sub download : Chained('build') PathPart { sub download : Chained('build') PathPart {
my ($self, $c, $productnr, @path) = @_; my ($self, $c, $productnr, @path) = @_;
@ -177,7 +186,7 @@ sub download : Chained('build') PathPart {
my $product = $c->stash->{build}->buildproducts->find({productnr => $productnr}); my $product = $c->stash->{build}->buildproducts->find({productnr => $productnr});
notFound($c, "Build doesn't have a product #$productnr.") if !defined $product; notFound($c, "Build doesn't have a product #$productnr.") if !defined $product;
notFound($c, "Product " . $product->path . " has disappeared.") unless -e $product->path; notFound($c, "Build product " . $product->path . " has disappeared.") unless -e $product->path;
return $c->res->redirect(defaultUriForProduct($self, $c, $product, @path)) return $c->res->redirect(defaultUriForProduct($self, $c, $product, @path))
if scalar @path == 0 && ($product->name || $product->defaultpath); if scalar @path == 0 && ($product->name || $product->defaultpath);
@ -194,6 +203,9 @@ sub download : Chained('build') PathPart {
my $path = $product->path; my $path = $product->path;
$path .= "/" . join("/", @path) if scalar @path > 0; $path .= "/" . join("/", @path) if scalar @path > 0;
# Make sure the file is in the Nix store.
checkPath($self, $c, $path);
# If this is a directory but no "/" is attached, then redirect. # If this is a directory but no "/" is attached, then redirect.
if (-d $path && substr($c->request->uri, -1) ne "/") { if (-d $path && substr($c->request->uri, -1) ne "/") {
return $c->res->redirect($c->request->uri . "/"); return $c->res->redirect($c->request->uri . "/");
@ -236,6 +248,8 @@ sub contents : Chained('build') PathPart Args(1) {
my $path = $product->path; my $path = $product->path;
checkPath($self, $c, $path);
notFound($c, "Product $path has disappeared.") unless -e $path; notFound($c, "Product $path has disappeared.") unless -e $path;
my $res; my $res;