fix: shared file access (#156)

epam · Jan 18, 2024 · 825aa61 · 825aa61
1 parent e18f27e
commit 825aa61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/epam/aidial/core/controller/AccessControlBaseController.java b/src/main/java/com/epam/aidial/core/controller/AccessControlBaseController.java
@@ -25,9 +25,10 @@ public abstract class AccessControlBaseController {
      * @param filePath url encoded file path
      */
     public Future<?> handle(String bucket, String filePath) {
+        ResourceType type = ResourceType.FILE;
         String urlDecodedBucket = UrlUtil.decodePath(bucket);
         String decryptedBucket = proxy.getEncryptionService().decrypt(urlDecodedBucket);
-        boolean hasReadAccess = isSharedWithMe(bucket, filePath);
+        boolean hasReadAccess = isSharedWithMe(type, bucket, filePath);
         boolean hasWriteAccess = hasWriteAccess(filePath, decryptedBucket);
         boolean hasAccess = checkFullAccess ? hasWriteAccess : hasReadAccess || hasWriteAccess;
 
@@ -37,7 +38,7 @@ public Future<?> handle(String bucket, String filePath) {
 
         ResourceDescription resource;
         try {
-            resource = ResourceDescription.fromEncoded(ResourceType.FILE, urlDecodedBucket, decryptedBucket, filePath);
+            resource = ResourceDescription.fromEncoded(type, urlDecodedBucket, decryptedBucket, filePath);
         } catch (Exception ex) {
             String errorMessage = ex.getMessage() != null ? ex.getMessage() : DEFAULT_RESOURCE_ERROR_MESSAGE.formatted(filePath);
             return context.respond(HttpStatus.BAD_REQUEST, errorMessage);
@@ -48,8 +49,8 @@ public Future<?> handle(String bucket, String filePath) {
 
     protected abstract Future<?> handle(ResourceDescription resource);
 
-    protected boolean isSharedWithMe(String bucket, String filePath) {
-        String url = bucket + BlobStorageUtil.PATH_SEPARATOR + filePath;
+    protected boolean isSharedWithMe(ResourceType type, String bucket, String filePath) {
+        String url = type.getGroup() + BlobStorageUtil.PATH_SEPARATOR + bucket + BlobStorageUtil.PATH_SEPARATOR + filePath;
         return context.getApiKeyData().getAttachedFiles().contains(url);
     }
 

diff --git a/src/test/java/com/epam/aidial/core/FileApiTest.java b/src/test/java/com/epam/aidial/core/FileApiTest.java
@@ -434,7 +434,7 @@ public void testDownloadSharedFile(Vertx vertx, VertxTestContext context) {
         apiKeyData1.setOriginalKey(projectApiKeyData.getOriginalKey());
         // set deployment ID for proxyKey1
         apiKeyData1.setSourceDeployment("EPM-RTC-GPT");
-        apiKeyData1.setAttachedFiles(Set.of("7G9WZNcoY26Vy9D7bEgbv6zqbJGfyDp9KZyEbJR4XMZt/folder1/file.txt"));
+        apiKeyData1.setAttachedFiles(Set.of("files/7G9WZNcoY26Vy9D7bEgbv6zqbJGfyDp9KZyEbJR4XMZt/folder1/file.txt"));
         apiKeyStore.assignApiKey(apiKeyData1);
 
         String apiKey1 = apiKeyData1.getPerRequestKey();