fixes after review. validateCustomApplication moved back.

epam · Nov 20, 2024 · 53cbc0a · 53cbc0a
1 parent dbdd938
commit 53cbc0a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/server/src/main/java/com/epam/aidial/core/server/controller/ResourceController.java b/server/src/main/java/com/epam/aidial/core/server/controller/ResourceController.java
@@ -1,19 +1,23 @@
 package com.epam.aidial.core.server.controller;
 
 import com.epam.aidial.core.config.Application;
+import com.epam.aidial.core.config.Config;
 import com.epam.aidial.core.server.Proxy;
 import com.epam.aidial.core.server.ProxyContext;
 import com.epam.aidial.core.server.data.Conversation;
 import com.epam.aidial.core.server.data.Prompt;
 import com.epam.aidial.core.server.data.ResourceTypes;
 import com.epam.aidial.core.server.security.AccessService;
+import com.epam.aidial.core.server.security.EncryptionService;
 import com.epam.aidial.core.server.service.ApplicationService;
 import com.epam.aidial.core.server.service.InvitationService;
 import com.epam.aidial.core.server.service.PermissionDeniedException;
 import com.epam.aidial.core.server.service.ResourceNotFoundException;
 import com.epam.aidial.core.server.service.ShareService;
+import com.epam.aidial.core.server.util.CustomApplicationUtils;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.epam.aidial.core.server.util.ResourceDescriptorFactory;
+import com.epam.aidial.core.server.validation.CustomAppValidationException;
 import com.epam.aidial.core.storage.data.MetadataBase;
 import com.epam.aidial.core.storage.data.ResourceItemMetadata;
 import com.epam.aidial.core.storage.http.HttpException;
@@ -26,19 +30,22 @@
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
+import jakarta.validation.ValidationException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import static com.epam.aidial.core.storage.http.HttpStatus.BAD_REQUEST;
+import static com.epam.aidial.core.storage.http.HttpStatus.INTERNAL_SERVER_ERROR;
 
 @Slf4j
 @SuppressWarnings("checkstyle:Indentation")
 public class ResourceController extends AccessControlBaseController {
 
     private final Vertx vertx;
+    private final EncryptionService encryptionService;
     private final ResourceService resourceService;
     private final ShareService shareService;
     private final LockService lockService;
@@ -51,6 +58,7 @@ public ResourceController(Proxy proxy, ProxyContext context, boolean metadata) {
         // PUT and DELETE require write access, GET - read
         super(proxy, context, !HttpMethod.GET.equals(context.getRequest().method()));
         this.vertx = proxy.getVertx();
+        this.encryptionService = proxy.getEncryptionService();
         this.applicationService = proxy.getApplicationService();
         this.shareService = proxy.getShareService();
         this.accessService = proxy.getAccessService();
@@ -166,6 +174,22 @@ private Future<Pair<ResourceItemMetadata, String>> getResourceData(ResourceDescr
         }, false);
     }
 
+    private void validateCustomApplication(Application application) {
+        try {
+            Config config = context.getConfig();
+            List<ResourceDescriptor> files = CustomApplicationUtils.getFiles(config, application, encryptionService,
+                    resourceService);
+            files.stream().filter(resource -> !(accessService.hasReadAccess(resource, context)))
+                    .findAny().ifPresent(file -> {
+                        throw new HttpException(BAD_REQUEST, "No read access to file: " + file.getUrl());
+                    });
+        } catch (ValidationException | IllegalArgumentException e) {
+            throw new HttpException(BAD_REQUEST, "Custom application validation failed", e);
+        } catch (CustomAppValidationException e) {
+            throw new HttpException(INTERNAL_SERVER_ERROR, "Custom application validation failed", e);
+        }
+    }
+
     private Future<?> putResource(ResourceDescriptor descriptor) {
         if (descriptor.isFolder()) {
             return context.respond(BAD_REQUEST, "Folder not allowed: " + descriptor.getUrl());
@@ -202,7 +226,7 @@ private Future<?> putResource(ResourceDescriptor descriptor) {
                 EtagHeader etag = pair.getKey();
                 Application application = ProxyUtil.convertToObject(pair.getValue(), Application.class);
                 return vertx.executeBlocking(() -> {
-                    applicationService.validateCustomApplication(application, context);
+                    validateCustomApplication(application);
                     return applicationService.putApplication(descriptor, etag, application).getKey();
                 }, false);
             });

diff --git a/server/src/main/java/com/epam/aidial/core/server/service/ApplicationService.java b/server/src/main/java/com/epam/aidial/core/server/service/ApplicationService.java
@@ -1,7 +1,6 @@
 package com.epam.aidial.core.server.service;
 
 import com.epam.aidial.core.config.Application;
-import com.epam.aidial.core.config.Config;
 import com.epam.aidial.core.config.Features;
 import com.epam.aidial.core.server.ProxyContext;
 import com.epam.aidial.core.server.controller.ApplicationUtil;
@@ -14,7 +13,6 @@
 import com.epam.aidial.core.server.util.CustomApplicationUtils;
 import com.epam.aidial.core.server.util.ProxyUtil;
 import com.epam.aidial.core.server.util.ResourceDescriptorFactory;
-import com.epam.aidial.core.server.validation.CustomAppValidationException;
 import com.epam.aidial.core.storage.blobstore.BlobStorageUtil;
 import com.epam.aidial.core.storage.data.MetadataBase;
 import com.epam.aidial.core.storage.data.NodeType;
@@ -30,7 +28,6 @@
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.json.JsonObject;
-import jakarta.validation.ValidationException;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.mutable.MutableObject;
@@ -47,8 +44,6 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import static com.epam.aidial.core.storage.http.HttpStatus.BAD_REQUEST;
-import static com.epam.aidial.core.storage.http.HttpStatus.INTERNAL_SERVER_ERROR;
 
 @Slf4j
 public class ApplicationService {
@@ -219,22 +214,6 @@ public List<Application> getApplications(ResourceDescriptor resource,
         return applications;
     }
 
-    public void validateCustomApplication(Application application, ProxyContext context) {
-        try {
-            Config config = context.getConfig();
-            List<ResourceDescriptor> files = CustomApplicationUtils.getFiles(config, application, encryptionService,
-                    resourceService);
-            files.stream().filter(resource -> !(context.getProxy().getAccessService().hasReadAccess(resource, context)))
-                    .findAny().ifPresent(file -> {
-                        throw new HttpException(BAD_REQUEST, "No read access to file: " + file.getUrl());
-                    });
-        } catch (ValidationException | IllegalArgumentException e) {
-            throw new HttpException(BAD_REQUEST, "Custom application validation failed", e);
-        } catch (CustomAppValidationException e) {
-            throw new HttpException(INTERNAL_SERVER_ERROR, "Custom application validation failed", e);
-        }
-    }
-
     public Pair<ResourceItemMetadata, Application> putApplication(ResourceDescriptor resource, EtagHeader etag, Application application) {
         prepareApplication(resource, application);
 
@@ -256,7 +235,6 @@ public Pair<ResourceItemMetadata, Application> putApplication(ResourceDescriptor
                     if (isPublicOrReview(resource) && !function.getSourceFolder().equals(existing.getFunction().getSourceFolder())) {
                         throw new HttpException(HttpStatus.CONFLICT, "The application function source folder cannot be updated in public/review bucket");
                     }
-
                     application.setEndpoint(existing.getEndpoint());
                     application.getFeatures().setRateEndpoint(existing.getFeatures().getRateEndpoint());
                     application.getFeatures().setTokenizeEndpoint(existing.getFeatures().getTokenizeEndpoint());