grahamc/hydra2 - Change LBNVQXUBEZ45SOTGVXK5UEZXIAIZTJLWZNUYFI4JZ6J65N3KPDVQC

* Build the /build stuff in a separate controller.

Created by Eelco Dolstra on February 25, 2009

LBNVQXUBEZ45SOTGVXK5UEZXIAIZTJLWZNUYFI4JZ6J65N3KPDVQC

Dependencies

In channels

main

Change contents

File addition: Build.pm (----------)

[3.54]

package Hydra::Controller::Build;
use strict;
use warnings;
use parent 'Catalyst::Controller';
use Hydra::Helper::Nix;
use Hydra::Helper::CatalystUtils;
# Security checking of filenames.
my $pathCompRE = "(?:[A-Za-z0-9-\+][A-Za-z0-9-\+\._]*)";
my $relPathRE = "(?:$pathCompRE(?:\/$pathCompRE)*)";
sub build : Chained('/') PathPart CaptureArgs(1) {
    my ($self, $c, $id) = @_;
    
    $c->stash->{id} = $id;
    
    $c->stash->{build} = getBuild($c, $id);
    
    if (!defined $c->stash->{build}) {
        error($c, "Build with ID $id doesn't exist.");
        $c->response->status(404);
        return;
    }
    $c->stash->{curProject} = $c->stash->{build}->project;
}
sub view_build : Chained('build') PathPart('') Args(0) {
    my ($self, $c) = @_;
    my $build = $c->stash->{build};
    
    $c->stash->{template} = 'build.tt';
    $c->stash->{curTime} = time;
    $c->stash->{available} = isValidPath $build->outpath;
    if (!$build->finished && $build->schedulingInfo->busy) {
        my $logfile = $build->schedulingInfo->logfile;
        $c->stash->{logtext} = `cat $logfile`;
    }
}
sub view_nixlog : Chained('build') PathPart('nixlog') Args(1) {
    my ($self, $c, $stepnr) = @_;
    my $step = $c->stash->{build}->buildsteps->find({stepnr => $stepnr});
    return error($c, "Build doesn't have a build step $stepnr.") if !defined $step;
    $c->stash->{template} = 'log.tt';
    $c->stash->{step} = $step;
    # !!! should be done in the view (as a TT plugin).
    $c->stash->{logtext} = loadLog($c, $step->logfile);
}
sub view_log : Chained('build') PathPart('log') Args(0) {
    my ($self, $c) = @_;
    return error($c, "Build didn't produce a log.") if !defined $c->stash->{build}->resultInfo->logfile;
    $c->stash->{template} = 'log.tt';
    # !!! should be done in the view (as a TT plugin).
    $c->stash->{logtext} = loadLog($c, $c->stash->{build}->resultInfo->logfile);
}
sub loadLog {
    my ($c, $path) = @_;
    die unless defined $path;
    # !!! quick hack
    my $pipeline = ($path =~ /.bz2$/ ? "cat $path | bzip2 -d" : "cat $path")
        . " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -"
        . " | xsltproc " . $c->path_to("xsl/log2html.xsl") . " - | tail -n +2";
    return `$pipeline`;
}
sub download : Chained('build') PathPart('download') {
    my ($self, $c, $productnr, $filename, @path) = @_;
    my $product = $c->stash->{build}->buildproducts->find({productnr => $productnr});
    return error($c, "Build doesn't have a product $productnr.") if !defined $product;
    return error($c, "Product " . $product->path . " has disappeared.") unless -e $product->path;
    # Security paranoia.
    foreach my $elem (@path) {
        return error($c, "Invalid filename $elem.") if $elem !~ /^$pathCompRE$/;
    }
    
    my $path = $product->path;
    $path .= "/" . join("/", @path) if scalar @path > 0;
    # If this is a directory but no "/" is attached, then redirect.
    if (-d $path && substr($c->request->uri, -1) ne "/") {
        return $c->res->redirect($c->request->uri . "/");
    }
    
    $path = "$path/index.html" if -d $path && -e "$path/index.html";
    if (!-e $path) {
        return error($c, "File $path does not exist.");
    }
    $c->serve_static_file($path);
}
1;

