proxmox-mirrors/proxmox-backup-qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-backup-qemu synced 2025-10-04 22:11:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

proxmox_backup_connect: make password optional

Browse Source
This commit is contained in:
Dietmar Maurer 2019-10-16 11:47:45 +02:00
parent 574e020389
commit 7dfc23db39
3 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/commands.rs
View File

@ -2,7 +2,6 @@ use failure::*;
use std::collections::HashSet; use std::collections::HashSet;
use std::sync::{Mutex, Arc}; use std::sync::{Mutex, Arc};
use std::ptr; use std::ptr;
use std::ffi::CString;
use futures::future::{Future, TryFutureExt}; use futures::future::{Future, TryFutureExt};
use serde_json::{json, Value}; use serde_json::{json, Value};
@ -24,7 +23,7 @@ pub(crate) struct BackupSetup {
pub chunk_size: u64, pub chunk_size: u64,
pub backup_id: String, pub backup_id: String,
pub backup_time: DateTime<Utc>, pub backup_time: DateTime<Utc>,
pub password: CString, pub password: Option<String>,
pub crypt_config: Option<Arc<CryptConfig>>, pub crypt_config: Option<Arc<CryptConfig>>,
} }

27
src/lib.rs
View File

@ -66,20 +66,23 @@ pub extern "C" fn proxmox_backup_connect(
error: * mut * mut c_char, error: * mut * mut c_char,
) -> *mut ProxmoxBackupHandle { ) -> *mut ProxmoxBackupHandle {
let repo = unsafe { CStr::from_ptr(repo).to_string_lossy().into_owned() }; let setup: Result<_, Error> = try_block!({
let repo: BackupRepository = match repo.parse() { let repo = unsafe { CStr::from_ptr(repo).to_str()?.to_owned() };
Ok(repo) => repo, let repo: BackupRepository = repo.parse()?;
Err(err) => raise_error_null!(error, err),
}; let backup_id = unsafe { CStr::from_ptr(backup_id).to_str()?.to_owned() };
let backup_id = unsafe { CStr::from_ptr(backup_id).to_string_lossy().into_owned() };
let backup_time = Utc.timestamp(backup_time as i64, 0); let backup_time = Utc.timestamp(backup_time as i64, 0);
let password = unsafe { CStr::from_ptr(password).to_owned() }; let password = if password == std::ptr::null() {
None
} else {
Some(unsafe { CStr::from_ptr(password).to_str()?.to_owned() })
};
let crypt_config: Option<Arc<CryptConfig>> = None; //fixme: let crypt_config: Option<Arc<CryptConfig>> = None; //fixme:
let setup = BackupSetup { Ok(BackupSetup {
host: repo.host().to_owned(), host: repo.host().to_owned(),
user: repo.user().to_owned(), user: repo.user().to_owned(),
store: repo.store().to_owned(), store: repo.store().to_owned(),
@ -88,8 +91,11 @@ pub extern "C" fn proxmox_backup_connect(
password, password,
backup_time, backup_time,
crypt_config, crypt_config,
}; })
});
match setup {
Ok(setup) => {
match BackupTask::new(setup) { match BackupTask::new(setup) {
Ok(task) => { Ok(task) => {
let boxed_task = Box::new(task); let boxed_task = Box::new(task);
@ -98,6 +104,9 @@ pub extern "C" fn proxmox_backup_connect(
Err(err) => raise_error_null!(error, err), Err(err) => raise_error_null!(error, err),
} }
} }
Err(err) => raise_error_null!(error, err),
}
}
/// Abort a running backup task /// Abort a running backup task
/// ///

3
src/worker_task.rs
View File

@ -51,8 +51,7 @@ impl BackupTask {
} }
fn connect(runtime: &mut Runtime, setup: &BackupSetup) -> Result<Arc<BackupWriter>, Error> { 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, setup.password.clone())?;
let client = HttpClient::new(&setup.host, &setup.user, Some(password))?;
let client = runtime.block_on( let client = runtime.block_on(
BackupWriter::start(client, &setup.store, "vm", &setup.backup_id, setup.backup_time, false) BackupWriter::start(client, &setup.store, "vm", &setup.backup_id, setup.backup_time, false)