Skip to content

Commit c394fa6

Browse files
committed
Creating a mailbox in a shared folder results in wrong hierarchy (fixes #1128)
1 parent 84d3c82 commit c394fa6

File tree

22 files changed

+60
-61
lines changed

22 files changed

+60
-61
lines changed

Cargo.lock

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Stalwart Labs Ltd. <[email protected]>"]
55
license = "AGPL-3.0-only OR LicenseRef-SEL"
66
repository = "https://github.com/stalwartlabs/cli"
77
homepage = "https://github.com/stalwartlabs/cli"
8-
version = "0.11.2"
8+
version = "0.11.4"
99
edition = "2021"
1010
readme = "README.md"
1111
resolver = "2"

crates/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "common"
3-
version = "0.11.2"
3+
version = "0.11.4"
44
edition = "2021"
55
resolver = "2"
66

crates/directory/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "directory"
3-
version = "0.11.2"
3+
version = "0.11.4"
44
edition = "2021"
55
resolver = "2"
66

crates/email/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "email"
3-
version = "0.11.2"
3+
version = "0.11.4"
44
edition = "2021"
55
resolver = "2"
66

crates/imap-proto/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "imap_proto"
3-
version = "0.11.2"
3+
version = "0.11.4"
44
edition = "2021"
55
resolver = "2"
66

crates/imap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "imap"
3-
version = "0.11.2"
3+
version = "0.11.4"
44
edition = "2021"
55
resolver = "2"
66

crates/imap/src/op/create.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,16 +297,15 @@ impl<T: SessionStream> SessionData<T> {
297297
let mut parent_mailbox_name = None;
298298
let (account_id, path) = {
299299
let mailboxes = self.mailboxes.lock();
300-
let first_path_item = path.first().unwrap();
301-
let account = if first_path_item == &self.server.core.jmap.shared_folder {
300+
let account = if path.first() == Some(&self.server.core.jmap.shared_folder.as_str()) {
302301
// Shared Folders/<username>/<folder>
303302
if path.len() < 3 {
304303
return Err(trc::ImapEvent::Error
305304
.into_err()
306305
.details("Mailboxes under root shared folders are not allowed.")
307306
.code(ResponseCode::Cannot));
308307
}
309-
let prefix = Some(format!("{}/{}", first_path_item, path[1]));
308+
let prefix = Some(format!("{}/{}", path.remove(0), path.remove(0)));
310309

311310
// Locate account
312311
if let Some(account) = mailboxes

crates/jmap-proto/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "jmap_proto"
3-
version = "0.11.2"
3+
version = "0.11.4"
44
edition = "2021"
55
resolver = "2"
66

crates/jmap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "jmap"
3-
version = "0.11.2"
3+
version = "0.11.4"
44
edition = "2021"
55
resolver = "2"
66

0 commit comments

Comments
 (0)