Insertion in src/Hydra/lib/Hydra/Controller/Root.pm at line 7 [5.804]
[4.110]
[5.908]
```
use Hydra::Helper::CatalystUtils;
```

Deletion in src/Hydra/lib/Hydra/Controller/Root.pm at line 12 [5.804]

B:BD[5.1084] → [6.0:146]


# Security checking of filenames.
my $pathCompRE = "(?:[A-Za-z0-9-\+][A-Za-z0-9-\+\._]*)";
my $relPathRE = "(?:$pathCompRE(?:\/$pathCompRE)*)";

Deletion in src/Hydra/lib/Hydra/Controller/Root.pm at line 18 [5.804]
∅:D[7.44] → [8.148:150]
B:BD[8.148] → [8.148:150]
∅:D[8.150] → [5.1084:1122]
B:BD[5.1084] → [5.1084:1122]
B:BD[5.1122] → [2.38:75]
```
}
sub error {
    my ($c, $msg) = @_;
    $c->error($msg);
    $c->detach;
```
Deletion in src/Hydra/lib/Hydra/Controller/Root.pm at line 25 [5.804]
B:BD[9.73] → [9.73:75]
∅:D[9.75] → [5.1227:1228]
B:BD[5.1227] → [5.1227:1228]
B:BD[5.1228] → [9.76:77]
∅:D[9.77] → [5.1228:1266]
B:BD[5.1228] → [5.1228:1266]
B:BD[5.1266] → [10.0:52]
∅:D[10.52] → [5.1332:1351]
B:BD[5.1332] → [5.1332:1351]
```
}
sub getBuild {
    my ($c, $id) = @_;
    my $build = $c->model('DB::Builds')->find($id);
    return $build;
```

Replacement in src/Hydra/lib/Hydra/Controller/Root.pm at line 353 [5.804]

∅:D[9.577] → [6.232:323]

B:BD[11.466] → [6.232:323]

        die "Invalid Nix expression path: $nixExprPath" if $nixExprPath !~ /^$relPathRE$/;

[9.577]

[11.570]

        die "Invalid Nix expression path: $nixExprPath" if $nixExprPath !~ /^$Build::relPathRE$/;

Deletion in src/Hydra/lib/Hydra/Controller/Root.pm at line 555 [5.804]

∅:D[2.107] → [5.1592:1596]

B:BD[5.1592] → [5.1592:1596]

B:BD[5.1596] → [2.108:159]

∅:D[2.159] → [12.468:498]

B:BD[5.1615] → [12.468:498]

B:BD[12.498] → [2.160:397]

∅:D[2.397] → [5.1647:1648]

∅:D[12.498] → [5.1647:1648]

B:BD[5.1647] → [5.1647:1648]

B:BD[5.1648] → [2.398:459]

∅:D[2.459] → [13.249:250]

B:BD[5.1760] → [13.249:250]

∅:D[13.297] → [14.398:399]

B:BD[5.1760] → [14.398:399]

B:BD[14.399] → [2.460:542]

∅:D[2.542] → [15.0:1]

B:BD[5.1865] → [15.0:1]

B:BD[15.1] → [2.543:624]

∅:D[2.624] → [16.978:1011]

B:BD[15.1] → [16.978:1011]

B:BD[17.1] → [17.1:59]

∅:D[17.59] → [16.1011:1012]

B:BD[16.1011] → [16.1011:1012]

∅:D[16.1012] → [15.1:170]

B:BD[15.1] → [15.1:170]

∅:D[15.170] → [5.1865:1869]

B:BD[5.1865] → [5.1865:1869]

B:BD[5.1869] → [2.625:723]

∅:D[18.32] → [5.1929:1930]

∅:D[12.529] → [5.1929:1930]

