🛡️ Sentinel: [CRITICAL] Fix AdminController missing authorization

.jules/sentinel.md

@@ -32,3 +32,7 @@
 **Vulnerability:** The document hashing routine in `DefaultDocumentConversionService` processed file streams without enforcing any maximum size limit on the bytes read. An attacker could exploit this by uploading a maliciously large stream (or exploiting a compression bomb if unzipping), exhausting system memory, CPU, or disk space (DoS).
 **Learning:** Checking the declared file size (e.g., `file.getSize()`) in initial validation is not always sufficient if the input stream itself can be spoofed or dynamically expanded during reading. The actual bytes read must be verified against bounds continuously.
 **Prevention:** Always enforce a strict, configurable size limit (e.g., `ConversionProperties.maxUploadSizeBytes`) within the `while` loop that reads from untrusted input streams. Track `totalRead` and throw an exception immediately if the limit is exceeded.
+## 2026-08-18 - Admin 엔드포인트 권한 부여 누락 문제 수정
+**Vulnerability:** `/api/v1/admin/convert/jobs` 등 AdminController의 주요 엔드포인트에서 권한 부여(authorization) 검사가 누락되어 있었습니다.
+**Learning:** 애플리케이션의 다른 컨트롤러에서는 `TenantAccessService`를 사용하여 수동으로 권한을 검사하고 있으나, AdminController에는 이 검사 로직이 주입되지 않아, 요청 헤더만 알면 누구나 관리자 권한을 행사할 수 있는 보안 취약점이 있었습니다.
+**Prevention:** 모든 새로운 컨트롤러 및 민감한 엔드포인트를 구현할 때, 스프링 시큐리티 어노테이션이 아닌 수동 방식의 인가 서비스(`TenantAccessService`)가 적절히 주입되고 각 엔드포인트에서 호출되는지 철저히 확인해야 합니다.

src/main/java/com/clearfolio/viewer/auth/TenantPermissions.java

@@ -55,6 +55,16 @@ public final class TenantPermissions {
      */
     public static final String ANALYTICS_READ = "analytics:read";
 
+    /**
+     * Permission required to read admin endpoints.
+     */
+    public static final String ADMIN_READ = "admin:read";
+
+    /**
+     * Permission required to write/modify admin endpoints.
+     */
+    public static final String ADMIN_WRITE = "admin:write";
+
     private TenantPermissions() {
     }
 }

src/main/java/com/clearfolio/viewer/controller/AdminController.java

@@ -2,19 +2,25 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 
 import com.clearfolio.viewer.api.AdminJobListResponse;
+import com.clearfolio.viewer.auth.TenantAccessService;
+import com.clearfolio.viewer.auth.TenantContext;
+import com.clearfolio.viewer.auth.TenantPermissions;
 import com.clearfolio.viewer.model.ConversionJob;
 import com.clearfolio.viewer.service.DocumentConversionService;
 import com.clearfolio.viewer.service.RetryDeadLetterResult;
