delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1364 from K900/urlencode-logs

Browse source 
urlencode drv names when fetching logs
This commit is contained in:
Janne Heß 2024-03-01 10:11:08 +01:00 committed by GitHub
parent c1bd50a80d 9db5d0a88d
commit c45c06509a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@ use Nix::Config;
use List::SomeUtils qw(all); use List::SomeUtils qw(all);
use Encode; use Encode;
use JSON::PP; use JSON::PP;
use WWW::Form::UrlEncoded::PP qw();
use feature 'state'; use feature 'state';
@ -141,7 +142,7 @@ sub view_nixlog : Chained('buildChain') PathPart('nixlog') {
$c->stash->{step} = $step; $c->stash->{step} = $step;
my $drvPath = $step->drvpath; my $drvPath = $step->drvpath;
my $log_uri = $c->uri_for($c->controller('Root')->action_for("log"), [basename($drvPath)]); my $log_uri = $c->uri_for($c->controller('Root')->action_for("log"), [WWW::Form::UrlEncoded::PP::url_encode(basename($drvPath))]);
showLog($c, $mode, $log_uri); showLog($c, $mode, $log_uri);
} }
@ -150,7 +151,7 @@ sub view_log : Chained('buildChain') PathPart('log') {
my ($self, $c, $mode) = @_; my ($self, $c, $mode) = @_;
my $drvPath = $c->stash->{build}->drvpath; my $drvPath = $c->stash->{build}->drvpath;
my $log_uri = $c->uri_for($c->controller('Root')->action_for("log"), [basename($drvPath)]); my $log_uri = $c->uri_for($c->controller('Root')->action_for("log"), [WWW::Form::UrlEncoded::PP::url_encode(basename($drvPath))]);
showLog($c, $mode, $log_uri); showLog($c, $mode, $log_uri);
} }

3
src/lib/Hydra/Controller/Root.pm
View file

@ -16,6 +16,7 @@ use List::Util qw[min max];
use List::SomeUtils qw{any}; use List::SomeUtils qw{any};
use Net::Prometheus; use Net::Prometheus;
use Types::Standard qw/StrMatch/; use Types::Standard qw/StrMatch/;
use WWW::Form::UrlEncoded::PP qw();
use constant NARINFO_REGEX => qr{^([a-z0-9]{32})\.narinfo$}; use constant NARINFO_REGEX => qr{^([a-z0-9]{32})\.narinfo$};
# e.g.: https://hydra.example.com/realisations/sha256:a62128132508a3a32eef651d6467695944763602f226ac630543e947d9feb140!out.doi # e.g.: https://hydra.example.com/realisations/sha256:a62128132508a3a32eef651d6467695944763602f226ac630543e947d9feb140!out.doi
@ -553,7 +554,7 @@ sub log :Local :Args(1) {
my $logPrefix = $c->config->{log_prefix}; my $logPrefix = $c->config->{log_prefix};
if (defined $logPrefix) { if (defined $logPrefix) {
$c->res->redirect($logPrefix . "log/" . basename($drvPath)); $c->res->redirect($logPrefix . "log/" . WWW::Form::UrlEncoded::PP::url_encode(basename($drvPath)));
} else { } else {
notFound($c, "The build log of $drvPath is not available."); notFound($c, "The build log of $drvPath is not available.");
} }