(james-project) branch master updated: [FIX] Handle partial rows in attachmentV2

[rc...@apache.org]

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

Arsnael 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 98c4277aff [FIX] Handle partial rows in attachmentV2
98c4277aff is described below

commit 98c4277affb947b7b844d7fa47418dcfe863cf8b
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Mon Aug 17 20:23:14 2026 +0700

    [FIX] Handle partial rows in attachmentV2
---
 .../mailbox/cassandra/mail/CassandraAttachmentDAOV2.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java
index 995ba01bf9..f452219d7b 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java
@@ -49,6 +49,8 @@ import org.apache.james.mailbox.model.ContentType;
 import org.apache.james.mailbox.model.MessageId;
 import org.apache.james.mailbox.model.StringBackedAttachmentId;
 import org.apache.james.util.DurationParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
@@ -61,6 +63,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public class CassandraAttachmentDAOV2 {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CassandraAttachmentDAOV2.class);
     private static final Optional<Duration> TTL = Optional.ofNullable(System.getProperty("james.jmap.attachment.ttl", null))
         .map(DurationParser::parse);
 
@@ -137,6 +140,14 @@ public class CassandraAttachmentDAOV2 {
             attachment.getSize());
     }
 
+    private static boolean isWellFormed(Row row, AttachmentId attachmentId) {
+        if (row.getString(ID) == null || row.getString(BLOB_ID) == null) {
+            LOGGER.warn("Ignoring partially written attachment row {}", attachmentId.getId());
+            return false;
+        }
+        return true;
+    }
+
     private static DAOAttachment fromRow(Row row, BlobId.Factory blobIfFactory) {
         MessageId messageId = CassandraMessageId.Factory.of(row.getUuid(MESSAGE_ID));
 
@@ -212,6 +223,7 @@ public class CassandraAttachmentDAOV2 {
                 selectStatement.bind()
                     .setUuid(ID_AS_UUID, attachmentId.asUUID())
                     .setExecutionProfile(readProfile))
+            .filter(row -> isWellFormed(row, attachmentId))
             .map(row -> CassandraAttachmentDAOV2.fromRow(row, blobIdFactory));
     }
 
@@ -237,6 +249,8 @@ public class CassandraAttachmentDAOV2 {
 
     public Flux<BlobId> listBlobs() {
         return cassandraAsyncExecutor.executeRows(listBlobs.bind())
-            .map(row -> blobIdFactory.parse(row.getString(BLOB_ID)));
+            .map(row -> row.getString(BLOB_ID))
+            .filter(Objects::nonNull)
+            .map(blobIdFactory::parse);
     }
 }


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