tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restore: print to STDERR

Browse Source 
else restoring to STDOUT is broken..

Reported-by: Dominic Jäger <d.jaeger@proxmox.com>

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-11-25 14:28:51 +01:00 committed by Thomas Lamprecht
parent 52f53d8280
commit 490560e0c6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/proxmox-backup-client.rs
View File

@ -644,7 +644,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, CryptMode), Err
(None, None) => None, (None, None) => None,
(Some(_), Some(_)) => bail!("--keyfile and --keyfd are mutually exclusive"), (Some(_), Some(_)) => bail!("--keyfile and --keyfd are mutually exclusive"),
(Some(keyfile), None) => { (Some(keyfile), None) => {
println!("Using encryption key file: {}", keyfile); eprintln!("Using encryption key file: {}", keyfile);
Some(file_get_contents(keyfile)?) Some(file_get_contents(keyfile)?)
}, },
(None, Some(fd)) => { (None, Some(fd)) => {
@ -654,7 +654,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, CryptMode), Err
.map_err(|err| { .map_err(|err| {
format_err!("error reading encryption key from fd {}: {}", fd, err) format_err!("error reading encryption key from fd {}: {}", fd, err)
})?; })?;
println!("Using encryption key from file descriptor"); eprintln!("Using encryption key from file descriptor");
Some(data) Some(data)
} }
}; };
@ -663,7 +663,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, CryptMode), Err
// no parameters: // no parameters:
(None, None) => match key::read_optional_default_encryption_key()? { (None, None) => match key::read_optional_default_encryption_key()? {
Some(key) => { Some(key) => {
println!("Encrypting with default encryption key!"); eprintln!("Encrypting with default encryption key!");
(Some(key), CryptMode::Encrypt) (Some(key), CryptMode::Encrypt)
}, },
None => (None, CryptMode::None), None => (None, CryptMode::None),
@ -676,7 +676,7 @@ fn keyfile_parameters(param: &Value) -> Result<(Option<Vec<u8>>, CryptMode), Err
(None, Some(crypt_mode)) => match key::read_optional_default_encryption_key()? { (None, Some(crypt_mode)) => match key::read_optional_default_encryption_key()? {
None => bail!("--crypt-mode without --keyfile and no default key file available"), None => bail!("--crypt-mode without --keyfile and no default key file available"),
Some(key) => { Some(key) => {
println!("Encrypting with default encryption key!"); eprintln!("Encrypting with default encryption key!");
(Some(key), crypt_mode) (Some(key), crypt_mode)
}, },
} }
@ -1257,7 +1257,7 @@ async fn restore(param: Value) -> Result<Value, Error> {
None => None, None => None,
Some(key) => { Some(key) => {
let (key, _, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?; let (key, _, fingerprint) = decrypt_key(&key, &key::get_encryption_key_password)?;
println!("Encryption key fingerprint: '{}'", fingerprint); eprintln!("Encryption key fingerprint: '{}'", fingerprint);
Some(Arc::new(CryptConfig::new(key)?)) Some(Arc::new(CryptConfig::new(key)?))
} }
}; };