diff --git a/.jules/sentinel.md b/.jules/sentinel.md index e795cb9dd..571fcca3c 100644 --- a/.jules/sentinel.md +++ b/.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-19 - Add Missing Authorization and Tenant Isolation to Admin Endpoints +**Vulnerability:** The `AdminController` endpoints (`/api/v1/admin/convert/jobs`, `deleteJob`, `retryDeadLettered`) did not verify caller permissions via `TenantAccessService`, allowing unauthenticated actors to access and manipulate all conversion jobs globally. Furthermore, jobs were not scoped to the caller's tenant, exposing cross-tenant metadata (data leak). +**Learning:** Even internal or admin-specific controllers must apply the same authentication, authorization, and tenant isolation layers as user-facing endpoints to adhere strictly to the principle of least privilege and prevent horizontal/vertical privilege escalation. +**Prevention:** Always verify endpoint permissions explicitly (e.g., using `TenantAccessService.require(headers, ...)`) and strictly enforce tenant scope (e.g., `job.belongsToTenant(tenantContext.tenantId())` or `requireSameTenant`) for every protected resource, including administrative actions. diff --git a/src/main/java/com/clearfolio/viewer/controller/AdminController.java b/src/main/java/com/clearfolio/viewer/controller/AdminController.java index 412d4eb86..eb8c04d67 100644 --- a/src/main/java/com/clearfolio/viewer/controller/AdminController.java +++ b/src/main/java/com/clearfolio/viewer/controller/AdminController.java @@ -1,20 +1,30 @@ package com.clearfolio.viewer.controller; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; +import java.util.HexFormat; 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,36 +35,53 @@ @RestController public class AdminController { + /** Hex formatter for pseudonymous operator identifiers. */ + private static final HexFormat HEX_FORMAT = HexFormat.of(); + + /** Conversion service. */ private final DocumentConversionService conversionService; + /** Tenant access service. */ + private final TenantAccessService tenantAccessService; + /** * Creates a controller for admin operations. * - * @param conversionService conversion service + * @param conversionServiceArg conversion service + * @param tenantAccessServiceArg tenant and permission guard */ - public AdminController(DocumentConversionService conversionService) { - this.conversionService = conversionService; + public AdminController( + final DocumentConversionService conversionServiceArg, + final TenantAccessService tenantAccessServiceArg) { + this.conversionService = conversionServiceArg; + this.tenantAccessService = tenantAccessServiceArg; } /** * 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) { - Iterable allJobs = conversionService.getAllJobs(); + public AdminJobListResponse getAllJobs( + @RequestParam(required = false) final Boolean deadLettered, + @RequestHeader final HttpHeaders headers) { + TenantContext tenantContext = tenantAccessService.require( + headers, TenantPermissions.JOB_READ); - if (deadLettered == null) { - return AdminJobListResponse.from(allJobs); - } + Iterable allJobs = conversionService.getAllJobs(); List filtered = new ArrayList<>(); for (ConversionJob job : allJobs) { - if (job.isDeadLettered() == deadLettered) { - filtered.add(job); + if (!job.belongsToTenant(tenantContext.tenantId())) { + continue; + } + if (deadLettered != null && job.isDeadLettered() != deadLettered) { + continue; } + filtered.add(job); } return AdminJobListResponse.from(filtered); } @@ -63,10 +90,23 @@ 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 deleteJob(@PathVariable UUID jobId) { + public ResponseEntity deleteJob( + @PathVariable final UUID jobId, + @RequestHeader final HttpHeaders headers) { + TenantContext tenantContext = tenantAccessService.require( + headers, TenantPermissions.JOB_DELETE); + + Optional job = conversionService.getJob(jobId); + if (job.isEmpty()) { + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "job not found"); + } + tenantAccessService.requireSameTenant(tenantContext, job.get()); + conversionService.deleteJob(jobId); return ResponseEntity.noContent().build(); } @@ -75,16 +115,42 @@ public ResponseEntity 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 retryDeadLettered(@PathVariable UUID jobId) { - RetryDeadLetterResult result = conversionService.retryDeadLettered(jobId, "admin"); + public ResponseEntity retryDeadLettered( + @PathVariable final UUID jobId, + @RequestHeader final HttpHeaders headers) { + TenantContext tenantContext = tenantAccessService.require( + headers, TenantPermissions.JOB_RETRY); + + Optional job = conversionService.getJob(jobId); + if (job.isEmpty()) { + throw new ResponseStatusException( + HttpStatus.NOT_FOUND, "job not found"); + } + tenantAccessService.requireSameTenant(tenantContext, job.get()); + + String pseudonymizedOperator; + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] hash = digest.digest( + tenantContext.subjectId().getBytes(StandardCharsets.UTF_8)); + pseudonymizedOperator = HEX_FORMAT.formatHex(hash); + } catch (NoSuchAlgorithmException ex) { + throw new IllegalStateException("SHA-256 not available", ex); + } + + RetryDeadLetterResult result = conversionService.retryDeadLettered( + jobId, pseudonymizedOperator); 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"); } return ResponseEntity.accepted().build(); } diff --git a/src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java b/src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java index ad63a8015..61743af74 100644 --- a/src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java +++ b/src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java @@ -1,29 +1,42 @@ 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.when; import java.util.Arrays; +import java.util.Optional; import java.util.UUID; +import java.time.Instant; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; 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.model.ConversionJobStatus; 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 TenantContext tenantContext; @BeforeEach void setUp() { conversionService = mock(DocumentConversionService.class); - controller = new AdminController(conversionService); + tenantAccessService = mock(TenantAccessService.class); + tenantContext = mock(TenantContext.class); + + controller = new AdminController(conversionService, tenantAccessService); webTestClient = WebTestClient.bindToController(controller) .controllerAdvice(new ApiExceptionHandler()) .build(); @@ -31,8 +44,52 @@ void setUp() { @Test void getAllJobsReturnsAllJobsWhenNoFilterProvided() { - ConversionJob job1 = new ConversionJob(UUID.randomUUID(), "a.pdf", "application/pdf", "hash-a", 100L); - ConversionJob job2 = new ConversionJob(UUID.randomUUID(), "b.pdf", "application/pdf", "hash-b", 100L); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_READ))).thenReturn(tenantContext); + when(tenantContext.tenantId()).thenReturn("default"); + + ConversionJob job1 = mock(ConversionJob.class); + when(job1.belongsToTenant("default")).thenReturn(true); + when(job1.getOriginalFileName()).thenReturn("a.pdf"); + when(job1.getJobId()).thenReturn(UUID.randomUUID()); + when(job1.getTenantId()).thenReturn("default"); + when(job1.getStatus()).thenReturn(ConversionJobStatus.SUBMITTED); + when(job1.getCreatedAt()).thenReturn(Instant.now()); + + ConversionJob job2 = mock(ConversionJob.class); + when(job2.belongsToTenant("default")).thenReturn(true); + when(job2.getOriginalFileName()).thenReturn("b.pdf"); + when(job2.getJobId()).thenReturn(UUID.randomUUID()); + when(job2.getTenantId()).thenReturn("default"); + when(job2.getStatus()).thenReturn(ConversionJobStatus.SUBMITTED); + when(job2.getCreatedAt()).thenReturn(Instant.now()); + + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(job1, job2)); + + webTestClient.get() + .uri("/api/v1/admin/convert/jobs") + .exchange() + .expectStatus().isOk() + .expectBody() + .jsonPath("$.jobs").isArray() + .jsonPath("$.jobs.length()").isEqualTo(2); + } + + @Test + void getAllJobsFiltersByBelongsToTenant() { + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_READ))).thenReturn(tenantContext); + when(tenantContext.tenantId()).thenReturn("default"); + + ConversionJob job1 = mock(ConversionJob.class); + when(job1.belongsToTenant("default")).thenReturn(true); + when(job1.getOriginalFileName()).thenReturn("a.pdf"); + when(job1.getJobId()).thenReturn(UUID.randomUUID()); + when(job1.getTenantId()).thenReturn("default"); + when(job1.getStatus()).thenReturn(ConversionJobStatus.SUBMITTED); + when(job1.getCreatedAt()).thenReturn(Instant.now()); + + ConversionJob job2 = mock(ConversionJob.class); + when(job2.belongsToTenant("default")).thenReturn(false); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(job1, job2)); webTestClient.get() @@ -40,16 +97,32 @@ void getAllJobsReturnsAllJobsWhenNoFilterProvided() { .exchange() .expectStatus().isOk() .expectBody() - .jsonPath("$.jobs.length()").isEqualTo(2) - .jsonPath("$.jobs[0].fileName").isEqualTo("a.pdf") - .jsonPath("$.jobs[1].fileName").isEqualTo("b.pdf"); + .jsonPath("$.jobs").isArray() + .jsonPath("$.jobs.length()").isEqualTo(1); } @Test void getAllJobsFiltersByDeadLetteredTrue() { - ConversionJob job1 = new ConversionJob(UUID.randomUUID(), "a.pdf", "application/pdf", "hash-a", 100L); - job1.markDeadLettered("failed"); - ConversionJob job2 = new ConversionJob(UUID.randomUUID(), "b.pdf", "application/pdf", "hash-b", 100L); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_READ))).thenReturn(tenantContext); + when(tenantContext.tenantId()).thenReturn("default"); + + ConversionJob job1 = mock(ConversionJob.class); + when(job1.belongsToTenant("default")).thenReturn(true); + when(job1.isDeadLettered()).thenReturn(true); + when(job1.getOriginalFileName()).thenReturn("a.pdf"); + when(job1.getJobId()).thenReturn(UUID.randomUUID()); + when(job1.getTenantId()).thenReturn("default"); + when(job1.getStatus()).thenReturn(ConversionJobStatus.FAILED); + when(job1.getCreatedAt()).thenReturn(Instant.now()); + + ConversionJob job2 = mock(ConversionJob.class); + when(job2.belongsToTenant("default")).thenReturn(true); + when(job2.isDeadLettered()).thenReturn(false); + when(job2.getOriginalFileName()).thenReturn("b.pdf"); + when(job2.getJobId()).thenReturn(UUID.randomUUID()); + when(job2.getTenantId()).thenReturn("default"); + when(job2.getStatus()).thenReturn(ConversionJobStatus.FAILED); + when(job2.getCreatedAt()).thenReturn(Instant.now()); when(conversionService.getAllJobs()).thenReturn(Arrays.asList(job1, job2)); @@ -58,15 +131,32 @@ void getAllJobsFiltersByDeadLetteredTrue() { .exchange() .expectStatus().isOk() .expectBody() - .jsonPath("$.jobs.length()").isEqualTo(1) - .jsonPath("$.jobs[0].fileName").isEqualTo("a.pdf"); + .jsonPath("$.jobs").isArray() + .jsonPath("$.jobs.length()").isEqualTo(1); } @Test void getAllJobsFiltersByDeadLetteredFalse() { - ConversionJob job1 = new ConversionJob(UUID.randomUUID(), "a.pdf", "application/pdf", "hash-a", 100L); - job1.markDeadLettered("failed"); - ConversionJob job2 = new ConversionJob(UUID.randomUUID(), "b.pdf", "application/pdf", "hash-b", 100L); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_READ))).thenReturn(tenantContext); + when(tenantContext.tenantId()).thenReturn("default"); + + ConversionJob job1 = mock(ConversionJob.class); + when(job1.belongsToTenant("default")).thenReturn(true); + when(job1.isDeadLettered()).thenReturn(true); + when(job1.getOriginalFileName()).thenReturn("a.pdf"); + when(job1.getJobId()).thenReturn(UUID.randomUUID()); + when(job1.getTenantId()).thenReturn("default"); + when(job1.getStatus()).thenReturn(ConversionJobStatus.FAILED); + when(job1.getCreatedAt()).thenReturn(Instant.now()); + + ConversionJob job2 = mock(ConversionJob.class); + when(job2.belongsToTenant("default")).thenReturn(true); + when(job2.isDeadLettered()).thenReturn(false); + when(job2.getOriginalFileName()).thenReturn("b.pdf"); + when(job2.getJobId()).thenReturn(UUID.randomUUID()); + when(job2.getTenantId()).thenReturn("default"); + when(job2.getStatus()).thenReturn(ConversionJobStatus.SUBMITTED); + when(job2.getCreatedAt()).thenReturn(Instant.now()); when(conversionService.getAllJobs()).thenReturn(Arrays.asList(job1, job2)); @@ -75,13 +165,16 @@ void getAllJobsFiltersByDeadLetteredFalse() { .exchange() .expectStatus().isOk() .expectBody() - .jsonPath("$.jobs.length()").isEqualTo(1) - .jsonPath("$.jobs[0].fileName").isEqualTo("b.pdf"); + .jsonPath("$.jobs").isArray() + .jsonPath("$.jobs.length()").isEqualTo(1); } @Test void deleteJobReturnsNoContent() { UUID jobId = UUID.randomUUID(); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_DELETE))).thenReturn(tenantContext); + ConversionJob job = mock(ConversionJob.class); + when(conversionService.getJob(jobId)).thenReturn(Optional.of(job)); webTestClient.delete() .uri("/api/v1/admin/convert/jobs/" + jobId) @@ -89,10 +182,27 @@ void deleteJobReturnsNoContent() { .expectStatus().isNoContent(); } + @Test + void deleteJobReturnsNotFoundWhenEmpty() { + UUID jobId = UUID.randomUUID(); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_DELETE))).thenReturn(tenantContext); + when(conversionService.getJob(jobId)).thenReturn(Optional.empty()); + + webTestClient.delete() + .uri("/api/v1/admin/convert/jobs/" + jobId) + .exchange() + .expectStatus().isNotFound(); + } + @Test void retryDeadLetteredReturnsAcceptedWhenAccepted() { UUID jobId = UUID.randomUUID(); - when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.ACCEPTED); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_RETRY))).thenReturn(tenantContext); + when(tenantContext.subjectId()).thenReturn("operator-1"); + + ConversionJob job = mock(ConversionJob.class); + when(conversionService.getJob(jobId)).thenReturn(Optional.of(job)); + when(conversionService.retryDeadLettered(eq(jobId), any(String.class))).thenReturn(RetryDeadLetterResult.ACCEPTED); webTestClient.post() .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry") @@ -103,7 +213,26 @@ void retryDeadLetteredReturnsAcceptedWhenAccepted() { @Test void retryDeadLetteredReturnsNotFoundWhenNotFound() { UUID jobId = UUID.randomUUID(); - when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.NOT_FOUND); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_RETRY))).thenReturn(tenantContext); + when(tenantContext.subjectId()).thenReturn("operator-1"); + + ConversionJob job = mock(ConversionJob.class); + when(conversionService.getJob(jobId)).thenReturn(Optional.of(job)); + when(conversionService.retryDeadLettered(eq(jobId), any(String.class))).thenReturn(RetryDeadLetterResult.NOT_FOUND); + + webTestClient.post() + .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry") + .exchange() + .expectStatus().isNotFound(); + } + + @Test + void retryDeadLetteredReturnsNotFoundWhenEmpty() { + UUID jobId = UUID.randomUUID(); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_RETRY))).thenReturn(tenantContext); + when(tenantContext.subjectId()).thenReturn("operator-1"); + + when(conversionService.getJob(jobId)).thenReturn(Optional.empty()); webTestClient.post() .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry") @@ -114,11 +243,16 @@ void retryDeadLetteredReturnsNotFoundWhenNotFound() { @Test void retryDeadLetteredReturnsConflictWhenNotEligible() { UUID jobId = UUID.randomUUID(); - when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.NOT_ELIGIBLE); + when(tenantAccessService.require(any(), eq(TenantPermissions.JOB_RETRY))).thenReturn(tenantContext); + when(tenantContext.subjectId()).thenReturn("operator-1"); + + ConversionJob job = mock(ConversionJob.class); + when(conversionService.getJob(jobId)).thenReturn(Optional.of(job)); + when(conversionService.retryDeadLettered(eq(jobId), any(String.class))).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 + .expectStatus().isEqualTo(409); } }