diff --git a/src/main/java/com/clearfolio/viewer/controller/AdminController.java b/src/main/java/com/clearfolio/viewer/controller/AdminController.java index 412d4eb86..b723778f3 100644 --- a/src/main/java/com/clearfolio/viewer/controller/AdminController.java +++ b/src/main/java/com/clearfolio/viewer/controller/AdminController.java @@ -16,6 +16,11 @@ import com.clearfolio.viewer.api.AdminJobListResponse; import com.clearfolio.viewer.model.ConversionJob; +import com.clearfolio.viewer.auth.TenantAccessService; +import com.clearfolio.viewer.auth.TenantContext; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.http.HttpHeaders; +import java.security.GeneralSecurityException; import com.clearfolio.viewer.service.DocumentConversionService; import com.clearfolio.viewer.service.RetryDeadLetterResult; @@ -25,48 +30,74 @@ @RestController public class AdminController { + /** Conversion service. */ private final DocumentConversionService conversionService; + /** Tenant access service. */ + private final TenantAccessService tenantAccessService; /** * Creates a controller for admin operations. * - * @param conversionService conversion service + * @param cvcService conversion service + * @param taService tenant access service */ - public AdminController(DocumentConversionService conversionService) { - this.conversionService = conversionService; + + + public AdminController( + final DocumentConversionService cvcService, + final TenantAccessService taService) { + this.conversionService = cvcService; + this.tenantAccessService = taService; } - /** + /** * Retrieves all conversion jobs, optionally filtered by dead-letter status. * + * @param headers request headers * @param deadLettered optional filter for dead-lettered jobs * @return list of conversion jobs */ @GetMapping("/api/v1/admin/convert/jobs") - public AdminJobListResponse getAllJobs(@RequestParam(required = false) Boolean deadLettered) { + public AdminJobListResponse getAllJobs( + @RequestHeader final HttpHeaders headers, + @RequestParam(required = false) final Boolean deadLettered) { + TenantContext context = tenantAccessService.require( + headers, "admin:read"); Iterable allJobs = conversionService.getAllJobs(); - if (deadLettered == null) { - return AdminJobListResponse.from(allJobs); - } - List filtered = new ArrayList<>(); for (ConversionJob job : allJobs) { - if (job.isDeadLettered() == deadLettered) { + if (!job.belongsToTenant(context.tenantId())) { + continue; + } + if (deadLettered == null || job.isDeadLettered() == deadLettered) { filtered.add(job); } } return AdminJobListResponse.from(filtered); } - /** + /** * Deletes a conversion job. * + * @param headers request headers * @param jobId conversion job identifier * @return no content on success */ @DeleteMapping("/api/v1/admin/convert/jobs/{jobId}") - public ResponseEntity deleteJob(@PathVariable UUID jobId) { + public ResponseEntity deleteJob( + @RequestHeader final HttpHeaders headers, + @PathVariable final UUID jobId) { + TenantContext context = tenantAccessService.require( + headers, "admin:write"); + ConversionJob job = null; + for (ConversionJob j : conversionService.getAllJobs()) { + if (j.getJobId().equals(jobId)) { + job = j; + break; + } + } + tenantAccessService.requireSameTenant(context, job); conversionService.deleteJob(jobId); return ResponseEntity.noContent().build(); } @@ -74,17 +105,43 @@ public ResponseEntity deleteJob(@PathVariable UUID jobId) { /** * Retries a dead-lettered conversion job. * + * @param headers request headers * @param jobId conversion job identifier * @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( + @RequestHeader final HttpHeaders headers, + @PathVariable final UUID jobId) throws GeneralSecurityException { + TenantContext context = tenantAccessService.require( + headers, "admin:write"); + + ConversionJob job = null; + for (ConversionJob j : conversionService.getAllJobs()) { + if (j.getJobId().equals(jobId)) { + job = j; + break; + } + } + tenantAccessService.requireSameTenant(context, job); + + String actor; + java.security.MessageDigest md = + java.security.MessageDigest.getInstance("SHA-256"); + byte[] bytes = context.subjectId().getBytes( + java.nio.charset.StandardCharsets.UTF_8); + actor = "admin-" + java.util.HexFormat.of() + .formatHex(md.digest(bytes)); + + RetryDeadLetterResult result = conversionService + .retryDeadLettered(jobId, actor); 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(); } diff --git a/src/main/resources/application-buyer-demo.yml b/src/main/resources/application-buyer-demo.yml index 4e4df4091..5e0d9a09e 100644 --- a/src/main/resources/application-buyer-demo.yml +++ b/src/main/resources/application-buyer-demo.yml @@ -23,9 +23,9 @@ viewer: clearfolio: artifact-token: - secret: ${CLEARFOLIO_ARTIFACT_TOKEN_SECRET:} + secret: tenant-claims: - hmac-secret: ${CLEARFOLIO_TENANT_CLAIMS_HMAC_SECRET:} + hmac-secret: max-skew-seconds: ${CLEARFOLIO_TENANT_CLAIMS_MAX_SKEW_SECONDS:300} artifact-link-ledger: path: ${CLEARFOLIO_ARTIFACT_LINK_LEDGER_PATH:} diff --git a/src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java b/src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java index ad63a8015..d29061e36 100644 --- a/src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java +++ b/src/test/java/com/clearfolio/viewer/controller/AdminControllerTest.java @@ -14,19 +14,34 @@ import com.clearfolio.viewer.service.DocumentConversionService; import com.clearfolio.viewer.service.RetryDeadLetterResult; +import com.clearfolio.viewer.auth.TenantAccessService; +import com.clearfolio.viewer.auth.TenantContext; +import org.springframework.http.HttpHeaders; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; + +import com.clearfolio.viewer.model.ConversionJobStatus; 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 mockContext = mock(TenantContext.class); + when(mockContext.tenantId()).thenReturn("buyer-demo"); + when(mockContext.subjectId()).thenReturn("subject-1"); + org.mockito.Mockito.doCallRealMethod().when(tenantAccessService).requireSameTenant(any(), any()); + when(tenantAccessService.require(any(HttpHeaders.class), any(String.class))).thenReturn(mockContext); } @Test @@ -79,9 +94,30 @@ void getAllJobsFiltersByDeadLetteredFalse() { .jsonPath("$.jobs[0].fileName").isEqualTo("b.pdf"); } + + @Test + void getAllJobsSkipsJobsNotBelongingToTenant() { + 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); + // job1 belongs to buyer-demo by default. + // We can't change job2's tenant easily without reflection or constructor if we didn't add it. + // Wait, ConversionJob has a constructor with tenantId! + ConversionJob job3 = new ConversionJob(UUID.randomUUID(), "other-tenant", "subject-1", "c.pdf", "application/pdf", "hash-c", 100L, 0); + + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(job1, job2, job3)); + + webTestClient.get() + .uri("/api/v1/admin/convert/jobs") + .exchange() + .expectStatus().isOk() + .expectBody() + .jsonPath("$.jobs.length()").isEqualTo(2); + } @Test void deleteJobReturnsNoContent() { UUID jobId = UUID.randomUUID(); + ConversionJob mockJob = new ConversionJob(jobId, "a.pdf", "application/pdf", "hash-a", 100L); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(mockJob)); webTestClient.delete() .uri("/api/v1/admin/convert/jobs/" + jobId) @@ -92,7 +128,8 @@ void deleteJobReturnsNoContent() { @Test void retryDeadLetteredReturnsAcceptedWhenAccepted() { UUID jobId = UUID.randomUUID(); - when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.ACCEPTED); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(new ConversionJob(jobId, "a", "application/pdf", "hash", 100L))); + when(conversionService.retryDeadLettered(eq(jobId), any(String.class))).thenReturn(RetryDeadLetterResult.ACCEPTED); webTestClient.post() .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry") @@ -103,7 +140,8 @@ void retryDeadLetteredReturnsAcceptedWhenAccepted() { @Test void retryDeadLetteredReturnsNotFoundWhenNotFound() { UUID jobId = UUID.randomUUID(); - when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.NOT_FOUND); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(new ConversionJob(jobId, "a", "application/pdf", "hash", 100L))); + when(conversionService.retryDeadLettered(eq(jobId), any(String.class))).thenReturn(RetryDeadLetterResult.NOT_FOUND); webTestClient.post() .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry") @@ -114,11 +152,71 @@ void retryDeadLetteredReturnsNotFoundWhenNotFound() { @Test void retryDeadLetteredReturnsConflictWhenNotEligible() { UUID jobId = UUID.randomUUID(); - when(conversionService.retryDeadLettered(jobId, "admin")).thenReturn(RetryDeadLetterResult.NOT_ELIGIBLE); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(new ConversionJob(jobId, "a", "application/pdf", "hash", 100L))); + 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); } + + @Test + void deleteJobThrowsWhenJobNotFound() { + UUID jobId = UUID.randomUUID(); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList()); + + webTestClient.delete() + .uri("/api/v1/admin/convert/jobs/" + jobId) + .exchange() + .expectStatus().isNotFound(); + } + + @Test + void retryThrowsWhenJobNotFound() { + UUID jobId = UUID.randomUUID(); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList()); + + webTestClient.post() + .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry") + .exchange() + .expectStatus().isNotFound(); + } + + @Test + void deleteJobThrowsWhenTenantMismatch() { + UUID jobId = UUID.randomUUID(); + ConversionJob mockJob = new ConversionJob(jobId, "a.pdf", "application/pdf", "hash-a", 100L); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(mockJob)); + + // Use a different mock context that does not match "buyer-demo" + TenantContext mockContext = mock(TenantContext.class); + when(mockContext.tenantId()).thenReturn("other-tenant"); + when(tenantAccessService.require(any(HttpHeaders.class), any(String.class))).thenReturn(mockContext); + + webTestClient.delete() + .uri("/api/v1/admin/convert/jobs/" + jobId) + .exchange() + .expectStatus().isNotFound(); + } + + @Test + void retryThrowsWhenTenantMismatch() { + UUID jobId = UUID.randomUUID(); + ConversionJob mockJob = new ConversionJob(jobId, "a.pdf", "application/pdf", "hash-a", 100L); + when(conversionService.getAllJobs()).thenReturn(Arrays.asList(mockJob)); + + TenantContext mockContext = mock(TenantContext.class); + when(mockContext.tenantId()).thenReturn("other-tenant"); + when(mockContext.subjectId()).thenReturn("subject-1"); + when(tenantAccessService.require(any(HttpHeaders.class), any(String.class))).thenReturn(mockContext); + + webTestClient.post() + .uri("/api/v1/admin/convert/jobs/" + jobId + "/retry") + .exchange() + .expectStatus().isNotFound(); + } + + + }