∅:D[2.723] → [5.1929:1930]

B:BD[5.1929] → [5.1929:1930]

B:BD[5.1930] → [2.724:882]

∅:D[2.882] → [18.200:201]

B:BD[18.200] → [18.200:201]

∅:D[18.201] → [5.2215:2253]

B:BD[5.2215] → [5.2215:2253]

B:BD[5.2253] → [2.883:914]

∅:D[18.235] → [5.2309:2365]

∅:D[2.914] → [5.2309:2365]

B:BD[5.2309] → [5.2309:2365]

B:BD[5.2365] → [2.915:971]

∅:D[19.69] → [20.162:166]

∅:D[18.301] → [20.162:166]

∅:D[2.971] → [20.162:166]

B:BD[5.2413] → [20.162:166]

B:BD[20.166] → [2.972:1055]

∅:D[2.1055] → [20.340:341]

B:BD[20.340] → [20.340:341]

B:BD[20.341] → [2.1056:1161]

∅:D[2.1161] → [21.0:1]

B:BD[20.491] → [21.0:1]

B:BD[20.496] → [20.496:534]

B:BD[20.592] → [20.592:648]

B:BD[20.648] → [2.1162:1243]

∅:D[19.126] → [5.2413:2431]

∅:D[20.700] → [5.2413:2431]

∅:D[2.1243] → [5.2413:2431]

B:BD[5.2413] → [5.2413:2431]

B:BD[5.2431] → [19.127:152]

∅:D[19.152] → [18.302:333]

B:BD[5.2452] → [18.302:333]

∅:D[18.333] → [22.0:99]

B:BD[5.2452] → [22.0:99]

B:BD[22.99] → [19.153:316]

∅:D[19.316] → [22.203:228]

