Proxmox-Port/proxmox-backup
1
0
Fork 0
forked from proxmox-mirrors/proxmox-backup
Code Pull Requests Activity

tape: fix wrongly unloading encryption key

Browse Source 
For security, we want to automatically unload the encryption key from
the drive when we're done, so there was a Drop handler for SgTape that
handles that. Sadly, our tool we use to set it in the first place, also
invoked the Drop handler, thus unloading the keys again immediately

To fix that, move the Drop handler one logical level higher to the
LtoTapeHandle, which is not used by the 'sg-tape-cmd'.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
(cherry picked from commit 1dc0df339b)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2024-01-22 12:50:32 +01:00
parent b63da904ff
commit c3fcfbbda8
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pbs-tape/src/sg_tape.rs
View File

@ -104,7 +104,6 @@ pub struct SgTape {
file: File,
locate_offset: Option<i64>,
info: InquiryInfo,
encryption_key_loaded: bool,
}
impl SgTape {
@ -126,7 +125,6 @@ impl SgTape {
Ok(Self {
file,
info,
encryption_key_loaded: false,
locate_offset: None,
})
}
@ -662,7 +660,6 @@ impl SgTape {
} else {
None
};
self.encryption_key_loaded = key.is_some();
drive_set_encryption(&mut self.file, key)
}
@ -1018,15 +1015,6 @@ impl SgTape {
}
}
impl Drop for SgTape {
fn drop(&mut self) {
// For security reasons, clear the encryption key
if self.encryption_key_loaded {
let _ = self.set_encryption(None);
}
}
}
pub struct SgTapeReader<'a> {
sg_tape: &'a mut SgTape,
end_of_file: bool,

24
src/tape/drive/lto/mod.rs
View File

@ -33,16 +33,32 @@ use crate::tape::{
file_formats::{MediaSetLabel, PROXMOX_BACKUP_MEDIA_SET_LABEL_MAGIC_1_0},
};
impl Drop for LtoTapeHandle {
fn drop(&mut self) {
// always unload the encryption key when the handle is dropped for security
// but only log an error if we set one in the first place
if let Err(err) = self.set_encryption(None) {
if self.encryption_key_loaded {
log::error!("could not unload encryption key from drive: {err}");
}
}
}
}
/// Lto Tape device handle
pub struct LtoTapeHandle {
sg_tape: SgTape,
encryption_key_loaded: bool,
}
impl LtoTapeHandle {
/// Creates a new instance
pub fn new(file: File) -> Result<Self, Error> {
let sg_tape = SgTape::new(file)?;
Ok(Self { sg_tape })
Ok(Self {
sg_tape,
encryption_key_loaded: false,
})
}
/// Open a tape device
@ -52,7 +68,10 @@ impl LtoTapeHandle {
pub fn open_lto_drive(config: &LtoTapeDrive) -> Result<Self, Error> {
let sg_tape = SgTape::open_lto_drive(config)?;
let handle = Self { sg_tape };
let handle = Self {
sg_tape,
encryption_key_loaded: false,
};
Ok(handle)
}
@ -273,6 +292,7 @@ impl TapeDriver for LtoTapeHandle {
&["--fingerprint", &fingerprint, "--uuid", &uuid.to_string()],
self.sg_tape.file_mut().as_raw_fd(),
)?;
self.encryption_key_loaded = true;
let result: Result<(), String> = serde_json::from_str(&output)?;
result.map_err(|err| format_err!("{}", err))
} else {