stalwartlabs/mail-server
1
1
Fork 0
mirror of https://github.com/stalwartlabs/mail-server.git synced 2024-09-20 07:16:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore Inbox case on Sieve's fileinto (fixes #725)
Some checks failed
trivy / Check (push) Failing after -8m46s
Details

Browse source
This commit is contained in:
mdecimus 2024-09-07 15:16:25 +02:00
parent 0db8611ce7
commit efbddd1cdd
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/jmap/src/mailbox/get.rs
View file

@ -375,9 +375,13 @@ impl JMAP {
.await?
.and_then(|ep| {
let mut next_parent_id = 0;
'outer: for name in ep.path {
'outer: for (pos, name) in ep.path.iter().enumerate() {
let is_inbox = pos == 0 && name.eq_ignore_ascii_case("inbox");
for (part, parent_id, document_id) in &ep.found_names {
if part.eq(name) && *parent_id == next_parent_id {
if (part.eq(name) || (is_inbox && part.eq_ignore_ascii_case("inbox")))
&& *parent_id == next_parent_id
{
next_parent_id = *document_id;
continue 'outer;
}

12
crates/jmap/src/mailbox/set.rs
View file

@ -839,10 +839,14 @@ impl JMAP {
};
let mut next_parent_id = 0;
let mut path = expanded_path.path.into_iter().peekable();
'outer: while let Some(name) = path.peek() {
let mut path = expanded_path.path.into_iter().enumerate().peekable();
'outer: while let Some((pos, name)) = path.peek() {
let is_inbox = *pos == 0 && name.eq_ignore_ascii_case("inbox");
for (part, parent_id, document_id) in &expanded_path.found_names {
if part.eq(name) && *parent_id == next_parent_id {
if (part.eq(name) || (is_inbox && part.eq_ignore_ascii_case("inbox")))
&& *parent_id == next_parent_id
{
next_parent_id = *document_id;
path.next();
continue 'outer;
@ -855,7 +859,7 @@ impl JMAP {
if path.peek().is_some() {
let mut changes = self.begin_changes(account_id).await?;
for name in path {
for (_, name) in path {
if name.len() > self.core.jmap.mailbox_name_max_len {
return Ok(None);
}