auth_helpers.rs: split code into separate file

diff --git a/src/auth_helpers.rs b/src/auth_helpers.rs
new file mode 100644 (file)
index 0000000..f7ee6e6
--- /dev/null
+++ b/src/auth_helpers.rs
@@ -0,0 +1,52 @@
+use crate::tools;
+
+use failure::*;
+
+use openssl::rsa::{Rsa};
+use std::path::PathBuf;
+
+pub fn generate_csrf_key() -> Result<(), Error> {
+
+    let path = PathBuf::from("/etc/proxmox-backup/csrf.key");
+
+    if path.exists() { return Ok(()); }
+
+    let rsa = Rsa::generate(2048).unwrap();
+
+    let pem = rsa.private_key_to_pem()?;
+
+    use nix::sys::stat::Mode;
+
+    tools::file_set_contents(
+        &path, &pem, Some(Mode::from_bits_truncate(0o0640)))?;
+
+    nix::unistd::chown(&path, Some(nix::unistd::ROOT), Some(nix::unistd::Gid::from_raw(33)))?;
+
+    Ok(())
+}
+
+pub fn generate_auth_key() -> Result<(), Error> {
+
+    let priv_path = PathBuf::from("/etc/proxmox-backup/authkey.key");
+
+    let mut public_path = priv_path.clone();
+    public_path.set_extension("pub");
+
+    if priv_path.exists() && public_path.exists() { return Ok(()); }
+
+    let rsa = Rsa::generate(4096).unwrap();
+
+    let priv_pem = rsa.private_key_to_pem()?;
+
+    use nix::sys::stat::Mode;
+
+    tools::file_set_contents(
+        &priv_path, &priv_pem, Some(Mode::from_bits_truncate(0o0600)))?;
+
+
+    let public_pem = rsa.public_key_to_pem()?;
+
+    tools::file_set_contents(&public_path, &public_pem, None)?;
+
+    Ok(())
+}

diff --git a/src/bin/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs
index 95e96a2179359b78c59c84be212aa83b504eb8eb..4f86b070a32fab594ca2b5052efac1dd2a2dc091 100644 (file)
--- a/src/bin/proxmox-backup-api.rs
+++ b/src/bin/proxmox-backup-api.rs
@@ -8,62 +8,14 @@ use proxmox_backup::api::router::*;
 use proxmox_backup::api::config::*;
 use proxmox_backup::server::rest::*;
 use proxmox_backup::getopts;
+use proxmox_backup::auth_helpers::*;
 
-use failure::*;
 use lazy_static::lazy_static;
-use openssl::rsa::{Rsa};
-use std::path::PathBuf;
 
 use futures::future::Future;
 
 use hyper;
 
-pub fn generate_csrf_key() -> Result<(), Error> {
-
-    let path = PathBuf::from("/etc/proxmox-backup/csrf.key");
-
-    if path.exists() { return Ok(()); }
-
-    let rsa = Rsa::generate(2048).unwrap();
-
-    let pem = rsa.private_key_to_pem()?;
-
-    use nix::sys::stat::Mode;
-
-    tools::file_set_contents(
-        &path, &pem, Some(Mode::from_bits_truncate(0o0640)))?;
-
-    nix::unistd::chown(&path, Some(nix::unistd::ROOT), Some(nix::unistd::Gid::from_raw(33)))?;
-
-    Ok(())
-}
-
-pub fn generate_auth_key() -> Result<(), Error> {
-
-    let priv_path = PathBuf::from("/etc/proxmox-backup/authkey.key");
-
-    let mut public_path = priv_path.clone();
-    public_path.set_extension("pub");
-
-    if priv_path.exists() && public_path.exists() { return Ok(()); }
-
-    let rsa = Rsa::generate(4096).unwrap();
-
-    let priv_pem = rsa.private_key_to_pem()?;
-
-    use nix::sys::stat::Mode;
-
-    tools::file_set_contents(
-        &priv_path, &priv_pem, Some(Mode::from_bits_truncate(0o0600)))?;
-
-
-    let public_pem = rsa.public_key_to_pem()?;
-
-    tools::file_set_contents(&public_path, &public_pem, None)?;
-
-    Ok(())
-}
-
 fn main() {
 
     if let Err(err) = syslog::init(

diff --git a/src/lib.rs b/src/lib.rs
index 6d506aed52f1f466b14c2f9aa651985dcc30a901..2f31c96c3669ddd66c165dcae310a69be3c6752d 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -49,8 +49,6 @@ pub mod storage {
     pub mod futures;
 }
 
-pub mod getopts;
-
 pub mod cli {
 
     pub mod environment;
@@ -65,3 +63,6 @@ pub mod client {
     pub mod http_client;
     pub mod catar_backup_stream;
 }
+
+pub mod getopts;
+pub mod auth_helpers;