From 6f642c34e2d1154f279b6846e3f859033e25b0ce Mon Sep 17 00:00:00 2001 From: Antoine Gersant Date: Thu, 16 Jan 2020 01:58:51 -0800 Subject: [PATCH] Non-optional auth secret --- src/main.rs | 2 +- src/service/actix/server.rs | 2 +- src/service/rocket/server.rs | 10 ++++------ src/service/rocket/test.rs | 4 +++- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index b0487c3..30c763c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -221,7 +221,7 @@ fn main() -> Result<()> { std::thread::spawn(move || { let _ = service::server::run( port, - Some(auth_secret.as_slice()), + &auth_secret, api_url, web_url, web_dir_path, diff --git a/src/service/actix/server.rs b/src/service/actix/server.rs index fc1ed5d..29ebf48 100644 --- a/src/service/actix/server.rs +++ b/src/service/actix/server.rs @@ -8,7 +8,7 @@ use crate::index::CommandSender; pub fn run( port: u16, - auth_secret: Option<&[u8]>, + auth_secret: &[u8], api_url: String, web_url: String, web_dir_path: PathBuf, diff --git a/src/service/rocket/server.rs b/src/service/rocket/server.rs index 84fca9d..db44396 100644 --- a/src/service/rocket/server.rs +++ b/src/service/rocket/server.rs @@ -11,7 +11,7 @@ use crate::index::CommandSender; pub fn get_server( port: u16, - auth_secret: Option<&[u8]>, + auth_secret: &[u8], api_url: &str, web_url: &str, web_dir_path: &PathBuf, @@ -26,10 +26,8 @@ pub fn get_server( .keep_alive(0) .finalize()?; - if let Some(secret) = auth_secret { - let encoded = base64::encode(secret); - config.set_secret_key(encoded)?; - } + let encoded = base64::encode(auth_secret); + config.set_secret_key(encoded)?; let swagger_routes_rank = 0; let web_routes_rank = swagger_routes_rank + 1; @@ -50,7 +48,7 @@ pub fn get_server( pub fn run( port: u16, - auth_secret: Option<&[u8]>, + auth_secret: &[u8], api_url: String, web_url: String, web_dir_path: PathBuf, diff --git a/src/service/rocket/test.rs b/src/service/rocket/test.rs index f72022b..f1de84a 100644 --- a/src/service/rocket/test.rs +++ b/src/service/rocket/test.rs @@ -44,9 +44,11 @@ pub fn get_test_environment(db_name: &str) -> TestEnvironment { swagger_dir_path.push("swagger"); let command_sender = index::init(db.clone()); + let auth_secret: [u8; 32] = [0; 32]; + let server = server::get_server( 5050, - None, + &auth_secret, "/api", "/", &web_dir_path,