From 7dfc23db39f44ff1cea7467776bd4f4a0d4a7b72 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 16 Oct 2019 11:47:45 +0200
Subject: [PATCH] proxmox_backup_connect: make password optional

---
 src/commands.rs    |  3 +--
 src/lib.rs         | 55 +++++++++++++++++++++++++++-------------------
 src/worker_task.rs |  3 +--
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/commands.rs b/src/commands.rs
index f4e1e95..cca2302 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -2,7 +2,6 @@ use failure::*;
 use std::collections::HashSet;
 use std::sync::{Mutex, Arc};
 use std::ptr;
-use std::ffi::CString;
 
 use futures::future::{Future, TryFutureExt};
 use serde_json::{json, Value};
@@ -24,7 +23,7 @@ pub(crate) struct BackupSetup {
     pub chunk_size: u64,
     pub backup_id: String,
     pub backup_time: DateTime<Utc>,
-    pub password: CString,
+    pub password: Option<String>,
     pub crypt_config: Option<Arc<CryptConfig>>,
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index 8c9f0b4..e7416e3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -66,34 +66,43 @@ pub extern "C" fn proxmox_backup_connect(
     error: * mut * mut c_char,
 ) -> *mut ProxmoxBackupHandle {
 
-    let repo = unsafe { CStr::from_ptr(repo).to_string_lossy().into_owned() };
-    let repo: BackupRepository = match repo.parse() {
-        Ok(repo) => repo,
-        Err(err) => raise_error_null!(error, err),
-    };
-    let backup_id = unsafe { CStr::from_ptr(backup_id).to_string_lossy().into_owned() };
+    let setup: Result<_, Error> = try_block!({
+        let repo = unsafe { CStr::from_ptr(repo).to_str()?.to_owned() };
+        let repo: BackupRepository = repo.parse()?;
 
-    let backup_time = Utc.timestamp(backup_time as i64, 0);
+        let backup_id = unsafe { CStr::from_ptr(backup_id).to_str()?.to_owned() };
 
-    let password = unsafe { CStr::from_ptr(password).to_owned() };
+        let backup_time = Utc.timestamp(backup_time as i64, 0);
 
-    let crypt_config: Option<Arc<CryptConfig>> = None; //fixme:
+        let password = if password == std::ptr::null() {
+            None
+        } else {
+            Some(unsafe { CStr::from_ptr(password).to_str()?.to_owned() })
+        };
 
-    let setup = BackupSetup {
-        host: repo.host().to_owned(),
-        user: repo.user().to_owned(),
-        store: repo.store().to_owned(),
-        chunk_size: 4*1024*1024,
-        backup_id,
-        password,
-        backup_time,
-        crypt_config,
-    };
+        let crypt_config: Option<Arc<CryptConfig>> = None; //fixme:
 
-    match BackupTask::new(setup) {
-        Ok(task) => {
-            let boxed_task = Box::new(task);
-            Box::into_raw(boxed_task) as * mut ProxmoxBackupHandle
+        Ok(BackupSetup {
+            host: repo.host().to_owned(),
+            user: repo.user().to_owned(),
+            store: repo.store().to_owned(),
+            chunk_size: 4*1024*1024,
+            backup_id,
+            password,
+            backup_time,
+            crypt_config,
+        })
+    });
+
+    match setup {
+        Ok(setup) => {
+            match BackupTask::new(setup) {
+                Ok(task) => {
+                    let boxed_task = Box::new(task);
+                    Box::into_raw(boxed_task) as * mut ProxmoxBackupHandle
+                }
+                Err(err) => raise_error_null!(error, err),
+            }
         }
         Err(err) => raise_error_null!(error, err),
     }
diff --git a/src/worker_task.rs b/src/worker_task.rs
index 2a65429..003b2c8 100644
--- a/src/worker_task.rs
+++ b/src/worker_task.rs
@@ -51,8 +51,7 @@ impl BackupTask {
 }
 
 fn connect(runtime: &mut Runtime, setup: &BackupSetup) -> Result<Arc<BackupWriter>, Error> {
-    let password = setup.password.to_str()?.to_owned();
-    let client = HttpClient::new(&setup.host, &setup.user, Some(password))?;
+    let client = HttpClient::new(&setup.host, &setup.user, setup.password.clone())?;
 
     let client = runtime.block_on(
         BackupWriter::start(client, &setup.store, "vm", &setup.backup_id, setup.backup_time, false)