KEYCLOAK-15849 : auth-remote-server exclude -> removed duplicated annotation, fixed @Test(timeout) bug -> replaced by lambda expression.

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java

@@ -27,6 +27,7 @@ import org.jboss.logging.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.RunWith;
+import org.junit.runners.model.TestTimedOutException;
 import org.keycloak.admin.client.Keycloak;
 import org.keycloak.admin.client.resource.AuthenticationManagementResource;
 import org.keycloak.admin.client.resource.RealmsResource;
@@ -78,6 +79,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
+import java.util.concurrent.*;
 import java.util.function.Consumer;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -403,6 +405,34 @@ public abstract class AbstractKeycloakTest {
               .replace("8180", "8543");
     }
 
+    protected interface ExecutableTestMethod {
+        void execute() throws Exception;
+    }
+
+    protected void runTestWithTimeout(long timeout, ExecutableTestMethod executableTestMethod) throws Exception {
+        ExecutorService service = Executors.newSingleThreadExecutor();
+        Callable<Object> callable = new Callable<Object>() {
+            public Object call() throws Exception {
+                executableTestMethod.execute();
+                return null;
+            }
+        };
+        Future<Object> result = service.submit(callable);
+        service.shutdown();
+        try {
+            boolean terminated = service.awaitTermination(timeout,
+                    TimeUnit.MILLISECONDS);
+            if (!terminated) {
+                service.shutdownNow();
+            }
+            result.get(0, TimeUnit.MILLISECONDS); // throws the exception if one occurred during the invocation
+        } catch (TimeoutException e) {
+            throw new TestTimedOutException(timeout, TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            throw new Exception(e);
+        }
+    }
+
     /**
      * @return Return <code>true</code> if you wish to automatically post-process realm and replace
      * all http values with https (and correct ports).

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java

@@ -132,41 +132,42 @@ public class ClientStorageTest extends AbstractTestRealmKeycloakTest {
         oauth.clientId("hardcoded-client");
     }
 
-    @Test(timeout = 4000)
-    @AuthServerContainerExclude(AuthServer.REMOTE) // testingClient doesn't work with remote
-    public void testSearchTimeout() {
-        String hardcodedClient = HardcodedClientStorageProviderFactory.PROVIDER_ID;
-        String delayedSearch = HardcodedClientStorageProviderFactory.DELAYED_SEARCH;
-        String providerId = this.providerId;
-        testingClient.server().run(session -> {
-            RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
-            
-            assertThat(session.clientStorageManager()
-                        .searchClientsByClientIdStream(realm, "client", null, null)
-                        .map(ClientModel::getClientId)
-                        .collect(Collectors.toList()), 
-                    allOf(
-                        hasItem(hardcodedClient),
-                        hasItem("root-url-client"))
-                    );
-            
-            //update the provider to simulate delay during the search
-            ComponentModel memoryProvider = realm.getComponent(providerId);
-            memoryProvider.getConfig().putSingle(delayedSearch, Boolean.toString(true));
-            realm.updateComponent(memoryProvider);
+    @Test
+    public void testSearchTimeout() throws Exception{
+        runTestWithTimeout(4000, () -> {
+            String hardcodedClient = HardcodedClientStorageProviderFactory.PROVIDER_ID;
+            String delayedSearch = HardcodedClientStorageProviderFactory.DELAYED_SEARCH;
+            String providerId = this.providerId;
+            testingClient.server().run(session -> {
+                RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
 
-        });
-        
-        testingClient.server().run(session -> {
-            // search for clients and check hardcoded-client is not present
-            assertThat(session.clientStorageManager()
-                    .searchClientsByClientIdStream(session.realms().getRealmByName(AuthRealm.TEST), "client", null, null)
-                    .map(ClientModel::getClientId)
-                    .collect(Collectors.toList()),
-                allOf(
-                    not(hasItem(hardcodedClient)), 
-                    hasItem("root-url-client")
-                ));
+                assertThat(session.clientStorageManager()
+                            .searchClientsByClientIdStream(realm, "client", null, null)
+                            .map(ClientModel::getClientId)
+                            .collect(Collectors.toList()),
+                        allOf(
+                            hasItem(hardcodedClient),
+                            hasItem("root-url-client"))
+                        );
+
+                //update the provider to simulate delay during the search
+                ComponentModel memoryProvider = realm.getComponent(providerId);
+                memoryProvider.getConfig().putSingle(delayedSearch, Boolean.toString(true));
+                realm.updateComponent(memoryProvider);
+
+            });
+
+            testingClient.server().run(session -> {
+                // search for clients and check hardcoded-client is not present
+                assertThat(session.clientStorageManager()
+                        .searchClientsByClientIdStream(session.realms().getRealmByName(AuthRealm.TEST), "client", null, null)
+                        .map(ClientModel::getClientId)
+                        .collect(Collectors.toList()),
+                    allOf(
+                        not(hasItem(hardcodedClient)),
+                        hasItem("root-url-client")
+                    ));
+            });
         });
     }
 

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java

@@ -86,41 +86,42 @@ public class GroupStorageTest extends AbstractTestRealmKeycloakTest {
         });
     }
 
-    @Test(timeout = 4000)
-    @AuthServerContainerExclude(AuthServer.REMOTE) // testingClient doesn't work with remote
-    public void testSearchTimeout() {
-        String hardcodedGroup = HardcodedGroupStorageProviderFactory.PROVIDER_ID;
-        String delayedSearch = HardcodedGroupStorageProviderFactory.DELAYED_SEARCH;
-        String providerId = this.providerId;
-        testingClient.server().run(session -> {
-            RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
+    @Test
+    public void testSearchTimeout() throws Exception{
+        runTestWithTimeout(4000, () -> {
+            String hardcodedGroup = HardcodedGroupStorageProviderFactory.PROVIDER_ID;
+            String delayedSearch = HardcodedGroupStorageProviderFactory.DELAYED_SEARCH;
+            String providerId = this.providerId;
+            testingClient.server().run(session -> {
+                RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
 
-            assertThat(session.groupStorageManager()
-                        .searchForGroupByName(realm, "group", null, null).stream()
-                        .map(GroupModel::getName)
-                        .collect(Collectors.toList()), 
-                    allOf(
-                        hasItem(hardcodedGroup),
-                        hasItem("sample-realm-group"))
-                    );
+                assertThat(session.groupStorageManager()
+                            .searchForGroupByName(realm, "group", null, null).stream()
+                            .map(GroupModel::getName)
+                            .collect(Collectors.toList()),
+                        allOf(
+                            hasItem(hardcodedGroup),
+                            hasItem("sample-realm-group"))
+                        );
 
-            //update the provider to simulate delay during the search
-            ComponentModel memoryProvider = realm.getComponent(providerId);
-            memoryProvider.getConfig().putSingle(delayedSearch, Boolean.toString(true));
-            realm.updateComponent(memoryProvider);
-        });
+                //update the provider to simulate delay during the search
+                ComponentModel memoryProvider = realm.getComponent(providerId);
+                memoryProvider.getConfig().putSingle(delayedSearch, Boolean.toString(true));
+                realm.updateComponent(memoryProvider);
+            });
 
-        testingClient.server().run(session -> {
-            RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
-            // search for groups and check hardcoded-group is not present
-            assertThat(session.groupStorageManager()
-                        .searchForGroupByName(realm, "group", null, null).stream()
-                        .map(GroupModel::getName)
-                        .collect(Collectors.toList()),
-                    allOf(
-                        not(hasItem(hardcodedGroup)),
-                        hasItem("sample-realm-group")
-                    ));
+            testingClient.server().run(session -> {
+                RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
+                // search for groups and check hardcoded-group is not present
+                assertThat(session.groupStorageManager()
+                            .searchForGroupByName(realm, "group", null, null).stream()
+                            .map(GroupModel::getName)
+                            .collect(Collectors.toList()),
+                        allOf(
+                            not(hasItem(hardcodedGroup)),
+                            hasItem("sample-realm-group")
+                        ));
+            });
         });
     }
 

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java

@@ -93,41 +93,42 @@ public class RoleStorageTest extends AbstractTestRealmKeycloakTest {
         });
     }
 
-    @Test(timeout = 4000)
-    @AuthServerContainerExclude(AuthServer.REMOTE) // testingClient doesn't work with remote
-    public void testSearchTimeout() {
-        String hardcodedRole = HardcodedRoleStorageProviderFactory.PROVIDER_ID;
-        String delayedSearch = HardcodedRoleStorageProviderFactory.DELAYED_SEARCH;
-        String providerId = this.providerId;
-        testingClient.server().run(session -> {
-            RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
+    @Test
+    public void testSearchTimeout() throws Exception{
+        runTestWithTimeout(4000, () -> {
+            String hardcodedRole = HardcodedRoleStorageProviderFactory.PROVIDER_ID;
+            String delayedSearch = HardcodedRoleStorageProviderFactory.DELAYED_SEARCH;
+            String providerId = this.providerId;
+            testingClient.server().run(session -> {
+                RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
 
-            assertThat(session.roleStorageManager()
-                        .searchForRolesStream(realm, "role", null, null)
-                        .map(RoleModel::getName)
-                        .collect(Collectors.toList()), 
-                    allOf(
-                        hasItem(hardcodedRole),
-                        hasItem("sample-realm-role"))
-                    );
+                assertThat(session.roleStorageManager()
+                            .searchForRolesStream(realm, "role", null, null)
+                            .map(RoleModel::getName)
+                            .collect(Collectors.toList()),
+                        allOf(
+                            hasItem(hardcodedRole),
+                            hasItem("sample-realm-role"))
+                        );
 
-            //update the provider to simulate delay during the search
-            ComponentModel memoryProvider = realm.getComponent(providerId);
-            memoryProvider.getConfig().putSingle(delayedSearch, Boolean.toString(true));
-            realm.updateComponent(memoryProvider);
-        });
+                //update the provider to simulate delay during the search
+                ComponentModel memoryProvider = realm.getComponent(providerId);
+                memoryProvider.getConfig().putSingle(delayedSearch, Boolean.toString(true));
+                realm.updateComponent(memoryProvider);
+            });
 
-        testingClient.server().run(session -> {
-            RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
-            // search for roles and check hardcoded-role is not present
-            assertThat(session.roleStorageManager()
-                        .searchForRolesStream(realm, "role", null, null)
-                        .map(RoleModel::getName)
-                        .collect(Collectors.toList()),
-                    allOf(
-                        not(hasItem(hardcodedRole)), 
-                        hasItem("sample-realm-role")
-                    ));
+            testingClient.server().run(session -> {
+                RealmModel realm = session.realms().getRealmByName(AuthRealm.TEST);
+                // search for roles and check hardcoded-role is not present
+                assertThat(session.roleStorageManager()
+                            .searchForRolesStream(realm, "role", null, null)
+                            .map(RoleModel::getName)
+                            .collect(Collectors.toList()),
+                        allOf(
+                            not(hasItem(hardcodedRole)),
+                            hasItem("sample-realm-role")
+                        ));
+            });
         });
     }
 

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java

@@ -43,47 +43,48 @@ import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC;
 @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9)
 public class SamlXMLAttacksTest extends AbstractSamlTest {
 
-    @Test(timeout = 4000)
+    @Test
     public void testXMLBombAttackResistance() throws Exception {
+        runTestWithTimeout(4000, () -> {
+            String bombDoctype = "<!DOCTYPE AuthnRequest [" +
+            " <!ENTITY lol \"lol\">" +
+                    "<!ELEMENT AuthnRequest (#PCDATA)>" +
+                    "<!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">" +
+                    "<!ENTITY lol2 \"&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;\">" +
+                    "<!ENTITY lol3 \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">" +
+                    "<!ENTITY lol4 \"&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;\">" +
+                    "<!ENTITY lol5 \"&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;\">" +
+                    "<!ENTITY lol6 \"&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;\">" +
+                    "<!ENTITY lol7 \"&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;\">" +
+                    "<!ENTITY lol8 \"&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;\">" +
+                    "<!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">" +
+                    "]>";
 
-        String bombDoctype = "<!DOCTYPE AuthnRequest [" +
-        " <!ENTITY lol \"lol\">" +
-                "<!ELEMENT AuthnRequest (#PCDATA)>" +
-                "<!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">" +
-                "<!ENTITY lol2 \"&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;\">" +
-                "<!ENTITY lol3 \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">" +
-                "<!ENTITY lol4 \"&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;\">" +
-                "<!ENTITY lol5 \"&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;\">" +
-                "<!ENTITY lol6 \"&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;\">" +
-                "<!ENTITY lol7 \"&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;\">" +
-                "<!ENTITY lol8 \"&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;\">" +
-                "<!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">" +
-                "]>";
-        
-        String samlAuthnRequest = "<samlp:AuthnRequest xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\" ID=\"a123\" Version=\"2.0\" IssueInstant=\"2014-07-16T23:52:45Z\" >" +
-                "<saml:Issuer>" + SAML_CLIENT_ID_SALES_POST + "&lol9;</saml:Issuer>" +
-                "</samlp:AuthnRequest>";
+            String samlAuthnRequest = "<samlp:AuthnRequest xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\" ID=\"a123\" Version=\"2.0\" IssueInstant=\"2014-07-16T23:52:45Z\" >" +
+                    "<saml:Issuer>" + SAML_CLIENT_ID_SALES_POST + "&lol9;</saml:Issuer>" +
+                    "</samlp:AuthnRequest>";
 
-        try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
-            HttpPost post = new HttpPost(getAuthServerSamlEndpoint(REALM_NAME));
+            try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
+                HttpPost post = new HttpPost(getAuthServerSamlEndpoint(REALM_NAME));
 
-            List<NameValuePair> parameters = new LinkedList<>();
-            String encoded = PostBindingUtil.base64Encode(bombDoctype + samlAuthnRequest);
-            parameters.add(new BasicNameValuePair(GeneralConstants.SAML_REQUEST_KEY, encoded));
+                List<NameValuePair> parameters = new LinkedList<>();
+                String encoded = PostBindingUtil.base64Encode(bombDoctype + samlAuthnRequest);
+                parameters.add(new BasicNameValuePair(GeneralConstants.SAML_REQUEST_KEY, encoded));
 
-            UrlEncodedFormEntity formEntity;
-            try {
-                formEntity = new UrlEncodedFormEntity(parameters, "UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
+                UrlEncodedFormEntity formEntity;
+                try {
+                    formEntity = new UrlEncodedFormEntity(parameters, "UTF-8");
+                } catch (UnsupportedEncodingException e) {
+                    throw new RuntimeException(e);
+                }
+
+                post.setEntity(formEntity);
+
+                try (CloseableHttpResponse response = client.execute(post)) {
+                    assertThat(response, bodyHC(containsString("Invalid Request")));
+                }
             }
-
-            post.setEntity(formEntity);
-            
-            try (CloseableHttpResponse response = client.execute(post)) {
-                assertThat(response, bodyHC(containsString("Invalid Request")));
-            }
-        }
+        });
     }
 
     @Deployment(name = "DTD")