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

src/bin/proxmox-backup-client.rs: sign index.json

This commit is contained in:
Dietmar Maurer 2019-08-02 10:00:15 +02:00
parent 69ecd8d5b0
commit b335f5b713
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,7 +626,7 @@ fn create_backup(
if let Some(rsa_encrypted_key) = rsa_encrypted_key { if let Some(rsa_encrypted_key) = rsa_encrypted_key {
let target = "rsa-encrypted.key"; let target = "rsa-encrypted.key";
println!("Upload RSA encoded key to '{:?}' as {}", repo, target); println!("Upload RSA encoded key to '{:?}' as {}", repo, target);
let stats = client.upload_blob_from_data(rsa_encrypted_key, target, None, false).wait()?; let stats = client.upload_blob_from_data(rsa_encrypted_key, target, None, false, false).wait()?;
file_list.push((target.to_owned(), stats)); file_list.push((target.to_owned(), stats));
// openssl rsautl -decrypt -inkey master-private.pem -in rsa-encrypted.key -out t // openssl rsautl -decrypt -inkey master-private.pem -in rsa-encrypted.key -out t
@ -657,7 +657,7 @@ fn create_backup(
println!("Upload index.json to '{:?}'", repo); println!("Upload index.json to '{:?}'", repo);
let index_data = serde_json::to_string_pretty(&index)?.into(); let index_data = serde_json::to_string_pretty(&index)?.into();
client.upload_blob_from_data(index_data, "index.json", crypt_config.clone(), true).wait()?; client.upload_blob_from_data(index_data, "index.json", crypt_config.clone(), true, true).wait()?;
client.finish().wait()?; client.finish().wait()?;

7
src/client/http_client.rs
View File

@ -597,6 +597,7 @@ impl BackupClient {
file_name: &str, file_name: &str,
crypt_config: Option<Arc<CryptConfig>>, crypt_config: Option<Arc<CryptConfig>>,
compress: bool, compress: bool,
sign_only: bool,
) -> impl Future<Item=BackupStats, Error=Error> { ) -> impl Future<Item=BackupStats, Error=Error> {
let h2 = self.h2.clone(); let h2 = self.h2.clone();
@ -606,7 +607,11 @@ impl BackupClient {
futures::future::ok(()) futures::future::ok(())
.and_then(move |_| { .and_then(move |_| {
let blob = if let Some(ref crypt_config) = crypt_config { let blob = if let Some(ref crypt_config) = crypt_config {
DataBlob::encode(&data, Some(crypt_config), compress)? if sign_only {
DataBlob::create_signed(&data, crypt_config, compress)?
} else {
DataBlob::encode(&data, Some(crypt_config), compress)?
}
} else { } else {
DataBlob::encode(&data, None, compress)? DataBlob::encode(&data, None, compress)?
}; };