Merge pull request #718 from apache/master

[pull] master from apache:master

Author: pull[bot]

mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java

@@ -55,6 +55,7 @@
 import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.MailboxACL.Right;
 import org.apache.james.mailbox.model.MailboxId;
+import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.model.MessageId;
 import org.apache.james.mailbox.model.MessageMetaData;
 import org.apache.james.mailbox.model.MessageMoves;
@@ -332,6 +333,10 @@ public Mono<Void> setInMailboxesReactive(MessageId messageId, Collection<Mailbox
                         LOGGER.info("Tried to access {} not accessible for {}", messageId, mailboxSession.getUser().asString());
                         return Mono.empty();
                     }
+                    if (refined.getPreviousMailboxes().isEmpty()) {
+                        MailboxPath unreadablePreviousMailbox = messageMove.getPreviousMailboxes().iterator().next().generateAssociatedPath();
+                        return Mono.error(() -> new MailboxNotFoundException(unreadablePreviousMailbox));
+                    }
                     if (refined.isChange()) {
                         return applyMessageMoves(mailboxSession, currentMailboxMessages, refined);
                     }

mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java

@@ -714,15 +714,15 @@ void setInMailboxesShouldDenyCopyingMessageFromNotReadSharedMailbox() throws Exc
             MailboxACL.EMPTY.apply(
                 MailboxACL.command()
                     .forUser(BOB)
-                    .rights(Rfc4314Rights.allExcept(Right.Read))
+                    .rights(Rfc4314Rights.allExcept(Right.Read)) // the shared mailbox does not share the Read right for Bob
                     .asAddition()),
             aliceSession);
         MessageId messageId = testingData.persist(aliceMailbox1.getMailboxId(), messageUid1, FLAGS, aliceSession);
 
-        //When
+        // When Bob copies the message from the Alice's shared mailbox to Bob's mailbox, it should fail
         assertThatThrownBy(() ->
             messageIdManager.setInMailboxes(messageId,
-                ImmutableList.of(aliceMailbox1.getMailboxId(), bobMailbox1.getMailboxId()),
+                ImmutableList.of(bobMailbox1.getMailboxId()),
                 bobSession))
             .isInstanceOf(MailboxNotFoundException.class);
 

server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala

@@ -6495,23 +6495,20 @@ trait EmailSetMethodContract {
   def emailSetDestroyShouldDestroyEmailWhenMovedIntoAnotherMailbox(server: GuiceJamesServer): Unit = {
     val mailboxProbe = server.getProbe(classOf[MailboxProbeImpl])
 
-    val andreMailbox: String = "andrecustom"
-    val andrePath = MailboxPath.forUser(ANDRE, andreMailbox)
-    val bobPath = MailboxPath.inbox(BOB)
-    mailboxProbe.createMailbox(andrePath)
-    val mailboxId: MailboxId = mailboxProbe.createMailbox(bobPath)
+    val mailbox: String = "custom"
+    val anotherMailbox: String = "anotherCustom"
+    mailboxProbe.createMailbox(MailboxPath.forUser(BOB, mailbox))
+    val anotherMailboxId = mailboxProbe.createMailbox(MailboxPath.forUser(BOB, anotherMailbox))
 
     val messageId: MessageId = mailboxProbe
-      .appendMessage(ANDRE.asString, andrePath,
+      .appendMessage(BOB.asString, MailboxPath.forUser(BOB, mailbox),
         AppendCommand.from(
           buildTestMessage))
       .getMessageId
 
-    server.getProbe(classOf[ACLProbeImpl])
-      .replaceRights(andrePath, BOB.asString, new MailboxACL.Rfc4314Rights(Right.Insert))
-
+    // Move message from mailbox to anotherMailbox
     server.getProbe(classOf[JmapGuiceProbe])
-      .setInMailboxes(messageId, BOB, mailboxId)
+      .setInMailboxes(messageId, BOB, anotherMailboxId)
 
     val request =
       s"""{

server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/memory/MemoryEmailSetMethodTest.java

@@ -28,7 +28,7 @@
 public class MemoryEmailSetMethodTest extends MemoryBase implements EmailSetMethodContract {
     @Override
     public MessageId randomMessageId() {
-        return InMemoryMessageId.of(ThreadLocalRandom.current().nextInt(100000) + 100);
+        return InMemoryMessageId.of(ThreadLocalRandom.current().nextInt(1000000) + 100);
     }
 
     @Override