sdgoij/stalwart
1
0
Fork 0
mirror of https://github.com/stalwartlabs/stalwart.git synced 2026-03-17 14:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

JMAP Calendar: Do not update invalid calendar identities

Browse Source
This commit is contained in:
mdecimus
2026-01-16 17:14:39 -03:00
parent 69029c8806
commit 9c33913eae
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
crates/jmap/src/participant_identity/set.rs
View File

@@ -199,7 +199,7 @@ fn validate_identity_value(
identity: &mut ParticipantIdentity,
allowed_emails: &AHashSet<String>,
) -> Result<(), SetError<ParticipantIdentityProperty>> {
let mut changed_address = false;
let mut changed_address = None;
for (property, value) in update.into_expanded_object() {
let Key::Property(property) = property else {
return Err(SetError::invalid_properties()
@@ -213,8 +213,7 @@ fn validate_identity_value(
}
(ParticipantIdentityProperty::CalendarAddress, Value::Str(value)) => {
if identity.calendar_address != value {
changed_address = true;
identity.calendar_address = value.into_owned();
changed_address = Some(value);
}
}
(property, _) => {
@@ -226,31 +225,31 @@ fn validate_identity_value(
}
// Validate email address
if !identity.calendar_address.is_empty() {
if !changed_address {
return Ok(());
}
if let Some(new_address) = changed_address {
let email = if let Some(email) = new_address.strip_prefix("mailto:") {
sanitize_email(email)
} else {
sanitize_email(&new_address)
};
let email = if let Some(email) = identity.calendar_address.strip_prefix("mailto:") {
sanitize_email(email)
} else {
sanitize_email(&identity.calendar_address)
};
if let Some(email) = email {
if allowed_emails.iter().any(|e| e == &email) {
identity.calendar_address = format!("mailto:{email}");
Ok(())
if let Some(email) = email {
if allowed_emails.iter().any(|e| e == &email) {
identity.calendar_address = format!("mailto:{email}");
Ok(())
} else {
Err(SetError::invalid_properties()
.with_property(ParticipantIdentityProperty::CalendarAddress)
.with_description(
"Calendar address not configured for this account.".to_string(),
))
}
} else {
Err(SetError::invalid_properties()
.with_property(ParticipantIdentityProperty::CalendarAddress)
.with_description(
"Calendar address not configured for this account.".to_string(),
))
.with_description("Invalid or missing calendar address.".to_string()))
}
} else {
Err(SetError::invalid_properties()
.with_property(ParticipantIdentityProperty::CalendarAddress)
.with_description("Invalid or missing calendar address.".to_string()))
Ok(())
}
} else {
Err(SetError::invalid_properties()