Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(email): truncate long attachment names to the DSS limit (#7893)

teo34cfbc53f5ed
diff --git a/Cargo.lock b/Cargo.lock
index 847e64d6e2..1748cd7671 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7171,6 +7171,7 @@ dependencies = [
"tower-http",
"tracing",
"unfurl",
+ "unicode-segmentation",
"url",
"urlencoding",
"utoipa",
diff --git a/crates/documents/src/domain/service.rs b/crates/documents/src/domain/service.rs
index de27ea82ed..fada125ed9 100644
--- a/crates/documents/src/domain/service.rs
+++ b/crates/documents/src/domain/service.rs
@@ -40,6 +40,7 @@ use macro_user_id::user_id::MacroUserIdStr;
use model::document::response::{DocumentResponseMetadata, LocationResponseData};
use model::document::{
ContentType, DocumentBasic, DocumentMetadata, FileAssociation, FileType, FileTypeExt,
+ MAX_DOCUMENT_NAME_GRAPHEMES,
};
use model::response::PresignedUrl;
use model_owner::{CreationPrincipal, Owner};
@@ -212,8 +213,6 @@ fn published_document_actors(auth: &EntityAccessAuth) -> PublishedDocumentActors
}
}
-const MAX_DOCUMENT_NAME_GRAPHEMES: usize = 200;
-
fn short_id_for_entity_id(entity_id: &str) -> Result<String, DocumentError> {
let uuid = macro_uuid::string_to_uuid(entity_id)
.map_err(|e| DocumentError::BadRequest(format!("invalid entity_id: {e}")))?;
diff --git a/crates/model/src/document.rs b/crates/model/src/document.rs
index 2ede4268d4..7f145b6381 100644
--- a/crates/model/src/document.rs
+++ b/crates/model/src/document.rs
@@ -23,6 +23,9 @@ mod document_family;
pub use document_family::DocumentFamily;
use models_permissions::share_permission::access_level::AccessLevel;
+/// The longest document name DSS accepts, counted in extended grapheme clusters.
+pub const MAX_DOCUMENT_NAME_GRAPHEMES: usize = 200;
+
#[derive(Debug, serde::Serialize, serde::Deserialize, ToSchema)]
pub struct DocumentPermissionsToken {
/// The users id if present
diff --git a/services/email_service/Cargo.toml b/services/email_service/Cargo.toml
index 85c50826a0..3db999353d 100644
--- a/services/email_service/Cargo.toml
+++ b/services/email_service/Cargo.toml
@@ -177,6 +177,7 @@ tower-http = { workspace = true, features = [
"compression-gzip",
] }
tracing = { workspace = true }
+unicode-segmentation = { workspace = true }
url = { workspace = true }
urlencoding = { workspace = true }
utoipa = { workspace = true }
diff --git a/services/email_service/src/util/upload_attachment.rs b/services/email_service/src/util/upload_attachment.rs
index 293533f375..25f38fc4f7 100644
--- a/services/email_service/src/util/upload_attachment.rs
+++ b/services/email_service/src/util/upload_attachment.rs
@@ -5,6 +5,7 @@ use document_storage_service_client::DocumentStorageServiceClient;
use email_api_client::domain::models::EmailApiError;
use macro_user_id::cowlike::ArcCowStr;
use macro_user_id::user_id::MacroUserId;
+use model::document::MAX_DOCUMENT_NAME_GRAPHEMES;
use model::document::response::{CreateDocumentRequest, CreateDocumentResponse};
use models_email::service::attachment::{
AttachmentSfs, AttachmentUploadArgs, AttachmentUploadMetadata,
@@ -18,8 +19,12 @@ use system_properties::{
SystemPropertiesService, SystemPropertiesServiceImpl,
};
use thiserror::Error;
+use unicode_segmentation::UnicodeSegmentation;
use uuid::Uuid;
+#[cfg(test)]
+mod test;
+
#[derive(Error, Debug)]
pub enum UploadAttachmentError {
#[error("Gmail API rate limit exceeded")]
@@ -210,8 +215,8 @@ fn determine_file_metadata(
let file_name = original_file_name
.split('.')
.next()
- .unwrap_or(original_file_name)
- .to_string();
+ .unwrap_or(original_file_name);
+ let file_name = truncate_document_name(file_name).to_string();
let file_type = match original_file_name
.rsplit_once('.')
@@ -239,6 +244,13 @@ fn determine_file_metadata(
Ok((file_name, file_type))
}
+/// DSS rejects longer names, so keep only the leading graphemes rather than drop the attachment.
+fn truncate_document_name(name: &str) -> &str {
+ name.grapheme_indices(true)
+ .nth(MAX_DOCUMENT_NAME_GRAPHEMES)
+ .map_or(name, |(end, _)| &name[..end])
+}
+
/// Creates a document record in the Document Storage Service (DSS) and returns the response,
/// which includes the presigned URL for the upload.
async fn create_dss_document_record(
diff --git a/services/email_service/src/util/upload_attachment/test.rs b/services/email_service/src/util/upload_attachment/test.rs
new file mode 100644
index 0000000000..1e2854673e
--- /dev/null
+++ b/services/email_service/src/util/upload_attachment/test.rs
@@ -0,0 +1,38 @@
+use super::*;
+
+fn metadata(filename: &str) -> AttachmentUploadMetadata {
+ AttachmentUploadMetadata {
+ attachment_db_id: Uuid::nil(),
+ email_provider_id: String::new(),
+ provider_attachment_id: String::new(),
+ mime_type: "application/pdf".to_string(),
+ filename: Some(filename.to_string()),
+ internal_date_ts: Default::default(),
+ message_db_id: Uuid::nil(),
+ thread_db_id: Uuid::nil(),
+ sender_email: String::new(),
+ subject: None,
+ }
+}
+
+fn check(filename: &str, expected_name: &str) {
+ let (name, file_type) = determine_file_metadata(&metadata(filename)).unwrap();
+
+ assert_eq!(name, expected_name, "name for {filename:?}");
+ assert_eq!(file_type, "pdf", "file type for {filename:?}");
+ assert!(name.graphemes(true).count() <= MAX_DOCUMENT_NAME_GRAPHEMES);
+}
+
+#[test]
+fn short_names_are_unchanged() {
+ check("report.pdf", "report");
+ check(&format!("{}.pdf", "a".repeat(200)), &"a".repeat(200));
+}
+
+#[test]
+fn long_names_keep_the_leading_graphemes_dss_accepts() {
+ // Each unit is one grapheme: ASCII, a two-byte char, a combining mark, and a ZWJ sequence.
+ for unit in ["a", "\u{e9}", "e\u{301}", "👨‍👩‍👧"] {
+ check(&format!("{}.pdf", unit.repeat(250)), &unit.repeat(200));
+ }
+}