From 5ea56bbdfeadb86c2b08fe9d13d2f4a24ce2c9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= Date: Thu, 13 Aug 2015 15:05:48 +0200 Subject: [PATCH] Fixed token reading from config --- argonaut-server/bin/argonaut-server | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/argonaut-server/bin/argonaut-server b/argonaut-server/bin/argonaut-server index a05fd0e..925b716 100644 --- a/argonaut-server/bin/argonaut-server +++ b/argonaut-server/bin/argonaut-server @@ -63,7 +63,7 @@ use Socket; our ($config,$protocol,$server_ip,$server_port); my ($sslkeyfile,$sslcertfile,$sslcacertfile,$iptool,$delete_finished_tasks, - $interface,$logdir,$packages_folder,$fetch_packages); + $interface,$logdir,$packages_folder,$fetch_packages,$token); my $logfile = "argonaut-server.log"; my $piddir = "/var/run/argonaut"; my $pidfile = "argonaut-server.pid"; @@ -106,6 +106,7 @@ sub readConfig { $sslkeyfile = $settings->{'keyfile'}; $sslcertfile = $settings->{'certfile'}; $sslcacertfile = $settings->{'cacertfile'}; + $token = $settings->{'token'}; $packages_folder = "/var/cache/argonaut/packages"; } @@ -254,7 +255,7 @@ sub token_authenticate { return 0; } - return argonaut_check_ssha_token($hash, $config->{'token'}); + return argonaut_check_ssha_token($hash, $token); } sub refresh_task { -- 1.7.10.4