B:BD[22.203] → [22.203:228]

}
sub build : Chained('/') PathPart CaptureArgs(1) {
    my ($self, $c, $id) = @_;
    
    $c->stash->{id} = $id;
    
    $c->stash->{build} = getBuild($c, $id);
    
    if (!defined $c->stash->{build}) {
        error($c, "Build with ID $id doesn't exist.");
        $c->response->status(404);
        return;
    }
    $c->stash->{curProject} = $c->stash->{build}->project;
}
sub view_build : Chained('build') PathPart('') Args(0) {
    my ($self, $c) = @_;
    my $build = $c->stash->{build};
    
    $c->stash->{template} = 'build.tt';
    $c->stash->{curTime} = time;
    $c->stash->{available} = isValidPath $build->outpath;
    if (!$build->finished && $build->schedulingInfo->busy) {
        my $logfile = $build->schedulingInfo->logfile;
        $c->stash->{logtext} = `cat $logfile`;
    }
}
sub view_nixlog : Chained('build') PathPart('nixlog') Args(1) {
    my ($self, $c, $stepnr) = @_;
    my $step = $c->stash->{build}->buildsteps->find({stepnr => $stepnr});
    return error($c, "Build doesn't have a build step $stepnr.") if !defined $step;
    $c->stash->{template} = 'log.tt';
    $c->stash->{step} = $step;
    # !!! should be done in the view (as a TT plugin).
    $c->stash->{logtext} = loadLog($c, $step->logfile);
}
sub view_log : Chained('build') PathPart('log') Args(0) {
    my ($self, $c) = @_;
    return error($c, "Build didn't produce a log.") if !defined $c->stash->{build}->resultInfo->logfile;
    $c->stash->{template} = 'log.tt';
    # !!! should be done in the view (as a TT plugin).
    $c->stash->{logtext} = loadLog($c, $c->stash->{build}->resultInfo->logfile);
}
sub loadLog {
    my ($c, $path) = @_;
    die unless defined $path;
    # !!! quick hack
    my $pipeline = ($path =~ /.bz2$/ ? "cat $path | bzip2 -d" : "cat $path")
        . " | nix-log2xml | xsltproc " . $c->path_to("xsl/mark-errors.xsl") . " -"
        . " | xsltproc " . $c->path_to("xsl/log2html.xsl") . " - | tail -n +2";
    return `$pipeline`;

Deletion in src/Hydra/lib/Hydra/Controller/Root.pm at line 558 [5.804]

B:BD[23.2] → [2.1244:1354]

∅:D[24.62] → [5.2595:2596]

∅:D[23.79] → [5.2595:2596]

∅:D[12.630] → [5.2595:2596]

∅:D[2.1354] → [5.2595:2596]

B:BD[5.2595] → [5.2595:2596]

B:BD[5.2596] → [2.1355:1528]

∅:D[2.1528] → [23.358:359]

B:BD[23.358] → [23.358:359]

B:BD[23.359] → [24.63:161]

∅:D[24.161] → [23.454:455]

B:BD[23.454] → [23.454:455]

B:BD[23.455] → [24.162:218]

B:BD[24.218] → [6.324:405]

∅:D[6.405] → [24.356:367]

B:BD[24.356] → [24.356:367]

B:BD[24.367] → [25.0:88]

∅:D[25.88] → [24.423:808]

B:BD[24.423] → [24.423:808]

B:BD[24.808] → [26.71:75]

sub download : Chained('build') PathPart('download') {
    my ($self, $c, $productnr, $filename, @path) = @_;
    my $product = $c->stash->{build}->buildproducts->find({productnr => $productnr});
    return error($c, "Build doesn't have a product $productnr.") if !defined $product;
    return error($c, "Product " . $product->path . " has disappeared.") unless -e $product->path;
    # Security paranoia.
    foreach my $elem (@path) {
        return error($c, "Invalid filename $elem.") if $elem !~ /^$pathCompRE$/;
    }
    
    my $path = $product->path;
    $path .= "/" . join("/", @path) if scalar @path > 0;
    # If this is a directory but no "/" is attached, then redirect.
    if (-d $path && substr($c->request->uri, -1) ne "/") {
        return $c->res->redirect($c->request->uri . "/");
    }
    
    $path = "$path/index.html" if -d $path && -e "$path/index.html";
    if (!-e $path) {
        return error($c, "File $path does not exist.");
    }
    $c->serve_static_file($path);
}

File addition: CatalystUtils.pm (----------)

[3.109]

package Hydra::Helper::CatalystUtils;
use strict;
use Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(getBuild error);
sub getBuild {
    my ($c, $id) = @_;
    my $build = $c->model('DB::Builds')->find($id);
    return $build;
}
sub error {
    my ($c, $msg) = @_;
    $c->error($msg);
    $c->detach;
}
1;

Replacement in src/Hydra/root/build.tt at line 124 [5.7350]

B:BD[18.2530] → [2.1745:1834]

        <a href="[% c.uri_for('build' build.id 'log') %]"><strong>Available</strong></a>

[18.2530]

[18.2612]

        <a href="[% c.uri_for('/build' build.id 'log') %]"><strong>Available</strong></a>

Replacement in src/Hydra/root/build.tt at line 181 [5.7350]

B:BD[20.4155] → [2.1835:1902]

      [% log = c.uri_for('build' build.id 'nixlog' step.stepnr) %]

[20.4155]

[27.0]

      [% log = c.uri_for('/build' build.id 'nixlog' step.stepnr) %]

Replacement in src/Hydra/root/product-list.tt at line 9 [28.3098]

B:BD[2.2174] → [2.2174:2262]

      [% uri = c.uri_for('build' build.id 'download' product.productnr product.name) %]

[2.2174]

[2.2262]

      [% uri = c.uri_for('/build' build.id 'download' product.productnr product.name) %]

Replacement in src/Hydra/root/product-list.tt at line 16 [28.3098]

B:BD[29.951] → [2.2270:2319]

        [% uri = c.uri_for('nixpkg' build.id) %]

[29.951]

[2.2319]

        [% uri = c.uri_for('/nixpkg' build.id) %]