From 075e28445582f7bcd749c4d5daa012afb31a4561 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 18 May 2022 10:34:47 +0200 Subject: [PATCH] Remove legacy (non-Elytron) WildFly adapter (#11789) Closes #11683 --- adapters/oidc/wildfly/pom.xml | 1 - adapters/oidc/wildfly/wildfly-adapter/pom.xml | 112 ------- .../adapters/wildfly/SecurityInfoHelper.java | 133 -------- .../WildflyAuthenticationMechanism.java | 52 --- .../WildflyKeycloakServletExtension.java | 42 --- .../wildfly/WildflyRequestAuthenticator.java | 198 ----------- .../io.undertow.servlet.ServletExtension | 18 - .../oidc/wildfly/wildfly-subsystem/pom.xml | 5 - .../KeycloakDependencyProcessorWildFly.java | 5 +- adapters/saml/wildfly/pom.xml | 1 - adapters/saml/wildfly/wildfly-adapter/pom.xml | 105 ------ .../saml/wildfly/SecurityInfoHelper.java | 133 -------- .../saml/wildfly/WildflySamlAuthMech.java | 42 --- .../saml/wildfly/WildflySamlExtension.java | 35 -- .../saml/wildfly/WildflySamlSessionStore.java | 57 ---- ...InfinispanSessionCacheIdMapperUpdater.java | 122 ------- .../SsoCacheSessionIdMapperUpdater.java | 115 ------- .../infinispan/SsoSessionCacheListener.java | 203 ------------ .../io.undertow.servlet.ServletExtension | 18 - .../saml/wildfly/wildfly-subsystem/pom.xml | 2 +- .../KeycloakDependencyProcessorWildFly.java | 5 +- .../adapter-feature-pack/pom.xml | 10 - .../keycloak-wildfly-adapter/main/module.xml | 49 --- .../main/module.xml | 1 - .../adapter-galleon-pack/pom.xml | 308 ------------------ .../keycloak-client-oidc/layer-spec.xml | 46 --- .../resources/packages/licenses/package.xml | 4 - .../wildfly-feature-pack-build-eap.xml | 47 --- .../wildfly-feature-pack-build.xml | 47 --- distribution/galleon-feature-packs/pom.xml | 1 - .../main/module.xml | 1 - .../wildfly-adapter/wildfly-modules/build.xml | 4 - .../wildfly-adapter/wildfly-modules/pom.xml | 10 - .../main/module.xml | 51 --- pom.xml | 10 - .../integration-arquillian/HOW-TO-RUN.md | 21 -- testsuite/integration-arquillian/pom.xml | 5 - .../servers/app-server/jboss/pom.xml | 12 - .../jboss/wildfly-deprecated/pom.xml | 62 ---- ...eprecatedAppServerArquillianExtension.java | 34 -- .../WildflyDeprecatedAppServerProvider.java | 165 ---------- ...yDeprecatedDeploymentArchiveProcessor.java | 73 ----- ...boss.arquillian.core.spi.LoadableExtension | 1 - ...llian.container.AppServerContainerProvider | 1 - .../src/saml-adapter-supported | 1 - .../integration-arquillian/tests/base/pom.xml | 38 --- .../DefaultAuthzConfigAdapterTest.java | 1 - .../authorization/LifespanAdapterTest.java | 1 - .../PermissiveModeAdapterTest.java | 1 - .../PhotozAccountResourcesAdapterTest.java | 1 - ...PhotozExampleLazyLoadPathsAdapterTest.java | 1 - ...otozExampleNoLazyLoadPathsAdapterTest.java | 1 - .../ServletAuthzCIPAdapterTest.java | 1 - .../ServletAuthzCacheDisabledAdapterTest.java | 1 - .../ServletAuthzCacheLifespanAdapterTest.java | 1 - .../ServletAuthzLazyLoadPathsAdapterTest.java | 1 - ...ervletAuthzNoLazyLoadPathsAdapterTest.java | 1 - .../ServletPolicyEnforcerLifespanTest.java | 1 - .../ServletPolicyEnforcerTest.java | 1 - .../example/cors/CorsExampleAdapterTest.java | 1 - .../BrokerLinkAndTokenExchangeTest.java | 1 - .../ClientInitiatedAccountLinkTest.java | 1 - .../servlet/DemoFilterServletAdapterTest.java | 1 - ...rvletAdapterTestForCustomizedIdMapper.java | 1 - .../servlet/DemoServletsAdapterTest.java | 1 - .../adapter/servlet/MultiTenancyTest.java | 1 - .../OIDCPublicKeyRotationAdapterTest.java | 1 - .../servlet/OfflineServletsAdapterTest.java | 1 - .../servlet/SAMLClockSkewAdapterTest.java | 2 - .../SAMLFilterLoginResponseHandlingTest.java | 1 - .../servlet/SAMLFilterServletAdapterTest.java | 1 - .../SAMLFilterServletSessionTimeoutTest.java | 1 - .../SAMLLoginResponseHandlingTest.java | 1 - .../servlet/SAMLLogoutAdapterTest.java | 1 - .../servlet/SAMLServletAdapterTest.java | 1 - .../SAMLServletSessionTimeoutTest.java | 1 - .../adapter/servlet/SamlSignatureTest.java | 1 - .../SecuredDeploymentsAdapterTest.java | 1 - .../servlet/SessionServletAdapterTest.java | 1 - .../servlet/UserStorageConsentTest.java | 1 - .../cluster/OIDCAdapterClusterTest.java | 1 - .../cluster/OIDCFilterAdapterClusterTest.java | 1 - .../cluster/SAMLAdapterClusterTest.java | 1 - .../crossdc/SAMLAdapterCrossDCTest.java | 1 - .../testsuite/saml/SamlXMLAttacksTest.java | 1 - .../utils/arquillian/ContainerConstants.java | 3 - 86 files changed, 3 insertions(+), 2446 deletions(-) delete mode 100644 adapters/oidc/wildfly/wildfly-adapter/pom.xml delete mode 100644 adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java delete mode 100644 adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyAuthenticationMechanism.java delete mode 100644 adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyKeycloakServletExtension.java delete mode 100644 adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java delete mode 100644 adapters/oidc/wildfly/wildfly-adapter/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension delete mode 100755 adapters/saml/wildfly/wildfly-adapter/pom.xml delete mode 100755 adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java delete mode 100755 adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlAuthMech.java delete mode 100755 adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlExtension.java delete mode 100755 adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlSessionStore.java delete mode 100644 adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/InfinispanSessionCacheIdMapperUpdater.java delete mode 100644 adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/SsoCacheSessionIdMapperUpdater.java delete mode 100644 adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/SsoSessionCacheListener.java delete mode 100755 adapters/saml/wildfly/wildfly-adapter/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension delete mode 100755 distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-adapter/main/module.xml delete mode 100644 distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml delete mode 100644 distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml delete mode 100644 distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/packages/licenses/package.xml delete mode 100644 distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml delete mode 100644 distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml delete mode 100755 distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-saml-wildfly-adapter/main/module.xml delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/pom.xml delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/WildflyDeprecatedAppServerArquillianExtension.java delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedDeploymentArchiveProcessor.java delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider delete mode 100644 testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/saml-adapter-supported diff --git a/adapters/oidc/wildfly/pom.xml b/adapters/oidc/wildfly/pom.xml index 9f24cbf2e2b..93382e17d80 100755 --- a/adapters/oidc/wildfly/pom.xml +++ b/adapters/oidc/wildfly/pom.xml @@ -31,7 +31,6 @@ pom - wildfly-adapter wildfly-subsystem \ No newline at end of file diff --git a/adapters/oidc/wildfly/wildfly-adapter/pom.xml b/adapters/oidc/wildfly/wildfly-adapter/pom.xml deleted file mode 100644 index b2aa2e20299..00000000000 --- a/adapters/oidc/wildfly/wildfly-adapter/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - keycloak-parent - org.keycloak - 999-SNAPSHOT - ../../../../pom.xml - - 4.0.0 - - keycloak-wildfly-adapter - Keycloak Wildfly Integration - - - - - org.jboss.logging - jboss-logging - provided - - - org.keycloak - keycloak-core - - - org.keycloak - keycloak-adapter-spi - - - org.keycloak - keycloak-adapter-core - - - org.keycloak - keycloak-undertow-adapter-spi - - - org.keycloak - keycloak-undertow-adapter - - - org.keycloak - keycloak-jboss-adapter-core - - - org.apache.httpcomponents - httpclient - - - org.bouncycastle - bcprov-jdk15on - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - org.picketbox - picketbox - ${picketbox.version} - provided - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - provided - - - - io.undertow - undertow-servlet - provided - - - io.undertow - undertow-core - provided - - - junit - junit - test - - - - diff --git a/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java b/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java deleted file mode 100644 index 8f118c6cb4a..00000000000 --- a/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.adapters.wildfly; - -import org.jboss.security.NestableGroup; -import org.jboss.security.SecurityConstants; -import org.jboss.security.SecurityContextAssociation; -import org.jboss.security.SimpleGroup; -import org.jboss.security.SimplePrincipal; -import org.keycloak.adapters.spi.KeycloakAccount; - -import javax.security.auth.Subject; -import java.security.Principal; -import java.security.acl.Group; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Set; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class SecurityInfoHelper { - public static void propagateSessionInfo(KeycloakAccount account) { - Subject subject = new Subject(); - Set principals = subject.getPrincipals(); - principals.add(account.getPrincipal()); - Group[] roleSets = getRoleSets(account.getRoles()); - for (int g = 0; g < roleSets.length; g++) { - Group group = roleSets[g]; - String name = group.getName(); - Group subjectGroup = createGroup(name, principals); - if (subjectGroup instanceof NestableGroup) { - /* A NestableGroup only allows Groups to be added to it so we - need to add a SimpleGroup to subjectRoles to contain the roles - */ - SimpleGroup tmp = new SimpleGroup("Roles"); - subjectGroup.addMember(tmp); - subjectGroup = tmp; - } - // Copy the group members to the Subject group - Enumeration members = group.members(); - while (members.hasMoreElements()) { - Principal role = (Principal) members.nextElement(); - subjectGroup.addMember(role); - } - } - // add the CallerPrincipal group if none has been added in getRoleSets - Group callerGroup = new SimpleGroup(SecurityConstants.CALLER_PRINCIPAL_GROUP); - callerGroup.addMember(account.getPrincipal()); - principals.add(callerGroup); - org.jboss.security.SecurityContext sc = SecurityContextAssociation.getSecurityContext(); - Principal userPrincipal = getPrincipal(subject); - sc.getUtil().createSubjectInfo(userPrincipal, account, subject); - } - - /** - * Get the Principal given the authenticated Subject. Currently the first subject that is not of type {@code Group} is - * considered or the single subject inside the CallerPrincipal group. - * - * @param subject - * @return the authenticated subject - */ - protected static Principal getPrincipal(Subject subject) { - Principal principal = null; - Principal callerPrincipal = null; - if (subject != null) { - Set principals = subject.getPrincipals(); - if (principals != null && !principals.isEmpty()) { - for (Principal p : principals) { - if (!(p instanceof Group) && principal == null) { - principal = p; - } - if (p instanceof Group) { - Group g = Group.class.cast(p); - if (g.getName().equals(SecurityConstants.CALLER_PRINCIPAL_GROUP) && callerPrincipal == null) { - Enumeration e = g.members(); - if (e.hasMoreElements()) - callerPrincipal = e.nextElement(); - } - } - } - } - } - return callerPrincipal == null ? principal : callerPrincipal; - } - - protected static Group createGroup(String name, Set principals) { - Group roles = null; - Iterator iter = principals.iterator(); - while (iter.hasNext()) { - Object next = iter.next(); - if (!(next instanceof Group)) - continue; - Group grp = (Group) next; - if (grp.getName().equals(name)) { - roles = grp; - break; - } - } - // If we did not find a group create one - if (roles == null) { - roles = new SimpleGroup(name); - principals.add(roles); - } - return roles; - } - - protected static Group[] getRoleSets(Collection roleSet) { - SimpleGroup roles = new SimpleGroup("Roles"); - Group[] roleSets = {roles}; - for (String role : roleSet) { - roles.addMember(new SimplePrincipal(role)); - } - return roleSets; - } -} diff --git a/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyAuthenticationMechanism.java b/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyAuthenticationMechanism.java deleted file mode 100644 index aa23c259014..00000000000 --- a/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyAuthenticationMechanism.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.adapters.wildfly; - -import io.undertow.security.api.SecurityContext; -import io.undertow.server.HttpServerExchange; -import io.undertow.servlet.api.ConfidentialPortManager; -import org.keycloak.adapters.AdapterDeploymentContext; -import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.KeycloakDeployment; -import org.keycloak.adapters.NodesRegistrationManagement; -import org.keycloak.adapters.undertow.ServletKeycloakAuthMech; -import org.keycloak.adapters.undertow.ServletRequestAuthenticator; -import org.keycloak.adapters.undertow.UndertowHttpFacade; -import org.keycloak.adapters.undertow.UndertowUserSessionManagement; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class WildflyAuthenticationMechanism extends ServletKeycloakAuthMech { - - public WildflyAuthenticationMechanism(AdapterDeploymentContext deploymentContext, - UndertowUserSessionManagement userSessionManagement, - NodesRegistrationManagement nodesRegistrationManagement, - ConfidentialPortManager portManager, String errorPage) { - super(deploymentContext, userSessionManagement, nodesRegistrationManagement, portManager, errorPage); - } - - @Override - protected ServletRequestAuthenticator createRequestAuthenticator(KeycloakDeployment deployment, HttpServerExchange exchange, SecurityContext securityContext, UndertowHttpFacade facade) { - int confidentialPort = getConfidentilPort(exchange); - AdapterTokenStore tokenStore = getTokenStore(exchange, facade, deployment, securityContext); - return new WildflyRequestAuthenticator(facade, deployment, - confidentialPort, securityContext, exchange, tokenStore); - } -} diff --git a/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyKeycloakServletExtension.java b/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyKeycloakServletExtension.java deleted file mode 100644 index 23c619e4536..00000000000 --- a/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyKeycloakServletExtension.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.adapters.wildfly; - -import io.undertow.servlet.api.DeploymentInfo; -import org.jboss.logging.Logger; -import org.keycloak.adapters.AdapterDeploymentContext; -import org.keycloak.adapters.NodesRegistrationManagement; -import org.keycloak.adapters.undertow.KeycloakServletExtension; -import org.keycloak.adapters.undertow.ServletKeycloakAuthMech; -import org.keycloak.adapters.undertow.UndertowUserSessionManagement; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class WildflyKeycloakServletExtension extends KeycloakServletExtension { - protected static Logger log = Logger.getLogger(WildflyKeycloakServletExtension.class); - - @Override - protected ServletKeycloakAuthMech createAuthenticationMechanism(DeploymentInfo deploymentInfo, AdapterDeploymentContext deploymentContext, - UndertowUserSessionManagement userSessionManagement, NodesRegistrationManagement nodesRegistrationManagement) { - log.debug("creating WildflyAuthenticationMechanism"); - return new WildflyAuthenticationMechanism(deploymentContext, userSessionManagement, nodesRegistrationManagement, deploymentInfo.getConfidentialPortManager(), getErrorPage(deploymentInfo)); - - } -} diff --git a/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java b/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java deleted file mode 100644 index 3f87bb54498..00000000000 --- a/adapters/oidc/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.adapters.wildfly; - -import java.security.Principal; -import java.security.acl.Group; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Set; - -import javax.security.auth.Subject; - -import org.jboss.logging.Logger; -import org.jboss.security.NestableGroup; -import org.jboss.security.SecurityConstants; -import org.jboss.security.SecurityContextAssociation; -import org.jboss.security.SimpleGroup; -import org.jboss.security.SimplePrincipal; -import org.jboss.security.SubjectInfo; -import org.jboss.security.identity.RoleGroup; -import org.jboss.security.identity.plugins.SimpleRole; -import org.jboss.security.identity.plugins.SimpleRoleGroup; -import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.KeycloakDeployment; -import org.keycloak.adapters.spi.HttpFacade; -import org.keycloak.adapters.undertow.KeycloakUndertowAccount; -import org.keycloak.adapters.undertow.ServletRequestAuthenticator; - -import io.undertow.security.api.SecurityContext; -import io.undertow.server.HttpServerExchange; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class WildflyRequestAuthenticator extends ServletRequestAuthenticator -{ - protected static Logger log = Logger.getLogger(WildflyRequestAuthenticator.class); - - public WildflyRequestAuthenticator(HttpFacade facade, KeycloakDeployment deployment, int sslRedirectPort, - SecurityContext securityContext, HttpServerExchange exchange, - AdapterTokenStore tokenStore) { - super(facade, deployment, sslRedirectPort, securityContext, exchange, tokenStore); - } - - @Override - protected void propagateKeycloakContext(KeycloakUndertowAccount account) { - super.propagateKeycloakContext(account); - SecurityInfoHelper.propagateSessionInfo(account); - log.debug("propagate security context to wildfly"); - Subject subject = new Subject(); - Set principals = subject.getPrincipals(); - principals.add(account.getPrincipal()); - Group[] roleSets = getRoleSets(account.getRoles()); - for (int g = 0; g < roleSets.length; g++) { - Group group = roleSets[g]; - String name = group.getName(); - Group subjectGroup = createGroup(name, principals); - if (subjectGroup instanceof NestableGroup) { - /* A NestableGroup only allows Groups to be added to it so we - need to add a SimpleGroup to subjectRoles to contain the roles - */ - SimpleGroup tmp = new SimpleGroup("Roles"); - subjectGroup.addMember(tmp); - subjectGroup = tmp; - } - // Copy the group members to the Subject group - Enumeration members = group.members(); - while (members.hasMoreElements()) { - Principal role = (Principal) members.nextElement(); - subjectGroup.addMember(role); - } - } - // add the CallerPrincipal group if none has been added in getRoleSets - Group callerGroup = new SimpleGroup(SecurityConstants.CALLER_PRINCIPAL_GROUP); - callerGroup.addMember(account.getPrincipal()); - principals.add(callerGroup); - org.jboss.security.SecurityContext sc = SecurityContextAssociation.getSecurityContext(); - Principal userPrincipal = getPrincipal(subject); - sc.getUtil().createSubjectInfo(userPrincipal, account, subject); - - // Roles of subjectInfo are null, because is was constructed by - // org.jboss.security.identity.extensions.CredentialIdentityFactory - // .createIdentity(Principal [=userPrincipal], Object [=account], Role [=null]). - // Therefore the roles are only contained in the authenticatedSubject (member of subjectInfo) - // and subsequent logics do only access subjectInfo#roles instead of authenticatedSubject#roles. - mapGroupMembersOfAuthenticatedSubjectIntoSecurityContext(sc); - } - - /** - * Get the Principal given the authenticated Subject. Currently the first subject that is not of type {@code Group} is - * considered or the single subject inside the CallerPrincipal group. - * - * @param subject - * @return the authenticated subject - */ - protected Principal getPrincipal(Subject subject) { - Principal principal = null; - Principal callerPrincipal = null; - if (subject != null) { - Set principals = subject.getPrincipals(); - if (principals != null && !principals.isEmpty()) { - for (Principal p : principals) { - if (!(p instanceof Group) && principal == null) { - principal = p; - } - if (p instanceof Group) { - Group g = Group.class.cast(p); - if (g.getName().equals(SecurityConstants.CALLER_PRINCIPAL_GROUP) && callerPrincipal == null) { - Enumeration e = g.members(); - if (e.hasMoreElements()) - callerPrincipal = e.nextElement(); - } - } - } - } - } - return callerPrincipal == null ? principal : callerPrincipal; - } - - protected Group createGroup(String name, Set principals) { - Group roles = null; - Iterator iter = principals.iterator(); - while (iter.hasNext()) { - Object next = iter.next(); - if (!(next instanceof Group)) - continue; - Group grp = (Group) next; - if (grp.getName().equals(name)) { - roles = grp; - break; - } - } - // If we did not find a group create one - if (roles == null) { - roles = new SimpleGroup(name); - principals.add(roles); - } - return roles; - } - - protected Group[] getRoleSets(Collection roleSet) { - SimpleGroup roles = new SimpleGroup("Roles"); - Group[] roleSets = {roles}; - for (String role : roleSet) { - roles.addMember(new SimplePrincipal(role)); - } - return roleSets; - } - - private static void mapGroupMembersOfAuthenticatedSubjectIntoSecurityContext(org.jboss.security.SecurityContext sc) { - SubjectInfo subjectInfo = sc.getSubjectInfo(); - if (subjectInfo == null) { - return; - } - - Subject authenticatedSubject = subjectInfo.getAuthenticatedSubject(); - if (authenticatedSubject == null) { - return; - } - - // Get role group of security context in order to add roles of authenticatedSubject. - RoleGroup scRoles = sc.getUtil().getRoles(); - if (scRoles == null) { - scRoles = new SimpleRoleGroup("Roles"); - sc.getUtil().setRoles(scRoles); - } - - // Get group roles of authenticatedSubject and add each role of the group into security context - Iterator principalItr = authenticatedSubject.getPrincipals().iterator(); - while (principalItr.hasNext()) { - Principal principal = principalItr.next(); - if (principal instanceof Group) { - Enumeration members = ((Group) principal).members(); - while (members.hasMoreElements()) { - Principal role = members.nextElement(); - scRoles.addRole(new SimpleRole(role.getName())); - } - } - } - } -} diff --git a/adapters/oidc/wildfly/wildfly-adapter/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension b/adapters/oidc/wildfly/wildfly-adapter/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension deleted file mode 100644 index 8b8f3ebeb1b..00000000000 --- a/adapters/oidc/wildfly/wildfly-adapter/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright 2016 Red Hat, Inc. and/or its affiliates -# and other contributors as indicated by the @author tags. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -org.keycloak.adapters.wildfly.WildflyKeycloakServletExtension diff --git a/adapters/oidc/wildfly/wildfly-subsystem/pom.xml b/adapters/oidc/wildfly/wildfly-subsystem/pom.xml index 5d40539215b..15caca6302c 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/pom.xml +++ b/adapters/oidc/wildfly/wildfly-subsystem/pom.xml @@ -100,11 +100,6 @@ junit test - - org.keycloak - keycloak-wildfly-adapter - ${project.version} - org.keycloak keycloak-wildfly-elytron-oidc-adapter diff --git a/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakDependencyProcessorWildFly.java b/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakDependencyProcessorWildFly.java index 07625d53be5..3189123152a 100755 --- a/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakDependencyProcessorWildFly.java +++ b/adapters/oidc/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/extension/KeycloakDependencyProcessorWildFly.java @@ -33,16 +33,13 @@ import org.jboss.modules.ModuleLoader; public class KeycloakDependencyProcessorWildFly extends KeycloakDependencyProcessor { private static final ModuleIdentifier KEYCLOAK_ELYTRON_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-wildfly-elytron-oidc-adapter"); - private static final ModuleIdentifier KEYCLOAK_WILDFLY_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-wildfly-adapter"); - private static final ModuleIdentifier KEYCLOAK_UNDERTOW_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-undertow-adapter"); @Override protected void addPlatformSpecificModules(DeploymentPhaseContext phaseContext, ModuleSpecification moduleSpecification, ModuleLoader moduleLoader) { if (isElytronEnabled(phaseContext)) { moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_ELYTRON_ADAPTER, true, false, true, false)); } else { - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_WILDFLY_ADAPTER, false, false, true, false)); - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_UNDERTOW_ADAPTER, false, false, false, false)); + throw new RuntimeException("Legacy WildFly security layer is no longer supported by the Keycloak WildFly adapter"); } } } diff --git a/adapters/saml/wildfly/pom.xml b/adapters/saml/wildfly/pom.xml index 107646261b6..6cb74ba3a46 100755 --- a/adapters/saml/wildfly/pom.xml +++ b/adapters/saml/wildfly/pom.xml @@ -31,7 +31,6 @@ pom - wildfly-adapter wildfly-subsystem diff --git a/adapters/saml/wildfly/wildfly-adapter/pom.xml b/adapters/saml/wildfly/wildfly-adapter/pom.xml deleted file mode 100755 index ce0cf01d166..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - keycloak-parent - org.keycloak - 999-SNAPSHOT - ../../../../pom.xml - - 4.0.0 - - keycloak-saml-wildfly-adapter - Keycloak Wildfly SAML Adapter - - - - - org.jboss.logging - jboss-logging - provided - - - org.keycloak - keycloak-common - - - org.keycloak - keycloak-adapter-spi - - - org.keycloak - keycloak-saml-adapter-api-public - provided - - - org.keycloak - keycloak-saml-adapter-core - - - org.keycloak - keycloak-undertow-adapter-spi - - - org.keycloak - keycloak-saml-undertow-adapter - - - org.keycloak - keycloak-jboss-adapter-core - - - org.infinispan - infinispan-core - - - org.infinispan - infinispan-cachestore-remote - - - org.picketbox - picketbox - ${picketbox.version} - provided - - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - provided - - - - io.undertow - undertow-servlet - provided - - - io.undertow - undertow-core - provided - - - junit - junit - test - - - - diff --git a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java b/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java deleted file mode 100755 index 939f0fd3615..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.adapters.saml.wildfly; - -import org.jboss.security.NestableGroup; -import org.jboss.security.SecurityConstants; -import org.jboss.security.SecurityContextAssociation; -import org.jboss.security.SimpleGroup; -import org.jboss.security.SimplePrincipal; -import org.keycloak.adapters.spi.KeycloakAccount; - -import javax.security.auth.Subject; -import java.security.Principal; -import java.security.acl.Group; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Set; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class SecurityInfoHelper { - public static void propagateSessionInfo(KeycloakAccount account) { - Subject subject = new Subject(); - Set principals = subject.getPrincipals(); - principals.add(account.getPrincipal()); - Group[] roleSets = getRoleSets(account.getRoles()); - for (int g = 0; g < roleSets.length; g++) { - Group group = roleSets[g]; - String name = group.getName(); - Group subjectGroup = createGroup(name, principals); - if (subjectGroup instanceof NestableGroup) { - /* A NestableGroup only allows Groups to be added to it so we - need to add a SimpleGroup to subjectRoles to contain the roles - */ - SimpleGroup tmp = new SimpleGroup("Roles"); - subjectGroup.addMember(tmp); - subjectGroup = tmp; - } - // Copy the group members to the Subject group - Enumeration members = group.members(); - while (members.hasMoreElements()) { - Principal role = (Principal) members.nextElement(); - subjectGroup.addMember(role); - } - } - // add the CallerPrincipal group if none has been added in getRoleSets - Group callerGroup = new SimpleGroup(SecurityConstants.CALLER_PRINCIPAL_GROUP); - callerGroup.addMember(account.getPrincipal()); - principals.add(callerGroup); - org.jboss.security.SecurityContext sc = SecurityContextAssociation.getSecurityContext(); - Principal userPrincipal = getPrincipal(subject); - sc.getUtil().createSubjectInfo(userPrincipal, account, subject); - } - - /** - * Get the Principal given the authenticated Subject. Currently the first subject that is not of type {@code Group} is - * considered or the single subject inside the CallerPrincipal group. - * - * @param subject - * @return the authenticated subject - */ - protected static Principal getPrincipal(Subject subject) { - Principal principal = null; - Principal callerPrincipal = null; - if (subject != null) { - Set principals = subject.getPrincipals(); - if (principals != null && !principals.isEmpty()) { - for (Principal p : principals) { - if (!(p instanceof Group) && principal == null) { - principal = p; - } - if (p instanceof Group) { - Group g = Group.class.cast(p); - if (g.getName().equals(SecurityConstants.CALLER_PRINCIPAL_GROUP) && callerPrincipal == null) { - Enumeration e = g.members(); - if (e.hasMoreElements()) - callerPrincipal = e.nextElement(); - } - } - } - } - } - return callerPrincipal == null ? principal : callerPrincipal; - } - - protected static Group createGroup(String name, Set principals) { - Group roles = null; - Iterator iter = principals.iterator(); - while (iter.hasNext()) { - Object next = iter.next(); - if (!(next instanceof Group)) - continue; - Group grp = (Group) next; - if (grp.getName().equals(name)) { - roles = grp; - break; - } - } - // If we did not find a group create one - if (roles == null) { - roles = new SimpleGroup(name); - principals.add(roles); - } - return roles; - } - - protected static Group[] getRoleSets(Collection roleSet) { - SimpleGroup roles = new SimpleGroup("Roles"); - Group[] roleSets = {roles}; - for (String role : roleSet) { - roles.addMember(new SimplePrincipal(role)); - } - return roleSets; - } -} diff --git a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlAuthMech.java b/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlAuthMech.java deleted file mode 100755 index ae4e242b6fd..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlAuthMech.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.adapters.saml.wildfly; - -import io.undertow.security.api.SecurityContext; -import io.undertow.server.HttpServerExchange; -import org.keycloak.adapters.saml.SamlDeployment; -import org.keycloak.adapters.saml.SamlDeploymentContext; -import org.keycloak.adapters.saml.SamlSessionStore; -import org.keycloak.adapters.saml.undertow.ServletSamlAuthMech; -import org.keycloak.adapters.spi.HttpFacade; -import org.keycloak.adapters.undertow.UndertowUserSessionManagement; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class WildflySamlAuthMech extends ServletSamlAuthMech { - public WildflySamlAuthMech(SamlDeploymentContext deploymentContext, UndertowUserSessionManagement sessionManagement, String errorPage) { - super(deploymentContext, sessionManagement, errorPage); - } - - @Override - protected SamlSessionStore getTokenStore(HttpServerExchange exchange, HttpFacade facade, SamlDeployment deployment, SecurityContext securityContext) { - return new WildflySamlSessionStore(exchange, sessionManagement, securityContext, idMapper, getIdMapperUpdater(), deployment); - } -} diff --git a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlExtension.java b/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlExtension.java deleted file mode 100755 index c5f37c3c03b..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlExtension.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.adapters.saml.wildfly; - -import io.undertow.servlet.api.DeploymentInfo; -import org.keycloak.adapters.saml.SamlDeploymentContext; -import org.keycloak.adapters.saml.undertow.SamlServletExtension; -import org.keycloak.adapters.saml.undertow.ServletSamlAuthMech; -import org.keycloak.adapters.undertow.UndertowUserSessionManagement; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class WildflySamlExtension extends SamlServletExtension { - @Override - protected ServletSamlAuthMech createAuthMech(DeploymentInfo deploymentInfo, SamlDeploymentContext deploymentContext, UndertowUserSessionManagement userSessionManagement) { - return new WildflySamlAuthMech(deploymentContext, userSessionManagement, getErrorPage(deploymentInfo)); - } -} diff --git a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlSessionStore.java b/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlSessionStore.java deleted file mode 100755 index 5f8d717d45f..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlSessionStore.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.adapters.saml.wildfly; - -import io.undertow.security.api.SecurityContext; -import io.undertow.server.HttpServerExchange; -import org.keycloak.adapters.saml.SamlDeployment; -import org.keycloak.adapters.saml.SamlSession; -import org.keycloak.adapters.saml.undertow.ServletSamlSessionStore; -import org.keycloak.adapters.spi.SessionIdMapper; -import org.keycloak.adapters.spi.SessionIdMapperUpdater; -import org.keycloak.adapters.undertow.UndertowUserSessionManagement; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class WildflySamlSessionStore extends ServletSamlSessionStore { - public WildflySamlSessionStore(HttpServerExchange exchange, UndertowUserSessionManagement sessionManagement, - SecurityContext securityContext, - SessionIdMapper idMapper, SessionIdMapperUpdater idMapperUpdater, - SamlDeployment resolvedDeployment) { - super(exchange, sessionManagement, securityContext, idMapper, idMapperUpdater, resolvedDeployment); - } - - @Override - public boolean isLoggedIn() { - if (super.isLoggedIn()) { - SecurityInfoHelper.propagateSessionInfo(getAccount()); - return true; - } - return false; - } - - @Override - public void saveAccount(SamlSession account) { - super.saveAccount(account); - SecurityInfoHelper.propagateSessionInfo(account); - } - - -} diff --git a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/InfinispanSessionCacheIdMapperUpdater.java b/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/InfinispanSessionCacheIdMapperUpdater.java deleted file mode 100644 index c35db63a1fe..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/InfinispanSessionCacheIdMapperUpdater.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright 2017 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.keycloak.adapters.saml.wildfly.infinispan; - -import org.keycloak.adapters.saml.AdapterConstants; -import org.keycloak.adapters.spi.SessionIdMapper; -import org.keycloak.adapters.spi.SessionIdMapperUpdater; - -import io.undertow.servlet.api.DeploymentInfo; -import java.util.*; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.infinispan.Cache; -import org.infinispan.configuration.cache.CacheMode; -import org.infinispan.configuration.cache.Configuration; -import org.infinispan.manager.EmbeddedCacheManager; -import org.infinispan.persistence.manager.PersistenceManager; -import org.infinispan.persistence.remote.RemoteStore; -import org.jboss.logging.Logger; - -/** - * - * @author hmlnarik - */ -public class InfinispanSessionCacheIdMapperUpdater { - - private static final Logger LOG = Logger.getLogger(InfinispanSessionCacheIdMapperUpdater.class); - - public static final String DEFAULT_CACHE_CONTAINER_JNDI_NAME = "java:jboss/infinispan/container"; - - public static SessionIdMapperUpdater addTokenStoreUpdaters(DeploymentInfo deploymentInfo, SessionIdMapper mapper, SessionIdMapperUpdater previousIdMapperUpdater) { - Map initParameters = deploymentInfo.getInitParameters(); - String containerName = initParameters == null ? null : initParameters.get(AdapterConstants.REPLICATION_CONFIG_CONTAINER_PARAM_NAME); - String cacheName = initParameters == null ? null : initParameters.get(AdapterConstants.REPLICATION_CONFIG_SSO_CACHE_PARAM_NAME); - - if (containerName == null || cacheName == null) { - LOG.warnv("Cannot determine parameters of SSO cache for deployment {0}.", deploymentInfo.getDeploymentName()); - - return previousIdMapperUpdater; - } - - String cacheContainerLookup = DEFAULT_CACHE_CONTAINER_JNDI_NAME + "/" + containerName; - String deploymentSessionCacheName = deploymentInfo.getDeploymentName(); - - try { - EmbeddedCacheManager cacheManager = (EmbeddedCacheManager) new InitialContext().lookup(cacheContainerLookup); - - Configuration ssoCacheConfiguration = cacheManager.getCacheConfiguration(cacheName); - if (ssoCacheConfiguration == null) { - Configuration cacheConfiguration = cacheManager.getCacheConfiguration(deploymentSessionCacheName); - if (cacheConfiguration == null) { - LOG.debugv("Using default configuration for SSO cache {0}.{1}.", containerName, cacheName); - ssoCacheConfiguration = cacheManager.getDefaultCacheConfiguration(); - } else { - LOG.debugv("Using distributed HTTP session cache configuration for SSO cache {0}.{1}, configuration taken from cache {2}", - containerName, cacheName, deploymentSessionCacheName); - ssoCacheConfiguration = cacheConfiguration; - cacheManager.defineConfiguration(cacheName, ssoCacheConfiguration); - } - } else { - LOG.debugv("Using custom configuration of SSO cache {0}.{1}.", containerName, cacheName); - } - - CacheMode ssoCacheMode = ssoCacheConfiguration.clustering().cacheMode(); - if (ssoCacheMode != CacheMode.REPL_ASYNC && ssoCacheMode != CacheMode.REPL_SYNC) { - LOG.warnv("SSO cache mode is {0}, it is recommended to use replicated mode instead.", ssoCacheConfiguration.clustering().cacheModeString()); - } - - Cache ssoCache = cacheManager.getCache(cacheName, true); - final SsoSessionCacheListener listener = new SsoSessionCacheListener(ssoCache, mapper); - ssoCache.addListener(listener); - - addSsoCacheCrossDcListener(ssoCache, listener); - - LOG.debugv("Added distributed SSO session cache, lookup={0}, cache name={1}", cacheContainerLookup, cacheName); - - LOG.debugv("Adding session listener for SSO session cache, lookup={0}, cache name={1}", cacheContainerLookup, cacheName); - SsoCacheSessionIdMapperUpdater updater = new SsoCacheSessionIdMapperUpdater(ssoCache, previousIdMapperUpdater); - deploymentInfo.addSessionListener(updater); - - return updater; - } catch (NamingException ex) { - LOG.warnv("Failed to obtain distributed session cache container, lookup={0}", cacheContainerLookup); - return previousIdMapperUpdater; - } - } - - private static void addSsoCacheCrossDcListener(Cache ssoCache, SsoSessionCacheListener listener) { - if (ssoCache.getCacheConfiguration().persistence() == null) { - return; - } - - final Set stores = getRemoteStores(ssoCache); - if (stores == null || stores.isEmpty()) { - return; - } - - LOG.infov("Listening for events on remote stores configured for cache {0}", ssoCache.getName()); - - for (RemoteStore store : stores) { - store.getRemoteCache().addClientListener(listener); - } - } - - public static Set getRemoteStores(Cache ispnCache) { - return ispnCache.getAdvancedCache().getComponentRegistry().getComponent(PersistenceManager.class).getStores(RemoteStore.class); - } -} diff --git a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/SsoCacheSessionIdMapperUpdater.java b/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/SsoCacheSessionIdMapperUpdater.java deleted file mode 100644 index 22a601cf140..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/SsoCacheSessionIdMapperUpdater.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2017 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.keycloak.adapters.saml.wildfly.infinispan; - -import org.keycloak.adapters.saml.SamlSession; -import org.keycloak.adapters.spi.SessionIdMapper; -import org.keycloak.adapters.spi.SessionIdMapperUpdater; - -import io.undertow.server.HttpServerExchange; -import io.undertow.server.session.Session; -import io.undertow.server.session.SessionListener; -import org.infinispan.Cache; -import org.jboss.logging.Logger; - -/** - * - * @author hmlnarik - */ -public class SsoCacheSessionIdMapperUpdater implements SessionIdMapperUpdater, SessionListener { - - private static final Logger LOG = Logger.getLogger(SsoCacheSessionIdMapperUpdater.class.getName()); - - private final SessionIdMapperUpdater delegate; - /** - * Cache where key is a HTTP session ID, and value is a pair (user session ID, principal name) of Strings. - */ - private final Cache httpSessionToSsoCache; - - public SsoCacheSessionIdMapperUpdater(Cache httpSessionToSsoCache, SessionIdMapperUpdater previousIdMapperUpdater) { - this.delegate = previousIdMapperUpdater; - this.httpSessionToSsoCache = httpSessionToSsoCache; - } - - // SessionIdMapperUpdater methods - - @Override - public void clear(SessionIdMapper idMapper) { - httpSessionToSsoCache.clear(); - this.delegate.clear(idMapper); - } - - @Override - public void map(SessionIdMapper idMapper, String sso, String principal, String httpSessionId) { - LOG.debugf("Adding mapping (%s, %s, %s)", sso, principal, httpSessionId); - - httpSessionToSsoCache.put(httpSessionId, new String[] {sso, principal}); - this.delegate.map(idMapper, sso, principal, httpSessionId); - } - - @Override - public boolean refreshMapping(SessionIdMapper idMapper, String httpSessionId) { - LOG.debugf("Refreshing session %s", httpSessionId); - - String[] ssoAndPrincipal = httpSessionToSsoCache.get(httpSessionId); - if (ssoAndPrincipal != null) { - this.delegate.map(idMapper, ssoAndPrincipal[0], ssoAndPrincipal[1], httpSessionId); - return true; - } - return false; - } - - @Override - public void removeSession(SessionIdMapper idMapper, String httpSessionId) { - LOG.debugf("Removing session %s", httpSessionId); - - httpSessionToSsoCache.remove(httpSessionId); - this.delegate.removeSession(idMapper, httpSessionId); - } - - // Undertow HTTP session listener methods - - @Override - public void sessionCreated(Session session, HttpServerExchange exchange) { - } - - @Override - public void sessionDestroyed(Session session, HttpServerExchange exchange, SessionDestroyedReason reason) { - } - - @Override - public void attributeAdded(Session session, String name, Object value) { - } - - @Override - public void attributeUpdated(Session session, String name, Object newValue, Object oldValue) { - } - - @Override - public void attributeRemoved(Session session, String name, Object oldValue) { - } - - @Override - public void sessionIdChanged(Session session, String oldSessionId) { - this.httpSessionToSsoCache.remove(oldSessionId); - Object value = session.getAttribute(SamlSession.class.getName()); - if (value instanceof SamlSession) { - SamlSession sess = (SamlSession) value; - httpSessionToSsoCache.put(session.getId(), new String[] {sess.getSessionIndex(), sess.getPrincipal().getSamlSubject()}); - } - } -} diff --git a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/SsoSessionCacheListener.java b/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/SsoSessionCacheListener.java deleted file mode 100644 index eca62e25912..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/infinispan/SsoSessionCacheListener.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright 2017 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.keycloak.adapters.saml.wildfly.infinispan; - -import org.keycloak.adapters.spi.SessionIdMapper; - -import java.util.*; -import java.util.concurrent.*; -import org.infinispan.Cache; -import org.infinispan.client.hotrod.annotation.ClientCacheEntryCreated; -import org.infinispan.client.hotrod.annotation.ClientCacheEntryRemoved; -import org.infinispan.client.hotrod.annotation.ClientListener; -import org.infinispan.client.hotrod.event.ClientCacheEntryCreatedEvent; -import org.infinispan.client.hotrod.event.ClientCacheEntryRemovedEvent; -import org.infinispan.context.Flag; -import org.infinispan.notifications.Listener; -import org.infinispan.notifications.cachelistener.annotation.*; -import org.infinispan.notifications.cachelistener.event.*; -import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStarted; -import org.infinispan.notifications.cachemanagerlistener.annotation.CacheStopped; -import org.infinispan.notifications.cachemanagerlistener.event.CacheStartedEvent; -import org.infinispan.notifications.cachemanagerlistener.event.CacheStoppedEvent; -import org.jboss.logging.Logger; - -/** - * - * @author hmlnarik - */ -@Listener -@ClientListener -public class SsoSessionCacheListener { - - private static final Logger LOG = Logger.getLogger(SsoSessionCacheListener.class); - - private final ConcurrentMap> map = new ConcurrentHashMap<>(); - - private final SessionIdMapper idMapper; - - private final Cache ssoCache; - - private ExecutorService executor = Executors.newSingleThreadExecutor(); - - public SsoSessionCacheListener(Cache ssoCache, SessionIdMapper idMapper) { - this.ssoCache = ssoCache; - this.idMapper = idMapper; - } - - @TransactionRegistered - public void startTransaction(TransactionRegisteredEvent event) { - if (event.getGlobalTransaction() == null) { - return; - } - - map.put(event.getGlobalTransaction().globalId(), new ConcurrentLinkedQueue()); - } - - @CacheStarted - public void cacheStarted(CacheStartedEvent event) { - this.executor = Executors.newSingleThreadExecutor(); - } - - @CacheStopped - public void cacheStopped(CacheStoppedEvent event) { - this.executor.shutdownNow(); - } - - @CacheEntryCreated - @CacheEntryRemoved - public void addEvent(TransactionalEvent event) { - if (event.isOriginLocal()) { - // Local events are processed by local HTTP session listener - return; - } - - if (event.isPre()) { // only handle post events - return; - } - - if (event.getGlobalTransaction() != null) { - map.get(event.getGlobalTransaction().globalId()).add(event); - } else { - processEvent(event); - } - } - - @TransactionCompleted - public void endTransaction(TransactionCompletedEvent event) { - if (event.getGlobalTransaction() == null) { - return; - } - - Queue events = map.remove(event.getGlobalTransaction().globalId()); - - if (events == null || ! event.isTransactionSuccessful()) { - return; - } - - for (final Event e : events) { - processEvent(e); - } - } - - private void processEvent(final Event e) { - switch (e.getType()) { - case CACHE_ENTRY_CREATED: - this.executor.submit(new Runnable() { - @Override public void run() { - cacheEntryCreated((CacheEntryCreatedEvent) e); - } - }); - break; - - case CACHE_ENTRY_REMOVED: - this.executor.submit(new Runnable() { - @Override public void run() { - cacheEntryRemoved((CacheEntryRemovedEvent) e); - } - }); - break; - } - } - - private void cacheEntryCreated(CacheEntryCreatedEvent event) { - if (! (event.getKey() instanceof String) || ! (event.getValue() instanceof String[])) { - return; - } - String httpSessionId = (String) event.getKey(); - String[] value = (String[]) event.getValue(); - String ssoId = value[0]; - String principal = value[1]; - - LOG.tracev("cacheEntryCreated {0}:{1}", httpSessionId, ssoId); - - this.idMapper.map(ssoId, principal, httpSessionId); - } - - private void cacheEntryRemoved(CacheEntryRemovedEvent event) { - if (! (event.getKey() instanceof String)) { - return; - } - - LOG.tracev("cacheEntryRemoved {0}", event.getKey()); - - this.idMapper.removeSession((String) event.getKey()); - } - - @ClientCacheEntryCreated - public void remoteCacheEntryCreated(ClientCacheEntryCreatedEvent event) { - if (! (event.getKey() instanceof String)) { - return; - } - - String httpSessionId = (String) event.getKey(); - - if (idMapper.hasSession(httpSessionId)) { - // Ignore local events generated by remote store - LOG.tracev("IGNORING remoteCacheEntryCreated {0}", httpSessionId); - return; - } - - this.executor.submit(new Runnable() { - - @Override - public void run() { - String[] value = ssoCache.get((String) httpSessionId); - - if (value != null) { - String ssoId = value[0]; - String principal = value[1]; - - LOG.tracev("remoteCacheEntryCreated {0}:{1}", httpSessionId, ssoId); - - idMapper.map(ssoId, principal, httpSessionId); - } else { - LOG.tracev("remoteCacheEntryCreated {0}", event.getKey()); - - } - } - }); - } - - @ClientCacheEntryRemoved - public void remoteCacheEntryRemoved(ClientCacheEntryRemovedEvent event) { - LOG.tracev("remoteCacheEntryRemoved {0}", event.getKey()); - - this.idMapper.removeSession((String) event.getKey()); - ssoCache.getAdvancedCache().withFlags(Flag.SKIP_CACHE_STORE).remove((String) event.getKey()); - } -} diff --git a/adapters/saml/wildfly/wildfly-adapter/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension b/adapters/saml/wildfly/wildfly-adapter/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension deleted file mode 100755 index 60e3c2f9b71..00000000000 --- a/adapters/saml/wildfly/wildfly-adapter/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright 2016 Red Hat, Inc. and/or its affiliates -# and other contributors as indicated by the @author tags. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -org.keycloak.adapters.saml.wildfly.WildflySamlExtension diff --git a/adapters/saml/wildfly/wildfly-subsystem/pom.xml b/adapters/saml/wildfly/wildfly-subsystem/pom.xml index 075eb58ad63..b8704470e76 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/pom.xml +++ b/adapters/saml/wildfly/wildfly-subsystem/pom.xml @@ -98,7 +98,7 @@ org.keycloak - keycloak-saml-wildfly-adapter + keycloak-saml-adapter-core ${project.version} diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java index 3ffbf95eaad..3c432450d60 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java @@ -33,16 +33,13 @@ import org.jboss.modules.ModuleLoader; public class KeycloakDependencyProcessorWildFly extends KeycloakDependencyProcessor { private static final ModuleIdentifier KEYCLOAK_ELYTRON_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-saml-wildfly-elytron-adapter"); - private static final ModuleIdentifier KEYCLOAK_WILDFLY_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-saml-wildfly-adapter"); - private static final ModuleIdentifier KEYCLOAK_UNDERTOW_ADAPTER = ModuleIdentifier.create("org.keycloak.keycloak-saml-undertow-adapter"); @Override protected void addPlatformSpecificModules(DeploymentPhaseContext phaseContext, ModuleSpecification moduleSpecification, ModuleLoader moduleLoader) { if (isElytronEnabled(phaseContext)) { moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_ELYTRON_ADAPTER, true, false, false, false)); } else { - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_WILDFLY_ADAPTER, false, false, true, false)); - moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, KEYCLOAK_UNDERTOW_ADAPTER, false, false, false, false)); + throw new RuntimeException("Legacy WildFly security layer is no longer supported by the Keycloak WildFly adapter"); } } } diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml index 7d0f9c9d8dc..bcaa41d59cc 100755 --- a/distribution/feature-packs/adapter-feature-pack/pom.xml +++ b/distribution/feature-packs/adapter-feature-pack/pom.xml @@ -88,16 +88,6 @@ - - org.keycloak - keycloak-wildfly-adapter - - - * - * - - - org.keycloak keycloak-wildfly-elytron-oidc-adapter diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-adapter/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-adapter/main/module.xml deleted file mode 100755 index 048b77ba6b1..00000000000 --- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-adapter/main/module.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml index f0c4947dc14..8160c417138 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml @@ -44,7 +44,6 @@ - diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml deleted file mode 100644 index 90eb74a6749..00000000000 --- a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - - org.keycloak - galleon-feature-packs-parent - 999-SNAPSHOT - - - 4.0.0 - - org.keycloak - keycloak-adapter-galleon-pack - - Keycloak Galleon Feature Pack: Adapter - pom - - - 23.0.2.Final - 1.2.13.Final - 15.0.1.Final - 5.1.3.Final - - ${basedir}/../../feature-packs/adapter-feature-pack/src/main/resources - 5.1.3.Final - ${feature-pack.resources.directory}/licenses/${product.slot}/licenses.xml - ${basedir}/target/resources/packages/licenses/content/docs/licenses-${product.slot} - - - - org.keycloak - keycloak-core - - - * - * - - - provided - - - org.keycloak - keycloak-common - - - * - * - - - provided - - - org.keycloak - keycloak-adapter-core - - - * - * - - - provided - - - org.keycloak - keycloak-jboss-adapter-core - - - * - * - - - provided - - - org.keycloak - keycloak-wildfly-subsystem - - - * - * - - - provided - - - org.keycloak - keycloak-wildfly-adapter - - - * - * - - - provided - - - org.keycloak - keycloak-wildfly-elytron-oidc-adapter - - - * - * - - - provided - - - org.keycloak - keycloak-adapter-spi - - - * - * - - - provided - - - org.keycloak - keycloak-undertow-adapter-spi - - - * - * - - - provided - - - org.keycloak - keycloak-undertow-adapter - - - * - * - - - provided - - - - - org.keycloak - keycloak-authz-client - - - * - * - - - provided - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - process-resources - - copy-resources - - - ${basedir}/target/resources - - - ${basedir}/src/main/resources - - - - - - copy-feature-pack-resources - process-resources - - copy-resources - - - ${basedir}/target/resources - - - ${feature-pack.resources.directory} - - content/** - modules/** - - - - - - - - - org.wildfly.galleon-plugins - wildfly-galleon-maven-plugin - ${version.org.wildfly.galleon-plugins} - - - - org.wildfly.core - wildfly-embedded - ${wildfly.core.version} - - - - org.wildfly.common - wildfly-common - ${wildfly.common.version} - - - - - keycloak-adapter-galleon-pack-build - - build-feature-pack - - compile - - false - - - - - - org.keycloak - keycloak-distribution-licenses-maven-plugin - - - - - - - community - - - !product - - - - org.keycloak - - - - org.wildfly - wildfly-galleon-pack - ${wildfly.version} - zip - provided - - - - - product - - - product - - - - org.jboss.sso - - - - org.jboss.eap - wildfly-ee-galleon-pack - ${eap.version} - zip - provided - - - - - - org.wildfly.galleon-plugins - wildfly-galleon-maven-plugin - - wildfly-feature-pack-build-eap.xml - - - - - - - diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml deleted file mode 100644 index 3dc31809581..00000000000 --- a/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/packages/licenses/package.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/packages/licenses/package.xml deleted file mode 100644 index aa74168dfe6..00000000000 --- a/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/packages/licenses/package.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml deleted file mode 100644 index dbe46741867..00000000000 --- a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - org.jboss.eap:wildfly-ee-galleon-pack - - - - - - - - - org.jboss.eap:wildfly-ee-galleon-pack - - - - - - - - - - - - - - org.keycloak.keycloak-adapter-subsystem - - - - diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml deleted file mode 100644 index 21696f1403b..00000000000 --- a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - org.wildfly:wildfly-ee-galleon-pack - - - - - - - - - org.wildfly:wildfly-galleon-pack - - - - - - - - - - - - - - org.keycloak.keycloak-adapter-subsystem - - - - diff --git a/distribution/galleon-feature-packs/pom.xml b/distribution/galleon-feature-packs/pom.xml index 5a249740adc..84749dcd0c9 100644 --- a/distribution/galleon-feature-packs/pom.xml +++ b/distribution/galleon-feature-packs/pom.xml @@ -31,7 +31,6 @@ pom - adapter-galleon-pack server-galleon-pack diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml index f0c4947dc14..8160c417138 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml @@ -44,7 +44,6 @@ - diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/build.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/build.xml index 885ed811a4c..5df9825bfa6 100755 --- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/build.xml +++ b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/build.xml @@ -68,10 +68,6 @@ - - - - diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml index b54133afc92..8621d391731 100755 --- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml +++ b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/pom.xml @@ -124,16 +124,6 @@ - - org.keycloak - keycloak-saml-wildfly-adapter - - - * - * - - - org.keycloak keycloak-saml-wildfly-elytron-adapter diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-saml-wildfly-adapter/main/module.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-saml-wildfly-adapter/main/module.xml deleted file mode 100755 index 6cb3c73e768..00000000000 --- a/distribution/saml-adapters/wildfly-adapter/wildfly-modules/src/main/resources/modules/org/keycloak/keycloak-saml-wildfly-adapter/main/module.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 177bf6bd2c1..734b6679dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -1216,11 +1216,6 @@ keycloak-undertow-adapter ${project.version} - - org.keycloak - keycloak-wildfly-adapter - ${project.version} - org.keycloak keycloak-wildfly-elytron-oidc-adapter @@ -1316,11 +1311,6 @@ keycloak-saml-jetty-adapter-core ${project.version} - - org.keycloak - keycloak-saml-wildfly-adapter - ${project.version} - org.keycloak keycloak-saml-wildfly-subsystem diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md index e421474f8c0..fa0e432cfe5 100644 --- a/testsuite/integration-arquillian/HOW-TO-RUN.md +++ b/testsuite/integration-arquillian/HOW-TO-RUN.md @@ -257,27 +257,6 @@ mvn -f testsuite/integration-arquillian/pom.xml \ -Dtest=org.keycloak.testsuite.adapter.** ```` -### Wildfly with legacy non-elytron adapter - - mvn -f testsuite/integration-arquillian/pom.xml \ - clean install \ - -Dskip.elytron.adapter.installation=true \ - -Dskip.adapter.offline.installation=false \ - -Papp-server-wildfly \ - -Dtest=org.keycloak.testsuite.adapter.** - - -### Wildfly deprecated - -This is usually previous version of WildFly application server right before current version. -See the property `wildfly.deprecated.version` in the file [pom.xml](pom.xml) ) . - - mvn -f testsuite/integration-arquillian/pom.xml \ - clean install \ - -Pauth-server-wildfly \ - -Papp-server-wildfly-deprecated \ - -Dtest=org.keycloak.testsuite.adapter.** - ## Migration test ### DB migration test diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index b17ea25828d..357b8202bc1 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -40,11 +40,6 @@ undertow ${java.home} - - 21.0.2.Final - 13.0.3.Final - 2.2.0.Final - 1.6.0.Final diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml index b97ba4f8545..35a7cf81445 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/pom.xml @@ -759,18 +759,6 @@ wildfly - - app-server-wildfly-deprecated - - - app.server - wildfly-deprecated - - - - wildfly-deprecated - - app-server-relative diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/pom.xml deleted file mode 100644 index b2eeee4e60b..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-jboss - 999-SNAPSHOT - - 4.0.0 - - integration-arquillian-servers-app-server-wildfly-deprecated - jar - App Server - Wildfly Deprecated - - - wildfly-deprecated - - org.wildfly - wildfly-dist - ${wildfly.deprecated.version} - wildfly-${wildfly.deprecated.version} - - keycloak-wildfly-adapter-dist - keycloak-saml-wildfly-adapter-dist - - false - - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-spi - ${project.version} - - - org.wildfly.arquillian - wildfly-arquillian-container-managed - - - org.keycloak.testsuite - integration-arquillian-util - ${project.version} - - - diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/WildflyDeprecatedAppServerArquillianExtension.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/WildflyDeprecatedAppServerArquillianExtension.java deleted file mode 100644 index 6ffe0db2129..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/WildflyDeprecatedAppServerArquillianExtension.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2018 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.keycloak.testsuite.arquillian.wildfly; - -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.core.spi.LoadableExtension; -import org.keycloak.testsuite.arquillian.wildfly.container.WildflyDeprecatedDeploymentArchiveProcessor; - -/** - * - * @author Vlasta Ramik - */ -public class WildflyDeprecatedAppServerArquillianExtension implements LoadableExtension { - - @Override - public void register(ExtensionBuilder builder) { - builder.service(ApplicationArchiveProcessor.class, WildflyDeprecatedDeploymentArchiveProcessor.class); - } - -} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java deleted file mode 100644 index afaed39568e..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedAppServerProvider.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright 2018 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.keycloak.testsuite.arquillian.wildfly.container; - -import java.util.ArrayList; -import java.util.List; -import org.jboss.arquillian.core.spi.Validate; -import org.jboss.as.arquillian.container.managed.ManagedDeployableContainer; -import org.jboss.shrinkwrap.descriptor.spi.node.Node; -import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider; - -/** - * @author Vlasta Ramik - */ -public class WildflyDeprecatedAppServerProvider implements AppServerContainerProvider { - - private Node configuration; - private static final String containerName = "wildfly-deprecated"; - - private final String appServerHome; - private final String appServerJavaHome; - private final String appServerPortOffset; - private final String managementProtocol; - private final String managementPort; - private final String startupTimeoutInSeconds; - - public WildflyDeprecatedAppServerProvider() { - appServerHome = System.getProperty("app.server.home"); - appServerJavaHome = System.getProperty("app.server.java.home"); - appServerPortOffset = System.getProperty("app.server.port.offset"); - managementProtocol = System.getProperty("app.server.management.protocol"); - managementPort = System.getProperty("app.server.management.port"); - startupTimeoutInSeconds = System.getProperty("app.server.startup.timeout"); - - Validate.notNullOrEmpty(appServerHome, "app.server.home is not set."); - Validate.notNullOrEmpty(appServerJavaHome, "app.server.java.home is not set."); - Validate.notNullOrEmpty(appServerPortOffset, "app.server.port.offset is not set."); - Validate.notNullOrEmpty(managementProtocol, "app.server.management.protocol is not set."); - Validate.notNullOrEmpty(managementPort, "app.server.management.port is not set."); - Validate.notNullOrEmpty(startupTimeoutInSeconds, "app.server.startup.timeout is not set."); - } - - @Override - public String getName() { - return containerName; - } - - @Override - public List getContainers() { - List containers = new ArrayList<>(); - - containers.add(standaloneContainer()); - containers.add(clusterGroup()); - - return containers; - } - - private void createChild(String name, String text) { - configuration.createChild("property").attribute("name", name).text(text); - } - - private Node standaloneContainer() { - Node container = new Node("container"); - container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName); - - configuration = container.createChild("configuration"); - createChild("enabled", "true"); - createChild("adapterImplClass", ManagedDeployableContainer.class.getName()); - createChild("jbossHome", appServerHome); - createChild("javaHome", appServerJavaHome); - createChild("jbossArguments", - "-Djboss.server.base.dir=" + appServerHome + "/standalone-test " + - "-Djboss.server.config.dir=" + appServerHome + "/standalone-test/configuration " + - "-Djboss.server.log.dir=" + appServerHome + "/standalone-test/log " + - "-Djboss.socket.binding.port-offset=" + appServerPortOffset + " " + - System.getProperty("adapter.test.props", " ") + - System.getProperty("kie.maven.settings", " ") - ); - createChild("javaVmArguments", - System.getProperty("app.server.jboss.jvm.debug.args", "") + " " + - System.getProperty("app.server.memory.settings", "") + " " + - "-Djava.net.preferIPv4Stack=true" - ); - createChild("managementProtocol", managementProtocol); - createChild("managementPort", managementPort); - createChild("startupTimeoutInSeconds", startupTimeoutInSeconds); - - return container; - } - - private Node clusterGroup() { - Node group = new Node("group"); - group.attribute("qualifier", "app-server-wildfly-deprecated-clustered"); - addHaNodeContainer(group, 1); - addHaNodeContainer(group, 2); - return group; - } - - private void addHaNodeContainer(Node group, int number) { - String portOffset = System.getProperty("app.server." + number + ".port.offset"); - String managementPort = System.getProperty("app.server." + number + ".management.port"); - - Validate.notNullOrEmpty(portOffset, "app.server." + number + ".port.offset is not set."); - Validate.notNullOrEmpty(managementPort, "app.server." + number + ".management.port is not set."); - - Node container = group.createChild("container"); - container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number); - - configuration = container.createChild("configuration"); - createChild("enabled", "true"); - createChild("adapterImplClass", ManagedDeployableContainer.class.getName()); - createChild("jbossHome", appServerHome); - createChild("javaHome", appServerJavaHome); - //cleanServerBaseDir cannot be used until WFARQ-44 is fixed -// createChild("cleanServerBaseDir", appServerHome + "/standalone-ha-node-" + number); - createChild("serverConfig", "standalone-ha.xml"); - createChild("jbossArguments", - "-Djboss.server.base.dir=" + appServerHome + "/standalone-ha-node-" + number + " " + - "-Djboss.socket.binding.port-offset=" + portOffset + " " + - "-Djboss.node.name=ha-node-" + number + " " + - getCrossDCProperties(number, portOffset) + - System.getProperty("adapter.test.props", " ") + - System.getProperty("kie.maven.settings", " ") - ); - createChild("javaVmArguments", - System.getProperty("app.server." + number + ".jboss.jvm.debug.args") + " " + - System.getProperty("app.server.memory.settings", "") + " " + - "-Djava.net.preferIPv4Stack=true" - ); - createChild("managementProtocol", managementProtocol); - createChild("managementPort", managementPort); - createChild("startupTimeoutInSeconds", startupTimeoutInSeconds); - } - - private String getCrossDCProperties(int number, String portOffset) { - if (System.getProperty("cache.server") == null || System.getProperty("cache.server").equals("undefined")) { - return ""; - } - String cacheHotrodPortString = System.getProperty("cache.server." + number + ".port.offset"); - Validate.notNullOrEmpty(cacheHotrodPortString, "cache.server." + number + ".port.offset is not set."); - - int tcppingPort = 7600 + Integer.parseInt(portOffset); - int cacheHotrodPort = 11222 + Integer.parseInt(cacheHotrodPortString); - - //properties used in servers/app-server/jboss/common/cli/configure-crossdc-config.cli - return "-Dtcpping.port=" + tcppingPort + " -Dcache.hotrod.port=" + cacheHotrodPort + " "; - } -} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedDeploymentArchiveProcessor.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedDeploymentArchiveProcessor.java deleted file mode 100644 index 1f2497b0d52..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyDeprecatedDeploymentArchiveProcessor.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2018 Red Hat, Inc. and/or its affiliates - * and other contributors as indicated by the @author tags. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.keycloak.testsuite.arquillian.wildfly.container; - -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.test.spi.TestClass; -import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.Archive; -import org.keycloak.testsuite.utils.annotation.UseServletFilter; -import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils; - -/** - * - * @author Vlasta Ramik - */ -public class WildflyDeprecatedDeploymentArchiveProcessor implements ApplicationArchiveProcessor { - - private final Logger log = Logger.getLogger(WildflyDeprecatedDeploymentArchiveProcessor.class); - - @Override - public void process(Archive archive, TestClass testClass) { - if (DeploymentArchiveProcessorUtils.checkRunOnServerDeployment(archive)) { - return; - } - modifyWebXML(archive, testClass); - - modifyOIDCAdapterConfig(archive, DeploymentArchiveProcessorUtils.ADAPTER_CONFIG_PATH); - modifyOIDCAdapterConfig(archive, DeploymentArchiveProcessorUtils.ADAPTER_CONFIG_PATH_JS); - - modifySAMLAdapterConfig(archive, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH); - modifySAMLAdapterConfig(archive, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH_TENANT1); - modifySAMLAdapterConfig(archive, DeploymentArchiveProcessorUtils.SAML_ADAPTER_CONFIG_PATH_TENANT2); - } - - private void modifyWebXML(Archive archive, TestClass testClass) { - if (!archive.contains(DeploymentArchiveProcessorUtils.WEBXML_PATH)) return; - if (!testClass.getJavaClass().isAnnotationPresent(UseServletFilter.class)) return; - if (!archive.contains(DeploymentArchiveProcessorUtils.JBOSS_DEPLOYMENT_XML_PATH)) return; - - log.debug("Modifying WEB.XML in " + archive.getName() + " for Servlet Filter."); - DeploymentArchiveProcessorUtils.modifyWebXMLForServletFilter(archive, testClass); - DeploymentArchiveProcessorUtils.addFilterDependencies(archive, testClass); - } - - private void modifyOIDCAdapterConfig(Archive archive, String adapterConfigPath) { - if (!archive.contains(adapterConfigPath)) return; - - log.debug("Modifying adapter config " + adapterConfigPath + " in " + archive.getName()); - - DeploymentArchiveProcessorUtils.modifyOIDCAdapterConfig(archive, adapterConfigPath); - } - - private void modifySAMLAdapterConfig(Archive archive, String adapterConfigPath) { - if (!archive.contains(adapterConfigPath)) return; - - log.debug("Modifying adapter config " + adapterConfigPath + " in " + archive.getName()); - DeploymentArchiveProcessorUtils.modifySAMLAdapterConfig(archive, adapterConfigPath); - } -} diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index 9ce8da49d0f..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.wildfly.WildflyDeprecatedAppServerArquillianExtension diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider deleted file mode 100644 index c9ff5c7d65c..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.testsuite.arquillian.wildfly.container.WildflyDeprecatedAppServerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/saml-adapter-supported b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/saml-adapter-supported deleted file mode 100644 index 8b137891791..00000000000 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly-deprecated/src/saml-adapter-supported +++ /dev/null @@ -1 +0,0 @@ - diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index c8d58bce466..a2d25e7f4ed 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -522,44 +522,6 @@ - - app-server-wildfly-deprecated - - - app.server - wildfly-deprecated - - - - wildfly-deprecated - false - - ${wildfly.deprecated.arquillian.wildfly.container} - - - - org.keycloak.testsuite - integration-arquillian-servers-app-server-wildfly-deprecated - ${project.version} - runtime - - - - org.wildfly.core - wildfly-cli - test - ${wildfly.deprecated.wildfly.core.version} - - - - - - org.commonjava.maven.plugins - directory-maven-plugin - - - - app-server-eap diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java index 60a91e2be68..62e68fe81d4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/DefaultAuthzConfigAdapterTest.java @@ -49,7 +49,6 @@ import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/LifespanAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/LifespanAdapterTest.java index f812da3f6dc..0509148f78c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/LifespanAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/LifespanAdapterTest.java @@ -50,7 +50,6 @@ import org.keycloak.util.JsonSerialization; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java index a50b80d3fd5..3c20c0b9e2b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PermissiveModeAdapterTest.java @@ -37,7 +37,6 @@ import static org.hamcrest.Matchers.is; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozAccountResourcesAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozAccountResourcesAdapterTest.java index d2336ab0b52..2948ad7f825 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozAccountResourcesAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozAccountResourcesAdapterTest.java @@ -29,7 +29,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java index ee2b5e45ce4..99c0e74f24e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleLazyLoadPathsAdapterTest.java @@ -29,7 +29,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java index 32d4b2552fd..bc81804b885 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/PhotozExampleNoLazyLoadPathsAdapterTest.java @@ -28,7 +28,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java index d738ada5136..54e996e10f4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCIPAdapterTest.java @@ -39,7 +39,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java index fa6c715d6f2..f96d9d66a3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheDisabledAdapterTest.java @@ -31,7 +31,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java index 78cf1e2be25..abcf06e8871 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzCacheLifespanAdapterTest.java @@ -30,7 +30,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java index eadcb59e1b4..978d595f36b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzLazyLoadPathsAdapterTest.java @@ -29,7 +29,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java index 52fe32aaaa9..adfb5fd2108 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletAuthzNoLazyLoadPathsAdapterTest.java @@ -27,7 +27,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerLifespanTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerLifespanTest.java index 6fa2e6e69f4..16f7e4f9227 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerLifespanTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerLifespanTest.java @@ -28,7 +28,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java index fae30708e2d..9e4a126bb21 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/authorization/ServletPolicyEnforcerTest.java @@ -25,7 +25,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java index 8c8ff43a15f..e3114f4dbbc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java @@ -70,7 +70,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; * @author fkiss */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java index 3f6c84845d4..0582cd1a707 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java @@ -93,7 +93,6 @@ import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWit */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java index 02eb9c67a9e..a6118a75f7e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java @@ -76,7 +76,6 @@ import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java index 30ea5fecb4f..9afc62ca075 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTest.java @@ -24,7 +24,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTestForCustomizedIdMapper.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTestForCustomizedIdMapper.java index 843c6c3c940..e090e28f60f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTestForCustomizedIdMapper.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoFilterServletAdapterTestForCustomizedIdMapper.java @@ -35,7 +35,6 @@ import static org.junit.Assert.assertTrue; @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java index 9a3d94ced75..fd41baa9cd4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java @@ -146,7 +146,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/MultiTenancyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/MultiTenancyTest.java index 8cbe8980d71..b8bd952dc2f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/MultiTenancyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/MultiTenancyTest.java @@ -43,7 +43,6 @@ import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java index cd4f0458eb7..c33720dac7c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java @@ -80,7 +80,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java index 0051d5171fa..58fb3d871b3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java @@ -51,7 +51,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java index 613a9715d56..e982795892f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java @@ -46,7 +46,6 @@ import static org.keycloak.testsuite.util.SamlClient.Binding.POST; @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) @@ -137,7 +136,6 @@ public class SAMLClockSkewAdapterTest extends AbstractSAMLServletAdapterTest { @AppServerContainer(ContainerConstants.APP_SERVER_TOMCAT9) @AppServerContainer(value = ContainerConstants.APP_SERVER_UNDERTOW, skip = true) @AppServerContainer(value = ContainerConstants.APP_SERVER_WILDFLY, skip = true) - @AppServerContainer(value = ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED, skip = true) @AppServerContainer(value = ContainerConstants.APP_SERVER_EAP, skip = true) @AppServerContainer(value = ContainerConstants.APP_SERVER_EAP6, skip = true) @AppServerContainer(value = ContainerConstants.APP_SERVER_EAP71, skip = true) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterLoginResponseHandlingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterLoginResponseHandlingTest.java index 326fc25c1fb..f3450f5ddb2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterLoginResponseHandlingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterLoginResponseHandlingTest.java @@ -11,7 +11,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java index e2e2864c240..a107bdb3045 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletAdapterTest.java @@ -18,7 +18,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletSessionTimeoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletSessionTimeoutTest.java index 83d83c6c991..c833003cc5d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletSessionTimeoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLFilterServletSessionTimeoutTest.java @@ -11,7 +11,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java index 1e089ceacbb..784ab8709e8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java @@ -56,7 +56,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java index 3b76722a5a7..b4fd833ca72 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java @@ -51,7 +51,6 @@ import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java index a719fded028..7d6781f32ef 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java @@ -173,7 +173,6 @@ import org.xml.sax.SAXException; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java index 33939480bf2..37ac4b2a484 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java @@ -37,7 +37,6 @@ import static org.keycloak.testsuite.util.Matchers.bodyHC; @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java index a62b7eb4b27..c54a779cd46 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java @@ -78,7 +78,6 @@ import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_SIGNING_CERTIFI */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java index a642dee9b03..641af33f69a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SecuredDeploymentsAdapterTest.java @@ -55,7 +55,6 @@ import org.wildfly.extras.creaper.core.online.CliException; import org.wildfly.extras.creaper.core.online.operations.OperationException; @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java index bb3350632e1..6e886a8ff3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SessionServletAdapterTest.java @@ -57,7 +57,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java index 66f36443a49..4f4a8e3be62 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java @@ -66,7 +66,6 @@ import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; */ @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/OIDCAdapterClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/OIDCAdapterClusterTest.java index 44a82b9af9b..e1b4cce07a2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/OIDCAdapterClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/OIDCAdapterClusterTest.java @@ -62,7 +62,6 @@ import org.openqa.selenium.support.ui.WebDriverWait; * @author Pedro Igor */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_CLUSTER) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6_CLUSTER) public class OIDCAdapterClusterTest extends AbstractAdapterClusteredTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/OIDCFilterAdapterClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/OIDCFilterAdapterClusterTest.java index 454e6cf3766..3f6722c862e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/OIDCFilterAdapterClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/OIDCFilterAdapterClusterTest.java @@ -26,7 +26,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author Marek Posolda */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_CLUSTER) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6_CLUSTER) @UseServletFilter(filterName = "oidc-filter", filterClass = "org.keycloak.adapters.servlet.KeycloakOIDCFilter", diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java index 720999b7a8e..195ef8de5e6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java @@ -31,7 +31,6 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; * @author hmlnarik */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_CLUSTER) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6_CLUSTER) public class SAMLAdapterClusterTest extends AbstractSAMLAdapterClusteredTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java index c5feac44d22..6630251d79f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/crossdc/SAMLAdapterCrossDCTest.java @@ -40,7 +40,6 @@ import org.keycloak.testsuite.arquillian.containers.InfinispanServerDeployableCo * @author hmlnarik */ @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_CLUSTER) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED_CLUSTER) @AppServerContainer(ContainerConstants.APP_SERVER_EAP_CLUSTER) @InitialDcState(authServers = ServerSetup.FIRST_NODE_IN_EVERY_DC, cacheServers = ServerSetup.FIRST_NODE_IN_EVERY_DC) public class SAMLAdapterCrossDCTest extends AbstractSAMLAdapterClusteredTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java index c0d07a5872b..aaf4e6fb84e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java @@ -34,7 +34,6 @@ import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; @AppServerContainer(ContainerConstants.APP_SERVER_UNDERTOW) @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) -@AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY_DEPRECATED) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP6) @AppServerContainer(ContainerConstants.APP_SERVER_EAP71) diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/ContainerConstants.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/ContainerConstants.java index fb1cd6e1b8a..7bdd037fa24 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/ContainerConstants.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/ContainerConstants.java @@ -24,9 +24,6 @@ public interface ContainerConstants { public static final String APP_SERVER_WILDFLY = APP_SERVER_PREFIX + "wildfly"; public static final String APP_SERVER_WILDFLY_CLUSTER = APP_SERVER_WILDFLY + "-ha-node-1;" + APP_SERVER_WILDFLY + "-ha-node-2"; - public static final String APP_SERVER_WILDFLY_DEPRECATED = APP_SERVER_PREFIX + "wildfly-deprecated"; - public static final String APP_SERVER_WILDFLY_DEPRECATED_CLUSTER = APP_SERVER_WILDFLY_DEPRECATED + "-ha-node-1;" + APP_SERVER_WILDFLY_DEPRECATED + "-ha-node-2"; - public static final String APP_SERVER_EAP = APP_SERVER_PREFIX + "eap"; public static final String APP_SERVER_EAP_CLUSTER = APP_SERVER_EAP + "-ha-node-1;" + APP_SERVER_EAP + "-ha-node-2";