🛡️ Sentinel: [CRITICAL] Add authorization checks to AdminController

.jules/sentinel.md

@@ -32,3 +32,8 @@
 **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-07-24 - Securing Admin Endpoints with TenantAccessService
+**Vulnerability:** The AdminController endpoints (`getAllJobs`, `deleteJob`, `retryDeadLettered`) did not enforce any authentication or authorization, allowing anyone to access and modify jobs across all tenants.
+**Learning:** Even internal admin-specific endpoints must explicitly inject and use `TenantAccessService` to require proper claims and verify specific permissions (`ADMIN_READ`, `ADMIN_WRITE`). Relying on network-level segregation (e.g. only exposing these to internal tools) is insufficient because internal threats or SSRF could exploit them.
+**Prevention:** Always inject `TenantAccessService` in every controller, map explicit fine-grained `TenantPermissions` to all endpoints, and pass the request `HttpHeaders` for validation to prevent cross-tenant enumeration or unauthorized mutations.

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

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

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

@@ -10,11 +10,14 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.http.HttpHeaders;
+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.model.ConversionJob;
 import com.clearfolio.viewer.service.DocumentConversionService;
 import com.clearfolio.viewer.service.RetryDeadLetterResult;
@@ -26,24 +29,33 @@
 public class AdminController {
 
     private final DocumentConversionService conversionService;
+    private final TenantAccessService tenantAccessService;
 
     /**
      * Creates a controller for admin operations.
      *
      * @param conversionService conversion service
+     * @param tenantAccessService service to verify tenant permissions
      */
-    public AdminController(DocumentConversionService conversionService) {
+    public AdminController(
+            DocumentConversionService conversionService,
+            TenantAccessService tenantAccessService) {
         this.conversionService = conversionService;
+        this.tenantAccessService = tenantAccessService;
     }
 
     /**
      * Retrieves all conversion jobs, optionally filtered by dead-letter status.
      *
      * @param deadLettered optional filter for dead-lettered jobs
+     * @param headers request headers carrying tenant claims
      * @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) Boolean deadLettered,
+            @RequestHeader HttpHeaders headers) {
+        tenantAccessService.require(headers, com.clearfolio.viewer.auth.TenantPermissions.ADMIN_READ);
         Iterable<ConversionJob> allJobs = conversionService.getAllJobs();
 
         if (deadLettered == null) {
@@ -63,10 +75,14 @@ public AdminJobListResponse getAllJobs(@RequestParam(required = false) Boolean d
      * Deletes a conversion job.
      *
      * @param jobId conversion job identifier
+     * @param headers request headers carrying tenant claims
      * @return no content on success
      */
     @DeleteMapping("/api/v1/admin/convert/jobs/{jobId}")
-    public ResponseEntity<Void> deleteJob(@PathVariable UUID jobId) {
+    public ResponseEntity<Void> deleteJob(
+            @PathVariable UUID jobId,
+            @RequestHeader HttpHeaders headers) {
+        tenantAccessService.require(headers, com.clearfolio.viewer.auth.TenantPermissions.ADMIN_WRITE);
         conversionService.deleteJob(jobId);
         return ResponseEntity.noContent().build();
     }
@@ -75,10 +91,14 @@ public ResponseEntity<Void> deleteJob(@PathVariable UUID jobId) {
      * Retries a dead-lettered conversion job.
      *
      * @param jobId conversion job identifier
+     * @param headers request headers carrying tenant claims
      * @return accepted response on success
      */
     @PostMapping("/api/v1/admin/convert/jobs/{jobId}/retry")
-    public ResponseEntity<Void> retryDeadLettered(@PathVariable UUID jobId) {
+    public ResponseEntity<Void> retryDeadLettered(
+            @PathVariable UUID jobId,
+            @RequestHeader HttpHeaders headers) {
+        tenantAccessService.require(headers, com.clearfolio.viewer.auth.TenantPermissions.ADMIN_WRITE);
         RetryDeadLetterResult result = conversionService.retryDeadLettered(jobId, "admin");
         if (result == RetryDeadLetterResult.NOT_FOUND) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "job not found");

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

@@ -6,27 +6,39 @@
 import java.util.Arrays;
 import java.util.UUID;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpHeaders;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
+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;
 
     @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();
+
+        TenantContext dummyContext = new TenantContext("test-tenant", "test-subject", java.util.Set.of());
+        when(tenantAccessService.require(any(), eq(TenantPermissions.ADMIN_READ))).thenReturn(dummyContext);
+        when(tenantAccessService.require(any(), eq(TenantPermissions.ADMIN_WRITE))).thenReturn(dummyContext);
     }
 
     @Test
@@ -37,6 +49,7 @@ void getAllJobsReturnsAllJobsWhenNoFilterProvided() {
 
         webTestClient.get()
                 .uri("/api/v1/admin/convert/jobs")
+                .header("Authorization", "Bearer dummy")
                 .exchange()
                 .expectStatus().isOk()
                 .expectBody()
@@ -55,6 +68,7 @@ void getAllJobsFiltersByDeadLetteredTrue() {
 
         webTestClient.get()
                 .uri("/api/v1/admin/convert/jobs?deadLettered=true")
+                .header("Authorization", "Bearer dummy")
                 .exchange()
                 .expectStatus().isOk()
                 .expectBody()
@@ -72,6 +86,7 @@ void getAllJobsFiltersByDeadLetteredFalse() {
 
         webTestClient.get()
                 .uri("/api/v1/admin/convert/jobs?deadLettered=false")
+                .header("Authorization", "Bearer dummy")
                 .exchange()
                 .expectStatus().isOk()
                 .expectBody()
@@ -85,6 +100,7 @@ void deleteJobReturnsNoContent() {
 
         webTestClient.delete()
                 .uri("/api/v1/admin/convert/jobs/" + jobId)
+                .header("Authorization", "Bearer dummy")
                 .exchange()
                 .expectStatus().isNoContent();
     }
@@ -96,6 +112,7 @@ void retryDeadLetteredReturnsAcceptedWhenAccepted() {
 
         webTestClient.post()
                 .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry")
+                .header("Authorization", "Bearer dummy")
                 .exchange()
                 .expectStatus().isAccepted();
     }
@@ -107,6 +124,7 @@ void retryDeadLetteredReturnsNotFoundWhenNotFound() {
 
         webTestClient.post()
                 .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry")
+                .header("Authorization", "Bearer dummy")
                 .exchange()
                 .expectStatus().isNotFound();
     }
@@ -118,6 +136,7 @@ void retryDeadLetteredReturnsConflictWhenNotEligible() {
 
         webTestClient.post()
                 .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry")
+                .header("Authorization", "Bearer dummy")
                 .exchange()
                 .expectStatus().isEqualTo(409); // isConflict() isn't always available depending on spring-test version, so using isEqualTo(409) is safer
     }