You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2023/09/05 13:33:28 UTC

[james-project] branch master updated: JAMES-3938 IMAP MOVE should not fail on empty mailbox (#1713)

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git


The following commit(s) were added to refs/heads/master by this push:
     new 62179b0959 JAMES-3938 IMAP MOVE should not fail on empty mailbox (#1713)
62179b0959 is described below

commit 62179b0959bba223012415b1721d3cff9f1f1649
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Tue Sep 5 20:33:21 2023 +0700

    JAMES-3938 IMAP MOVE should not fail on empty mailbox (#1713)
---
 .../apache/james/mpt/imapmailbox/suite/Move.java   |  8 +++++
 .../org/apache/james/imap/scripts/MoveNoMSG.test   | 39 ++++++++++++++++++++++
 .../imap/processor/AbstractMailboxProcessor.java   | 14 ++++----
 .../processor/AbstractMessageRangeProcessor.java   |  3 +-
 .../james/imap/processor/ExpungeProcessor.java     |  4 ++-
 .../james/imap/processor/ReplaceProcessor.java     |  4 ++-
 .../james/imap/processor/StoreProcessor.java       |  4 ++-
 .../james/imap/processor/fetch/FetchProcessor.java |  3 +-
 8 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Move.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Move.java
index 1a207bfcee..a253df0419 100644
--- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Move.java
+++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/Move.java
@@ -56,4 +56,12 @@ public abstract class Move implements ImapTestConstants {
             .run("Move");
     }
 
+    @Test
+    public void emptyMoveShouldWork() throws Exception {
+        Assume.assumeTrue(system.supports(ImapFeatures.Feature.MOVE_SUPPORT));
+        simpleScriptedTestProtocol
+            .withLocale(Locale.US)
+            .run("MoveNoMSG");
+    }
+
 }
diff --git a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/MoveNoMSG.test b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/MoveNoMSG.test
new file mode 100644
index 0000000000..f1273e3c86
--- /dev/null
+++ b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/MoveNoMSG.test
@@ -0,0 +1,39 @@
+################################################################
+# Licensed to the Apache Software Foundation (ASF) under one   #
+# or more contributor license agreements.  See the NOTICE file #
+# distributed with this work for additional information        #
+# regarding copyright ownership.  The ASF licenses this file   #
+# to you under the Apache License, Version 2.0 (the            #
+# "License"); you may not use this file except in compliance   #
+# with the License.  You may obtain a copy of the License at   #
+#                                                              #
+#   http://www.apache.org/licenses/LICENSE-2.0                 #
+#                                                              #
+# Unless required by applicable law or agreed to in writing,   #
+# software distributed under the License is distributed on an  #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       #
+# KIND, either express or implied.  See the License for the    #
+# specific language governing permissions and limitations      #
+# under the License.                                           #
+################################################################
+
+C: a0 CAPABILITY
+S: \* CAPABILITY .* MOVE .*
+S: a0 OK CAPABILITY completed.
+
+C: a1 CREATE moved
+S: a1 OK \[MAILBOXID \(.+\)\] CREATE completed.
+
+C: a7 SELECT moved
+S: \* OK \[MAILBOXID \(.+\)\] Ok
+S: \* FLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\Seen\)
+S: \* \d+ EXISTS
+S: \* \d+ RECENT
+S: \* OK \[UIDVALIDITY \d+\].*
+S: \* OK \[PERMANENTFLAGS \(\\Answered \\Deleted \\Draft \\Flagged \\\Seen( \\\*)?\)\].*
+S: \* OK \[HIGHESTMODSEQ \d+\].*
+S: \* OK \[UIDNEXT \d+\].*
+S: a7 OK \[READ-WRITE\] SELECT completed.
+
+C: a4 UID MOVE 1 selected
+S: a4 BAD MOVE failed. Invalid messageset.
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
index b4b314dc51..9275241485 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
@@ -412,28 +412,28 @@ public abstract class AbstractMailboxProcessor<R extends ImapRequest> extends Ab
      * Return a {@link MessageRange} for the given values. If the MessageRange
      * can not be generated a {@link MailboxException} will get thrown
      */
-    protected MessageRange messageRange(SelectedMailbox selected, IdRange range, boolean useUids) throws MessageRangeException {
+    protected Optional<MessageRange> messageRange(SelectedMailbox selected, IdRange range, boolean useUids) throws MessageRangeException {
         long lowVal = range.getLowVal();
         long highVal = range.getHighVal();
 
-        if (useUids == false) {
-            return msnRangeToMessageRange(selected, lowVal, highVal);
+        if (!useUids) {
+            return Optional.of(msnRangeToMessageRange(selected, lowVal, highVal));
         } else {
             if (selected.existsCount() <= 0) {
-                return null;
+                return Optional.empty();
             }
             // Take care of "*" and "*:*" values by return the last message in
             // the mailbox. See IMAP-289
             MessageUid lastUid = selected.getLastUid().orElse(MessageUid.MIN_VALUE);
             if (lowVal == Long.MAX_VALUE && highVal == Long.MAX_VALUE) {
-                return MessageRange.one(lastUid);
+                return Optional.of(MessageRange.one(lastUid));
             } else if (highVal == Long.MAX_VALUE && lastUid.compareTo(MessageUid.of(lowVal)) < 0) {
                 // Sequence uid ranges which use *:<uid-higher-then-last-uid>
                 // MUST return at least the highest uid in the mailbox
                 // See IMAP-291
-                return MessageRange.one(lastUid);
+                return Optional.of(MessageRange.one(lastUid));
             } 
-            return MessageRange.range(MessageUid.of(lowVal), MessageUid.of(highVal));
+            return Optional.of(MessageRange.range(MessageUid.of(lowVal), MessageUid.of(highVal)));
         }
     }
 
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
index 2940b788d0..fb55036ed5 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java
@@ -99,7 +99,8 @@ public abstract class AbstractMessageRangeProcessor<R extends AbstractMessageRan
                     UidValidity uidValidity = target.getMailboxEntity().getUidValidity();
                     return Flux.fromArray(request.getIdSet())
                         .map(Throwing.<IdRange, MessageRange>function(
-                            range -> messageRange(session.getSelected(), range, request.isUseUids()))
+                            range -> messageRange(session.getSelected(), range, request.isUseUids())
+                                .orElseThrow(() -> new MessageRangeException(range.getFormattedString() + " is an invalid range")))
                             .sneakyThrow())
                         .filter(Objects::nonNull)
                         .concatMap(range -> process(target.getId(), session.getSelected(), mailboxSession, range)
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
index e39c54259f..2636cd1c4c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
@@ -98,7 +98,9 @@ public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> i
             // Handle UID EXPUNGE which is part of UIDPLUS
             // See http://tools.ietf.org/html/rfc4315
             return Flux.fromIterable(ImmutableList.copyOf(ranges))
-                .map(Throwing.<IdRange, MessageRange>function(range -> messageRange(session.getSelected(), range, true)).sneakyThrow())
+                .map(Throwing.<IdRange, MessageRange>function(range -> messageRange(session.getSelected(), range, true)
+                    .orElseThrow(() -> new MessageRangeException(range.getFormattedString() + " is an invalid range")))
+                    .sneakyThrow())
                 .concatMap(range -> expunge(mailbox, range, session, mailboxSession))
                 .reduce(Integer::sum);
         }
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ReplaceProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ReplaceProcessor.java
index 94da5f6f57..d2f573d2d4 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ReplaceProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ReplaceProcessor.java
@@ -120,7 +120,9 @@ public class ReplaceProcessor extends AbstractMailboxProcessor<ReplaceRequest> i
 
     private Mono<Void> deleteBaseMessage(ReplaceRequest request, ImapSession session) {
         try {
-            ImmutableList<MessageUid> uids = Iterators.toStream(messageRange(session.getSelected(), new IdRange(request.getId()), request.isUseUid()).iterator())
+            ImmutableList<MessageUid> uids = Iterators.toStream(messageRange(session.getSelected(), new IdRange(request.getId()), request.isUseUid())
+                    .orElseThrow(() -> new MessageRangeException((request.getId() + " is an invalid range")))
+                    .iterator())
                 .collect(ImmutableList.toImmutableList());
 
             return getSelectedMailboxReactive(session)
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
index 2fe3a33d48..745803a8b8 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
@@ -95,7 +95,9 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
 
         return getSelectedMailboxReactive(session)
             .flatMap(mailbox -> Flux.fromIterable(ImmutableList.copyOf(idSet))
-                .map(Throwing.<IdRange, MessageRange>function(idRange -> messageRange(selected, idRange, request.isUseUids())).sneakyThrow())
+                .map(Throwing.<IdRange, MessageRange>function(idRange -> messageRange(selected, idRange, request.isUseUids())
+                    .orElseThrow(() -> new MessageRangeException(idRange.getFormattedString() + " is an invalid range")))
+                    .sneakyThrow())
                 .concatMap(messageSet -> handleRange(request, session, responder, selected, mailbox, mailboxSession, failed, failedMsns, userFlags, messageSet))
                 .then())
             .then(unsolicitedResponses(session, responder, omitExpunged, request.isUseUids()))
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
index efc324e648..28b967e942 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
@@ -125,7 +125,8 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
         List<MessageRange> ranges = new ArrayList<>();
 
         for (IdRange range : request.getIdSet()) {
-            MessageRange messageSet = messageRange(session.getSelected(), range, request.isUseUids());
+            MessageRange messageSet = messageRange(session.getSelected(), range, request.isUseUids())
+                .orElseThrow(() -> new MessageRangeException(range.getFormattedString() + " is an invalid range"));
             if (messageSet != null) {
                 MessageRange normalizedMessageSet = normalizeMessageRange(selected, messageSet);
                 MessageRange batchedMessageSet = MessageRange.range(normalizedMessageSet.getUidFrom(), normalizedMessageSet.getUidTo());


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org