adding automation rest tests of oidc auth module for keycloak

Evolveum · May 26, 2023 · a2acab5 · a2acab5
1 parent d1a1602
commit a2acab5
Show file tree

Hide file tree

Showing 21 changed files with 443 additions and 428 deletions.
diff --git a/...evolveum/midpoint/authentication/impl/factory/module/OidcResourceServerModuleFactory.java b/...evolveum/midpoint/authentication/impl/factory/module/OidcResourceServerModuleFactory.java
@@ -110,7 +110,9 @@ private RemoteModuleWebSecurityConfiguration createJwtResourceServerConfiguratio
         configuration.setSequenceSuffix(sequenceSuffix);
 
         JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
-        if (resourceServer.getNameOfUsernameClaim() != null) {
+        if (resourceServer.getJwt() != null && resourceServer.getJwt().getNameOfUsernameClaim() != null) {
+            jwtAuthenticationConverter.setPrincipalClaimName(resourceServer.getJwt().getNameOfUsernameClaim());
+        } else if (resourceServer.getNameOfUsernameClaim() != null) {
             jwtAuthenticationConverter.setPrincipalClaimName(resourceServer.getNameOfUsernameClaim());
         }
         configuration.addAuthenticationProvider(getObjectObjectPostProcessor().postProcess(

diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
@@ -2220,6 +2220,9 @@ protected <O extends ObjectType> PrismObject<O> parseObject(File file) throws Sc
         return prismContext.parseObject(file);
     }
 
+    protected <O extends ObjectType> PrismObject<O> parseObject(String stringData) throws SchemaException, IOException {
+        return prismContext.parseObject(stringData);
+    }
     protected void displayCleanup() {
         TestUtil.displayCleanup(getTestNameShort());
     }

diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
@@ -327,4 +327,23 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>restAuthenticationTest</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <skipTests>false</skipTests>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>testng-authentication.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/...st/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractAuthentication.java b/...st/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractAuthentication.java
@@ -28,6 +28,7 @@
 
 public abstract class TestAbstractAuthentication extends AbstractRestServiceInitializer {
 
+    protected static final File MIDPOINT_HOME = new File("target/midpoint-home");
     protected static final File BASE_AUTHENTICATION_DIR = new File("src/test/resources/authentication/");
     protected static final File BASE_REPO_DIR = new File(BASE_AUTHENTICATION_DIR,"repo/");
 
@@ -86,4 +87,12 @@ protected void replaceSecurityPolicy(File securityPolicy) throws CommonException
         addObject(secPolicy, executeOptions().overwrite(), task, result);
         getDummyAuditService().clear();
     }
+
+    protected void replaceSecurityPolicy(String securityPolicy) throws CommonException, IOException {
+        Task task = getTestTask();
+        OperationResult result = task.getResult();
+        PrismObject<SecurityPolicyType> secPolicy = parseObject(securityPolicy);
+        addObject(secPolicy, executeOptions().overwrite(), task, result);
+        getDummyAuditService().clear();
+    }
 }
diff --git a/...st/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractOidcRestModule.java b/...st/java/com/evolveum/midpoint/testing/rest/authentication/TestAbstractOidcRestModule.java
diff --git a/.../java/com/evolveum/midpoint/testing/rest/authentication/TestOidcRestAuthByHMacModule.java b/.../java/com/evolveum/midpoint/testing/rest/authentication/TestOidcRestAuthByHMacModule.java
diff --git a/.../com/evolveum/midpoint/testing/rest/authentication/TestOidcRestAuthByPublicKeyModule.java b/.../com/evolveum/midpoint/testing/rest/authentication/TestOidcRestAuthByPublicKeyModule.java