commit 14a6affbc1f75450d325d1941865a0061ce74061
author Benoit TELLIER <btellier@linagora.com> Mon May 06 13:52:02 2024 +0200
committer Rene Cordier <rene.cordier@gmail.com> Tue May 07 10:01:06 2024 +0700
tree b54e54651d9569c1490a59c95426a42864ec5f9d
parent 4eb3385e3086720c733e5c65dde39fc21a0488e0

[ENHANCEMENT] Use the correct AES segment size

Prevent needless copies / reallocations

server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/AESBlobStoreDAO.java

diff --git a/server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/AESBlobStoreDAO.java b/server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/AESBlobStoreDAO.java
index cabbee8..17803c4 100644
--- a/server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/AESBlobStoreDAO.java
+++ b/server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/AESBlobStoreDAO.java
@@ -112,9 +112,8 @@
         return Mono.from(underlying.readBytes(bucketName, blobId))
             .map(Throwing.function(bytes -> {
                 InputStream inputStream = decrypt(new ByteArrayInputStream(bytes));
-                int aesPadding = 128;
                 try (UnsynchronizedByteArrayOutputStream outputStream = UnsynchronizedByteArrayOutputStream.builder()
-                    .setBufferSize(bytes.length + aesPadding)
+                    .setBufferSize(bytes.length + PBKDF2StreamingAeadFactory.SEGMENT_SIZE)
                     .get()) {
                     IOUtils.copy(inputStream, outputStream);
                     return outputStream.toByteArray();

server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/PBKDF2StreamingAeadFactory.java

diff --git a/server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/PBKDF2StreamingAeadFactory.java b/server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/PBKDF2StreamingAeadFactory.java
index 7c82983..b4bffb8 100644
--- a/server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/PBKDF2StreamingAeadFactory.java
+++ b/server/blob/blob-aes/src/main/java/org/apache/james/blob/aes/PBKDF2StreamingAeadFactory.java
@@ -35,7 +35,7 @@
     private static final String SECRET_KEY_FACTORY_ALGORITHM = "PBKDF2WithHmacSHA512";
     private static final String HKDF_ALGO = "HmacSha256";
     private static final int KEY_SIZE_IN_BYTES = 32;
-    private static final int SEGMENT_SIZE = 4096;
+    static final int SEGMENT_SIZE = 4096;
     private static final int OFFSET = 0;
     public static final byte[] EMPTY_ASSOCIATED_DATA = new byte[0];