@@ -25,34 +31,47 @@
 @RestController
 public class AdminController {
 
+    /** The conversion service. */
     private final DocumentConversionService conversionService;
+    /** The tenant access service. */
+    private final TenantAccessService tenantAccessService;
 
     /**
      * Creates a controller for admin operations.
      *
-     * @param conversionService conversion service
+     * @param conversionSvc conversion service
+     * @param tenantAccessSvc tenant access service
      */
-    public AdminController(DocumentConversionService conversionService) {
-        this.conversionService = conversionService;
+    public AdminController(
+            final DocumentConversionService conversionSvc,
+            final TenantAccessService tenantAccessSvc) {
+        this.conversionService = conversionSvc;
+        this.tenantAccessService = tenantAccessSvc;
     }
 
     /**
      * Retrieves all conversion jobs, optionally filtered by dead-letter status.
      *
      * @param deadLettered optional filter for dead-lettered jobs
+     * @param headers request headers
      * @return list of conversion jobs
      */
     @GetMapping("/api/v1/admin/convert/jobs")
-    public AdminJobListResponse getAllJobs(@RequestParam(required = false) Boolean deadLettered) {
+    public AdminJobListResponse getAllJobs(
+            @RequestParam(required = false) final Boolean deadLettered,
+            @RequestHeader final HttpHeaders headers) {
+        TenantContext tenantContext = tenantAccessService.require(
+                headers,
+                TenantPermissions.ADMIN_READ);
         Iterable<ConversionJob> allJobs = conversionService.getAllJobs();
 
-        if (deadLettered == null) {
-            return AdminJobListResponse.from(allJobs);
-        }
-
         List<ConversionJob> filtered = new ArrayList<>();
         for (ConversionJob job : allJobs) {
-            if (job.isDeadLettered() == deadLettered) {
+            boolean belongsToTenant = job.belongsToTenant(
+                    tenantContext.tenantId());
+            boolean matchesDeadLetter = deadLettered == null
+                    || job.isDeadLettered() == deadLettered;
+            if (belongsToTenant && matchesDeadLetter) {
                 filtered.add(job);
             }
         }
@@ -63,10 +82,24 @@ public AdminJobListResponse getAllJobs(@RequestParam(required = false) Boolean d
      * Deletes a conversion job.
      *
      * @param jobId conversion job identifier
+     * @param headers request headers
      * @return no content on success
      */
     @DeleteMapping("/api/v1/admin/convert/jobs/{jobId}")
-    public ResponseEntity<Void> deleteJob(@PathVariable UUID jobId) {
+    public ResponseEntity<Void> deleteJob(
+            @PathVariable final UUID jobId,
+            @RequestHeader final HttpHeaders headers) {
+        TenantContext tenantContext = tenantAccessService.require(
+                headers,
+                TenantPermissions.ADMIN_WRITE);
+        Optional<ConversionJob> job = conversionService.getJob(jobId);
+        if (job.isEmpty()
+                || !job.get().belongsToTenant(tenantContext.tenantId())) {
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND,
+                    "job not found");
+        }
+
         conversionService.deleteJob(jobId);
         return ResponseEntity.noContent().build();
     }
@@ -75,16 +108,36 @@ public ResponseEntity<Void> deleteJob(@PathVariable UUID jobId) {
      * Retries a dead-lettered conversion job.
      *
      * @param jobId conversion job identifier
+     * @param headers request headers
      * @return accepted response on success
      */
     @PostMapping("/api/v1/admin/convert/jobs/{jobId}/retry")
-    public ResponseEntity<Void> retryDeadLettered(@PathVariable UUID jobId) {
-        RetryDeadLetterResult result = conversionService.retryDeadLettered(jobId, "admin");
+    public ResponseEntity<Void> retryDeadLettered(
+            @PathVariable final UUID jobId,
+            @RequestHeader final HttpHeaders headers) {
+        TenantContext tenantContext = tenantAccessService.require(
+                headers,
+                TenantPermissions.ADMIN_WRITE);
+        Optional<ConversionJob> job = conversionService.getJob(jobId);
+        if (job.isEmpty()
+                || !job.get().belongsToTenant(tenantContext.tenantId())) {
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND,
+                    "job not found");
+        }
+
+        RetryDeadLetterResult result = conversionService.retryDeadLettered(
+                jobId,
+                "admin");
         if (result == RetryDeadLetterResult.NOT_FOUND) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "job not found");
+            throw new ResponseStatusException(
+                    HttpStatus.NOT_FOUND,
+                    "job not found");
         }
         if (result == RetryDeadLetterResult.NOT_ELIGIBLE) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "job is not eligible for retry");
+            throw new ResponseStatusException(
+                    HttpStatus.CONFLICT,
+                    "job is not eligible for retry");
         }
         return ResponseEntity.accepted().build();
     }

src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java

@@ -1,29 +1,43 @@
 package com.clearfolio.viewer.controller;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.UUID;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ResponseStatusException;
 
+import com.clearfolio.viewer.auth.TenantAccessService;
+import com.clearfolio.viewer.auth.TenantContext;
+import com.clearfolio.viewer.auth.TenantPermissions;
 import com.clearfolio.viewer.model.ConversionJob;
 import com.clearfolio.viewer.service.DocumentConversionService;
 import com.clearfolio.viewer.service.RetryDeadLetterResult;
 
 class AdminControllerTest {
 
     private DocumentConversionService conversionService;
+    private TenantAccessService tenantAccessService;
     private WebTestClient webTestClient;
     private AdminController controller;
 
+    private static final String TENANT_ID = "buyer-demo";
+
     @BeforeEach
     void setUp() {
         conversionService = mock(DocumentConversionService.class);
-        controller = new AdminController(conversionService);
+        tenantAccessService = mock(TenantAccessService.class);
+        controller = new AdminController(conversionService, tenantAccessService);
         webTestClient = WebTestClient.bindToController(controller)
                 .controllerAdvice(new ApiExceptionHandler())
                 .build();
@@ -35,6 +49,8 @@ void getAllJobsReturnsAllJobsWhenNoFilterProvided() {
         ConversionJob job2 = new ConversionJob(UUID.randomUUID(), "b.pdf", "application/pdf", "hash-b", 100L);
         when(conversionService.getAllJobs()).thenReturn(Arrays.asList(job1, job2));
 
+        when(tenantAccessService.require(any(), any())).thenReturn(new TenantContext(TENANT_ID, "s", java.util.Set.of()));
+
         webTestClient.get()
                 .uri("/api/v1/admin/convert/jobs")
                 .exchange()
@@ -43,6 +59,8 @@ void getAllJobsReturnsAllJobsWhenNoFilterProvided() {
                 .jsonPath("$.jobs.length()").isEqualTo(2)
                 .jsonPath("$.jobs[0].fileName").isEqualTo("a.pdf")
                 .jsonPath("$.jobs[1].fileName").isEqualTo("b.pdf");
+
+        verify(tenantAccessService).require(any(HttpHeaders.class), eq(TenantPermissions.ADMIN_READ));
     }
 
     @Test
@@ -52,6 +70,7 @@ void getAllJobsFiltersByDeadLetteredTrue() {
         ConversionJob job2 = new ConversionJob(UUID.randomUUID(), "b.pdf", "application/pdf", "hash-b", 100L);
 
         when(conversionService.getAllJobs()).thenReturn(Arrays.asList(job1, job2));
+        when(tenantAccessService.require(any(), any())).thenReturn(new TenantContext(TENANT_ID, "s", java.util.Set.of()));
 
         webTestClient.get()
                 .uri("/api/v1/admin/convert/jobs?deadLettered=true")
@@ -60,6 +79,8 @@ void getAllJobsFiltersByDeadLetteredTrue() {
                 .expectBody()
                 .jsonPath("$.jobs.length()").isEqualTo(1)
                 .jsonPath("$.jobs[0].fileName").isEqualTo("a.pdf");
+
+        verify(tenantAccessService).require(any(HttpHeaders.class), eq(TenantPermissions.ADMIN_READ));
     }
 
     @Test
@@ -69,6 +90,7 @@ void getAllJobsFiltersByDeadLetteredFalse() {
         ConversionJob job2 = new ConversionJob(UUID.randomUUID(), "b.pdf", "application/pdf", "hash-b", 100L);
 
         when(conversionService.getAllJobs()).thenReturn(Arrays.asList(job1, job2));
+        when(tenantAccessService.require(any(), any())).thenReturn(new TenantContext(TENANT_ID, "s", java.util.Set.of()));
 
         webTestClient.get()
                 .uri("/api/v1/admin/convert/jobs?deadLettered=false")
@@ -77,48 +99,71 @@ void getAllJobsFiltersByDeadLetteredFalse() {
                 .expectBody()
                 .jsonPath("$.jobs.length()").isEqualTo(1)
                 .jsonPath("$.jobs[0].fileName").isEqualTo("b.pdf");
+
+        verify(tenantAccessService).require(any(HttpHeaders.class), eq(TenantPermissions.ADMIN_READ));
     }
 
     @Test
     void deleteJobReturnsNoContent() {
         UUID jobId = UUID.randomUUID();
+        when(tenantAccessService.require(any(), any())).thenReturn(new TenantContext(TENANT_ID, "s", java.util.Set.of()));
+        ConversionJob job1 = new ConversionJob(jobId, "a.pdf", "application/pdf", "hash-a", 100L);
+        when(conversionService.getJob(jobId)).thenReturn(Optional.of(job1));
 
         webTestClient.delete()
                 .uri("/api/v1/admin/convert/jobs/" + jobId)
                 .exchange()
                 .expectStatus().isNoContent();
+
+        verify(tenantAccessService).require(any(HttpHeaders.class), eq(TenantPermissions.ADMIN_WRITE));
+        verify(conversionService).deleteJob(jobId);
     }
 
     @Test
     void retryDeadLetteredReturnsAcceptedWhenAccepted() {
         UUID jobId = UUID.randomUUID();
+        when(tenantAccessService.require(any(), any())).thenReturn(new TenantContext(TENANT_ID, "s", java.util.Set.of()));
+        ConversionJob job1 = new ConversionJob(jobId, "a.pdf", "application/pdf", "hash-a", 100L);
+        when(conversionService.getJob(jobId)).thenReturn(Optional.of(job1));
         when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.ACCEPTED);
 
         webTestClient.post()
                 .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry")
                 .exchange()
                 .expectStatus().isAccepted();
+
+        verify(tenantAccessService).require(any(HttpHeaders.class), eq(TenantPermissions.ADMIN_WRITE));
     }
 
     @Test
     void retryDeadLetteredReturnsNotFoundWhenNotFound() {
         UUID jobId = UUID.randomUUID();
+        when(tenantAccessService.require(any(), any())).thenReturn(new TenantContext(TENANT_ID, "s", java.util.Set.of()));
+        ConversionJob job1 = new ConversionJob(jobId, "a.pdf", "application/pdf", "hash-a", 100L);
+        when(conversionService.getJob(jobId)).thenReturn(Optional.of(job1));
         when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.NOT_FOUND);
 
         webTestClient.post()
                 .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry")
                 .exchange()
                 .expectStatus().isNotFound();
+
+        verify(tenantAccessService).require(any(HttpHeaders.class), eq(TenantPermissions.ADMIN_WRITE));
     }
 
     @Test
     void retryDeadLetteredReturnsConflictWhenNotEligible() {
         UUID jobId = UUID.randomUUID();
+        when(tenantAccessService.require(any(), any())).thenReturn(new TenantContext(TENANT_ID, "s", java.util.Set.of()));
+        ConversionJob job1 = new ConversionJob(jobId, "a.pdf", "application/pdf", "hash-a", 100L);
+        when(conversionService.getJob(jobId)).thenReturn(Optional.of(job1));
         when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.NOT_ELIGIBLE);
 
         webTestClient.post()
                 .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry")
                 .exchange()
                 .expectStatus().isEqualTo(409); // isConflict() isn't always available depending on spring-test version, so using isEqualTo(409) is safer
+
+        verify(tenantAccessService).require(any(HttpHeaders.class), eq(TenantPermissions.ADMIN_WRITE));
     }
 }