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

Update binary cache signing to Nix 1.9

Browse source
This commit is contained in:
Eelco Dolstra 2015-02-17 20:15:37 +01:00
parent 14752d7801
commit 69adcd4be1
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/lib/Hydra/View/NARInfo.pm
View file

@ -1,11 +1,13 @@
package Hydra::View::NARInfo; package Hydra::View::NARInfo;
use strict;
use base qw/Catalyst::View/;
use File::Basename; use File::Basename;
use Nix::Store;
use Nix::Crypto;
use Hydra::Helper::CatalystUtils; use Hydra::Helper::CatalystUtils;
use MIME::Base64;
use Nix::Manifest;
use Nix::Store;
use Nix::Utils;
use base qw/Catalyst::View/;
use strict;
sub process { sub process {
my ($self, $c) = @_; my ($self, $c) = @_;
@ -32,12 +34,15 @@ sub process {
} }
# Optionally, sign the NAR info file we just created. # Optionally, sign the NAR info file we just created.
my $privateKeyFile = $c->config->{binary_cache_private_key_file}; my $secretKeyFile = $c->config->{binary_cache_secret_key_file};
my $keyName = $c->config->{binary_cache_key_name}; if (defined $secretKeyFile) {
my $s = readFile $secretKeyFile;
if (defined $privateKeyFile && defined $keyName) { chomp $s;
my $sig = signString($privateKeyFile, $info); my ($keyName, $secretKey) = split ":", $s;
$info .= "Signature: 1;$keyName;$sig\n"; die "invalid secret key file\n" unless defined $keyName && defined $secretKey;
my $fingerprint = fingerprintPath($storePath, $narHash, $narSize, $refs);
my $sig = encode_base64(signString(decode_base64($secretKey), $fingerprint), "");
$info .= "Sig: $keyName:$sig\n";
} }
setCacheHeaders($c, 24 * 60 * 60); setCacheHeaders($c, 24 * 60 * 60);