Fix Max Size Validation on First Upload (#743)

Co-authored-by: hyperspace-insights[bot] <209611008+hyperspace-insights[bot]@users.noreply.github.com>

Author: Schmarvinius

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/ModifyApplicationHandlerHelper.java

@@ -6,21 +6,20 @@
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor;
 import com.sap.cds.CdsDataProcessor.Converter;
-import com.sap.cds.CdsDataProcessor.Filter;
 import com.sap.cds.feature.attachments.generated.cds4j.sap.attachments.Attachments;
 import com.sap.cds.feature.attachments.handler.applicationservice.modifyevents.ModifyAttachmentEvent;
 import com.sap.cds.feature.attachments.handler.applicationservice.modifyevents.ModifyAttachmentEventFactory;
 import com.sap.cds.feature.attachments.handler.applicationservice.readhelper.CountingInputStream;
 import com.sap.cds.feature.attachments.handler.common.ApplicationHandlerHelper;
 import com.sap.cds.ql.cqn.Path;
+import com.sap.cds.reflect.CdsAnnotation;
 import com.sap.cds.reflect.CdsEntity;
 import com.sap.cds.services.ErrorStatuses;
 import com.sap.cds.services.EventContext;
 import com.sap.cds.services.ServiceException;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
 
 public final class ModifyApplicationHandlerHelper {
 
@@ -30,11 +29,6 @@ public final class ModifyApplicationHandlerHelper {
   /** Effectively unlimited max size when no malware scanner binding is present. */
   public static final String UNLIMITED_SIZE = String.valueOf(Long.MAX_VALUE);
 
-  private static final Filter VALMAX_FILTER =
-      (path, element, type) ->
-          element.getName().contentEquals("content")
-              && element.findAnnotation("Validation.Maximum").isPresent();
-
   /**
    * Handles attachments for entities.
    *
@@ -94,7 +88,7 @@ public static InputStream handleAttachmentForEntity(
     Attachments attachment = getExistingAttachment(keys, existingAttachments);
     String contentId = (String) path.target().values().get(Attachments.CONTENT_ID);
     String contentLength = eventContext.getParameterInfo().getHeader("Content-Length");
-    String maxSizeStr = getValMaxValue(path.target().entity(), existingAttachments, defaultMaxSize);
+    String maxSizeStr = getValMaxValue(path.target().entity(), defaultMaxSize);
     eventContext.put(
         "attachment.MaxSize",
         maxSizeStr); // make max size available in context for error handling later
@@ -125,23 +119,14 @@ public static InputStream handleAttachmentForEntity(
     }
   }
 
-  private static String getValMaxValue(
-      CdsEntity entity, List<? extends CdsData> data, String defaultMaxSize) {
-    AtomicReference<String> annotationValue = new AtomicReference<>();
-    CdsDataProcessor.create()
-        .addValidator(
-            VALMAX_FILTER,
-            (path, element, value) ->
-                element
-                    .findAnnotation("Validation.Maximum")
-                    .ifPresent(
-                        annotation -> {
-                          if (annotation.getValue() != null && annotation.getValue() != "true") {
-                            annotationValue.set(annotation.getValue().toString());
-                          }
-                        }))
-        .process(data, entity);
-    return annotationValue.get() == null ? defaultMaxSize : annotationValue.get();
+  private static String getValMaxValue(CdsEntity entity, String defaultMaxSize) {
+    return entity
+        .findElement("content")
+        .flatMap(e -> e.findAnnotation("Validation.Maximum"))
+        .map(CdsAnnotation::getValue)
+        .filter(v -> !"true".equals(v.toString()))
+        .map(Object::toString)
+        .orElse(defaultMaxSize);
   }
 
   private static Attachments getExistingAttachment(

cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/ModifyApplicationHandlerHelperTest.java

@@ -79,7 +79,7 @@ void serviceExceptionDueToContentLength() {
     // Set Content-Length header to exceed 10KB (10240 bytes)
     when(parameterInfo.getHeader("Content-Length")).thenReturn("20000");
 
-    var existingAttachments = List.of(attachment);
+    var existingAttachments = List.<Attachments>of();
 
     // Act & Assert
     var exception =
@@ -133,7 +133,7 @@ void serviceExceptionDueToLimitExceeded() {
               return null;
             });
 
-    var existingAttachments = List.of(attachment);
+    var existingAttachments = List.<Attachments>of();
 
     // Act & Assert
     var exception =

integration-tests/srv/src/test/java/com/sap/cds/feature/attachments/integrationtests/draftservice/SizeLimitedAttachmentsSizeValidationDraftTest.java

@@ -51,6 +51,41 @@ void uploadContentExceeding5MBLimitFails() throws Exception {
     // Assert: Error response with HTTP 413 status code indicates size limit exceeded
   }
 
+  @Test
+  void uploadContentWithinLimitAndActivateDraftSucceeds() throws Exception {
+    // Arrange: Create draft with sizeLimitedAttachments (no prior activation)
+    var draftRoot = createNewDraftWithSizeLimitedAttachments();
+    var attachment = draftRoot.getSizeLimitedAttachments().get(0);
+
+    // Act: Upload 3MB content (within 5MB limit)
+    byte[] content = new byte[3 * 1024 * 1024]; // 3MB
+    var url = buildDraftSizeLimitedAttachmentContentUrl(draftRoot.getId(), attachment.getId());
+    requestHelper.setContentType(org.springframework.http.MediaType.APPLICATION_OCTET_STREAM);
+    requestHelper.executePutWithMatcher(url, content, status().isNoContent());
+
+    // Assert: Draft activation succeeds
+    requestHelper.setContentType(org.springframework.http.MediaType.APPLICATION_JSON);
+    var rootUrl = getRootUrl(draftRoot.getId(), false);
+    var draftPrepareUrl = rootUrl + "/TestDraftService.draftPrepare";
+    var draftActivateUrl = rootUrl + "/TestDraftService.draftActivate";
+    requestHelper.executePostWithMatcher(
+        draftPrepareUrl, "{\"SideEffectsQualifier\":\"\"}", status().isOk());
+    requestHelper.executePostWithMatcher(draftActivateUrl, "{}", status().isOk());
+  }
+
+  @Test
+  void uploadContentExceedingLimitOnFirstDraftRejects() throws Exception {
+    // Arrange: Create draft with sizeLimitedAttachments (no prior activation)
+    var draftRoot = createNewDraftWithSizeLimitedAttachments();
+    var attachment = draftRoot.getSizeLimitedAttachments().get(0);
+
+    // Act & Assert: Upload 6MB content to a brand-new draft attachment fails immediately
+    byte[] content = new byte[6 * 1024 * 1024]; // 6MB
+    var url = buildDraftSizeLimitedAttachmentContentUrl(draftRoot.getId(), attachment.getId());
+    requestHelper.setContentType(org.springframework.http.MediaType.APPLICATION_OCTET_STREAM);
+    requestHelper.executePutWithMatcher(url, content, status().is(413));
+  }
+
   // Helper methods
   private DraftRoots createNewDraftWithSizeLimitedAttachments() throws Exception {
     // Create new draft

pom.xml

@@ -75,8 +75,8 @@
     <cds.cdsdk-version>9.6.1</cds.cdsdk-version>
 
     <!-- Latest versions of CAP Java and cds-dk used for integrations tests only -->
-    <cds.services.latest-test-version>4.6.1</cds.services.latest-test-version>
-    <cds.cdsdk.latest-test-version>9.6.1</cds.cdsdk.latest-test-version>
+    <cds.services.latest-test-version>4.8.0</cds.services.latest-test-version>
+    <cds.cdsdk.latest-test-version>9.7.2</cds.cdsdk.latest-test-version>
 
     <spotless.check.skip>true</spotless.check.skip>
   </properties>