Wire sidecar profile data isolation

This commit is contained in:
2026-05-08 22:10:10 -04:00
parent 2bd94710df
commit 8334fcbd6e
16 changed files with 523 additions and 141 deletions
+3
View File
@@ -14,6 +14,9 @@ pub enum DomainError {
#[error("invalid file name: {value}")]
InvalidFileName { value: String },
#[error("invalid {kind} id: {value}")]
InvalidEntityId { kind: &'static str, value: String },
#[error("invalid {algorithm} download checksum: {value}")]
InvalidDownloadChecksum { algorithm: &'static str, value: String },
+57
View File
@@ -1,5 +1,6 @@
use std::fmt;
use crate::DomainError;
use uuid::Uuid;
macro_rules! entity_id {
@@ -13,6 +14,22 @@ macro_rules! entity_id {
Self(format!("{}_{}", $prefix, Uuid::now_v7().simple()))
}
pub fn parse(value: impl Into<String>) -> Result<Self, DomainError> {
let value = value.into();
let trimmed = value.trim();
if trimmed.is_empty() {
return Err(DomainError::EmptyField { field: concat!($prefix, "_id") });
}
if !is_valid_entity_id(trimmed, $prefix) {
return Err(DomainError::InvalidEntityId {
kind: $prefix,
value: trimmed.to_string(),
});
}
Ok(Self(trimmed.to_string()))
}
#[must_use]
pub fn as_str(&self) -> &str {
&self.0
@@ -33,6 +50,14 @@ macro_rules! entity_id {
};
}
fn is_valid_entity_id(value: &str, prefix: &str) -> bool {
let Some(suffix) = value.strip_prefix(prefix).and_then(|value| value.strip_prefix('_')) else {
return false;
};
suffix.len() == 32 && suffix.as_bytes().iter().all(|byte| byte.is_ascii_hexdigit())
}
entity_id!(TabId, "tab");
entity_id!(SpaceId, "space");
entity_id!(ProfileId, "profile");
@@ -43,3 +68,35 @@ entity_id!(DownloadId, "download");
entity_id!(BookmarkId, "bookmark");
entity_id!(ReadingListId, "reading");
entity_id!(NoteId, "note");
#[cfg(test)]
mod tests {
use super::{ProfileId, TabId};
use crate::DomainError;
#[test]
fn parses_existing_entity_id() -> Result<(), DomainError> {
let profile_id = ProfileId::new();
let parsed = ProfileId::parse(profile_id.as_str())?;
assert_eq!(parsed, profile_id);
Ok(())
}
#[test]
fn rejects_wrong_entity_prefix() {
let tab_id = TabId::new();
let result = ProfileId::parse(tab_id.as_str());
assert!(
matches!(result, Err(DomainError::InvalidEntityId { kind, .. }) if kind == "profile")
);
}
#[test]
fn rejects_empty_entity_id() {
let result = ProfileId::parse(" ");
assert_eq!(result, Err(DomainError::EmptyField { field: "profile_id" }));
}
}