Merge pull request #6 from rnc/NCL8976

NCL-8976 Add roles
project-ncl · Dec 18, 2024 · 26ff0cc · 26ff0cc
2 parents d5cdf42 + aeebbb8
commit 26ff0cc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -137,15 +137,20 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-security</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-test-kubernetes-client</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>

diff --git a/src/main/java/org/jboss/pnc/konfluxbuilddriver/endpoints/Internal.java b/src/main/java/org/jboss/pnc/konfluxbuilddriver/endpoints/Internal.java
@@ -1,5 +1,6 @@
 package org.jboss.pnc.konfluxbuilddriver.endpoints;
 
+import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.PUT;
@@ -30,6 +31,7 @@ public class Internal {
     @PUT
     @Path("/completed")
     @RunOnVirtualThread
+    @RolesAllowed({ "pnc-app-konflux-build-driver-user", "pnc-users-admin" })
     public void buildExecutionCompleted(PipelineNotification notification) {
         logger.info("Build completed, taskId: {}; status: {}.", notification.buildId(), notification.status());
         driver.completed(notification);

diff --git a/src/main/java/org/jboss/pnc/konfluxbuilddriver/endpoints/Public.java b/src/main/java/org/jboss/pnc/konfluxbuilddriver/endpoints/Public.java
@@ -1,5 +1,6 @@
 package org.jboss.pnc.konfluxbuilddriver.endpoints;
 
+import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
@@ -39,6 +40,7 @@ public class Public {
     @POST
     @Path("/build")
     @RunOnVirtualThread
+    @RolesAllowed({ "pnc-app-konflux-build-driver-user", "pnc-users-admin" })
     public BuildResponse build(BuildRequest buildRequest) {
         logger.info("Requested project build: {}", buildRequest.projectName());
         return driver.create(buildRequest);
@@ -47,6 +49,7 @@ public BuildResponse build(BuildRequest buildRequest) {
     @PUT
     @Path("/cancel")
     @RunOnVirtualThread
+    @RolesAllowed({ "pnc-app-konflux-build-driver-user", "pnc-users-admin" })
     public void cancel(CancelRequest cancelRequest) {
         logger.info("Requested cancel: {}", cancelRequest.pipelineId());
         driver.cancel(cancelRequest);

diff --git a/src/test/java/org/jboss/pnc/konfluxbuilddriver/EndpointTest.java b/src/test/java/org/jboss/pnc/konfluxbuilddriver/EndpointTest.java
@@ -19,6 +19,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
+import io.quarkus.test.security.TestSecurity;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
@@ -41,6 +42,7 @@ public void setup() {
     }
 
     @Test
+    @TestSecurity(user = "testUser", roles = { "pnc-users-admin" })
     void verify() {
         BuildRequest request = BuildRequest.builder().namespace("default").podMemoryOverride("1Gi").build();
         Response res = RestAssured.given().contentType(ContentType.JSON)