xenofem/transbeam
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

Keep passwords out of endpoint responses while preserving v1 schema

Browse source
This commit is contained in:
xenofem 2022-08-16 16:46:39 -04:00
parent aef58d133b
commit c7ceb4113b
4 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/store.rs
View file

@ -28,7 +28,7 @@ pub fn is_valid_storage_code(s: &str) -> bool {
.all(|c| c.is_ascii_alphanumeric() || c == &b'-')
}
pub use crate::state::v1::{StoredFile, StoredFiles};
pub use crate::state::v1::{StoredFile, StoredFileWithPassword, StoredFiles};
async fn is_valid_entry(key: &str, info: &StoredFile, storage_dir: &Path) -> bool {
if info.expiry < OffsetDateTime::now_utc() {
@ -95,7 +95,7 @@ impl crate::AppData {
error!("Invalid key in persistent storage: {}", key);
continue;
}
if is_valid_entry(&key, &info, &self.config.storage_dir).await {
if is_valid_entry(&key, &info.file, &self.config.storage_dir).await {
store.0.insert(key, info);
} else {
info!("Deleting file {}", key);
@ -108,16 +108,16 @@ impl crate::AppData {
/// Attempts to add a file to the store. Returns an I/O error if
/// something's broken, or a u64 of the maximum allowed file size
/// if the file was too big, or a unit if everything worked.
pub async fn add_file(&self, key: String, file: StoredFile) -> Result<(), FileAddError> {
pub async fn add_file(&self, key: String, entry: StoredFileWithPassword) -> Result<(), FileAddError> {
let mut store = self.state.write().await;
if store.full(self.config.max_storage_size) {
return Err(FileAddError::Full);
}
let available_size = store.available_size(self.config.max_storage_size);
if file.size > available_size {
if entry.file.size > available_size {
return Err(FileAddError::TooBig(available_size));
}
store.0.insert(key, file);
store.0.insert(key, entry);
Ok(())
}
@ -136,9 +136,9 @@ impl crate::AppData {
let now = OffsetDateTime::now_utc();
let mut store = self.state.write().await;
let old = std::mem::take(store.deref_mut());
for (key, file) in old.0.into_iter() {
if file.expiry > now {
store.0.insert(key, file);
for (key, value) in old.0.into_iter() {
if value.file.expiry > now {
store.0.insert(key, value);
} else {
info!("Deleting expired file {}", key);
delete_file_if_exists(&self.config.storage_dir.join(&key)).await?;
@ -150,7 +150,7 @@ impl crate::AppData {
impl StoredFiles {
fn total_size(&self) -> u64 {
self.0.iter().fold(0, |acc, (_, f)| acc + f.size)
self.0.iter().fold(0, |acc, (_, v)| acc + v.file.size)
}
pub fn available_size(&self, max_storage_size: u64) -> u64 {