Add check for Role and Unit Test

Apicurio · Oct 15, 2023 · 0aee18e · 0aee18e
1 parent 5cba304
commit 0aee18e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/src/main/java/io/apicurio/registry/rest/v2/AdminResourceImpl.java b/app/src/main/java/io/apicurio/registry/rest/v2/AdminResourceImpl.java
@@ -71,6 +71,7 @@
 import static io.apicurio.registry.util.DtoUtil.appAuthPropertyToRegistry;
 import static io.apicurio.registry.util.DtoUtil.registryAuthPropertyToApp;
 
+
 /**
  * @author [email protected]
  */
@@ -338,8 +339,7 @@ public RoleMapping getRoleMapping(String principalId) {
     @RoleBasedAccessApiOperation
     public void updateRoleMapping(String principalId, UpdateRole data) {
         requireParameter("principalId", principalId);
-        requireParameter("roleName", data.getRole().name());
-
+        requireParameter("role", data.getRole());
         storage.updateRoleMapping(principalId, data.getRole().name());
     }
 

diff --git a/app/src/test/java/io/apicurio/registry/rbac/AdminResourceTest.java b/app/src/test/java/io/apicurio/registry/rbac/AdminResourceTest.java
@@ -720,6 +720,16 @@ public void testRoleMappings() throws Exception {
                 .body("error_code", equalTo(404))
                 .body("message", equalTo("No mapping for principal 'UnknownPrincipal' and role 'READ_ONLY' was found."));
 
+        //Update a mapping with null RoleType
+        update.setRole(null);
+        given()
+            .when()
+                .contentType(CT_JSON)
+                .body(update)
+                .put("/registry/v2/admin/roleMappings/TestUser")
+            .then()
+                .statusCode(400);
+
         // Delete a role mapping
         given()
             .when()