From 1d2b837e75637158d506d058cc509ceb5ccebc04 Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Tue, 19 Dec 2023 11:22:30 +0200 Subject: [PATCH] Image upload specifications api --- .../server/controller/ImageController.java | 26 +++++++++++++++++++ .../controller/ImageControllerTest.java | 23 ++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/application/src/main/java/org/thingsboard/server/controller/ImageController.java b/application/src/main/java/org/thingsboard/server/controller/ImageController.java index 199e80dc64..115f3d66dc 100644 --- a/application/src/main/java/org/thingsboard/server/controller/ImageController.java +++ b/application/src/main/java/org/thingsboard/server/controller/ImageController.java @@ -16,6 +16,8 @@ package org.thingsboard.server.controller; import io.swagger.annotations.ApiParam; +import lombok.Builder; +import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -49,6 +51,7 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import org.thingsboard.server.common.data.util.ThrowingSupplier; import org.thingsboard.server.dao.resource.ImageCacheKey; import org.thingsboard.server.dao.resource.ImageService; @@ -281,6 +284,19 @@ public class ImageController extends BaseController { return (result.isSuccess() ? ResponseEntity.ok() : ResponseEntity.badRequest()).body(result); } + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @GetMapping("/api/image/specs") + public ImageSpecs getImageUploadSpecs() throws ThingsboardException { + SecurityUser user = getCurrentUser(); + if (user.isSystemAdmin()) { + return ImageSpecs.DEFAULT; + } + DefaultTenantProfileConfiguration tenantProfileConfig = tenantProfileCache.get(user.getTenantId()).getDefaultProfileConfiguration(); + return ImageSpecs.builder() + .maximumSize(tenantProfileConfig.getMaxResourceSize()) + .build(); + } + private ResponseEntity downloadIfChanged(String type, String key, String etag, boolean preview) throws Exception { ImageCacheKey cacheKey = ImageCacheKey.forImage(getTenantId(type), key, preview); return downloadIfChanged(cacheKey, etag, () -> checkImageInfo(type, key, Operation.READ)); @@ -343,4 +359,14 @@ public class ImageController extends BaseController { return tenantId; } + @Data + @Builder + public static class ImageSpecs { + private final long maximumSize; + + public static final ImageSpecs DEFAULT = ImageSpecs.builder() + .maximumSize(0) + .build(); + } + } \ No newline at end of file diff --git a/application/src/test/java/org/thingsboard/server/controller/ImageControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/ImageControllerTest.java index e3ac9e530c..8e7496e6fd 100644 --- a/application/src/test/java/org/thingsboard/server/controller/ImageControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/ImageControllerTest.java @@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.ResourceType; import org.thingsboard.server.common.data.TbResourceInfo; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; +import org.thingsboard.server.controller.ImageController.ImageSpecs; import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.sql.resource.TbResourceRepository; @@ -240,6 +241,28 @@ public class ImageControllerTest extends AbstractControllerTest { doGet("/api/images/public/" + publicKey).andExpect(status().isNotFound()); } + @Test + public void testGetImageUploadSpecs() throws Exception { + ImageSpecs specs = doGet("/api/image/specs", ImageSpecs.class); + assertThat(specs.getMaximumSize()).isZero(); + + loginSysAdmin(); + updateDefaultTenantProfileConfig(tenantProfileConfig -> { + tenantProfileConfig.setMaxResourceSize(100); + }); + loginTenantAdmin(); + specs = doGet("/api/image/specs", ImageSpecs.class); + assertThat(specs.getMaximumSize()).isEqualTo(100); + + loginSysAdmin(); + updateDefaultTenantProfileConfig(tenantProfileConfig -> { + tenantProfileConfig.setMaxResourceSize(0); + }); + loginTenantAdmin(); + specs = doGet("/api/image/specs", ImageSpecs.class); + assertThat(specs.getMaximumSize()).isEqualTo(0); + } + private TbResourceInfo updateImagePublicStatus(String filename, boolean isPublic) throws Exception { return doPut("/api/images/tenant/" + filename + "/public/" + isPublic, "", TbResourceInfo.class); }