From 124591ce1a75dda0019db42f1327ad09d8062bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Mon, 9 Jan 2023 10:57:57 +0100 Subject: [PATCH] Adapters can still use Java EE - Provided all JavaEE dependencies for adapters - Automatically build Undertow Jakarta EE for testsuite (missing SAML) --- Quarkus3 branch sync no. 11 (24.3.2023) Resolved conflicts: keycloak/adapters/oidc/spring-security/pom.xml - Modified --- Quarkus3 branch sync no. 7 (27.2.2023) Resolved conflicts: keycloak/pom.xml - Modified --- Quarkus3 branch sync no. 5 (10.2.2023) Resolved conflicts: keycloak/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml - Modified --- Quarkus3 branch sync no. 1 (18.1.2023) Resolved conflicts: keycloak/testsuite/integration-arquillian/tests/base/pom.xml - Modified --- adapters/oidc/installed/pom.xml | 4 +- .../adapters/installed/KeycloakInstalled.java | 8 +- adapters/oidc/jaxrs-oauth-client/pom.xml | 13 +- .../jaxrs/JaxrsBearerTokenFilter.java | 9 +- .../jaxrs/JaxrsBearerTokenFilterImpl.java | 12 +- .../org/keycloak/jaxrs/JaxrsHttpFacade.java | 18 +- .../org/keycloak/jaxrs/JaxrsOAuthClient.java | 22 +-- .../jaxrs/OsgiJaxrsBearerTokenFilterImpl.java | 6 +- .../AbstractKeycloakJettyAuthenticator.java | 8 +- .../jetty/core/JettyRequestAuthenticator.java | 2 +- .../jetty/core/JettySessionTokenStore.java | 2 +- .../jetty/core/OIDCJettyHttpFacade.java | 2 +- .../jetty/Jetty94RequestAuthenticator.java | 2 +- .../adapters/jetty/Jetty94SessionManager.java | 2 +- .../jetty/JettyAdapterSessionStore.java | 2 +- .../jetty/KeycloakJettyAuthenticator.java | 2 +- adapters/oidc/pom.xml | 9 +- adapters/oidc/servlet-filter/pom.xml | 4 +- .../servlet/FilterRequestAuthenticator.java | 4 +- .../adapters/servlet/KeycloakOIDCFilter.java | 18 +- .../servlet/OIDCFilterSessionStore.java | 6 +- .../servlet/OIDCServletHttpFacade.java | 4 +- adapters/oidc/spring-security/pom.xml | 4 +- ...HttpHeaderInspectingApiRequestMatcher.java | 2 +- .../KeycloakAuthenticationEntryPoint.java | 6 +- .../KeycloakAuthenticationFailureHandler.java | 6 +- .../KeycloakAuthenticationSuccessHandler.java | 6 +- .../KeycloakCookieBasedRedirect.java | 4 +- .../authentication/KeycloakLogoutHandler.java | 4 +- .../RequestAuthenticatorFactory.java | 2 +- .../SpringSecurityRequestAuthenticator.java | 4 +- ...ngSecurityRequestAuthenticatorFactory.java | 2 +- .../facade/SimpleHttpFacade.java | 4 +- .../facade/WrappedHttpServletRequest.java | 6 +- .../facade/WrappedHttpServletResponse.java | 4 +- .../AdapterStateCookieRequestMatcher.java | 4 +- .../KeycloakAuthenticatedActionsFilter.java | 12 +- ...eycloakAuthenticationProcessingFilter.java | 8 +- .../filter/KeycloakCsrfRequestMatcher.java | 2 +- .../filter/KeycloakPreAuthActionsFilter.java | 12 +- .../KeycloakSecurityContextRequestFilter.java | 12 +- .../QueryParamPresenceRequestMatcher.java | 2 +- .../management/HttpSessionManager.java | 2 +- .../LocalSessionManagementStrategy.java | 2 +- .../management/SessionManagementStrategy.java | 2 +- .../token/AdapterTokenStoreFactory.java | 4 +- ...pringSecurityAdapterTokenStoreFactory.java | 4 +- .../token/SpringSecurityCookieTokenStore.java | 4 +- .../token/SpringSecurityTokenStore.java | 4 +- .../facade/WrappedHttpServletRequestTest.java | 2 +- .../WrappedHttpServletResponseTest.java | 2 +- ...oakAuthenticationProcessingFilterTest.java | 6 +- .../KeycloakPreAuthActionsFilterTest.java | 6 +- ...gSecurityAdapterTokenStoreFactoryTest.java | 4 +- .../AbstractAuthenticatedActionsValve.java | 2 +- .../AbstractKeycloakAuthenticatorValve.java | 6 +- .../tomcat/CatalinaRequestAuthenticator.java | 2 +- .../tomcat/OIDCCatalinaHttpFacade.java | 2 +- .../tomcat/KeycloakAuthenticatorValve.java | 2 +- .../tomcat/TomcatRequestAuthenticator.java | 2 +- adapters/oidc/undertow/pom.xml | 4 +- .../undertow/KeycloakServletExtension.java | 2 +- .../undertow/ServletKeycloakAuthMech.java | 8 +- .../undertow/ServletRequestAuthenticator.java | 4 +- .../undertow/ServletSessionTokenStore.java | 4 +- ...towNodesRegistrationManagementWrapper.java | 4 +- adapters/oidc/wildfly-elytron/pom.xml | 4 +- .../adapters/elytron/ElytronHttpFacade.java | 8 +- .../KeycloakConfigurationServletListener.java | 6 +- .../elytron/KeycloakServletExtension.java | 4 +- .../profile/ecp/EcpAuthenticationHandler.java | 14 +- .../saml/jetty/AbstractSamlAuthenticator.java | 12 +- .../saml/jetty/JettySamlSessionStore.java | 2 +- .../saml/jetty/Jetty9SamlSessionStore.java | 2 +- .../saml/jetty/Jetty9SessionManager.java | 2 +- .../saml/jetty/JettyAdapterSessionStore.java | 2 +- .../saml/jetty/KeycloakSamlAuthenticator.java | 2 +- adapters/saml/pom.xml | 4 +- adapters/saml/servlet-filter/pom.xml | 5 +- .../saml/servlet/FilterSamlSessionStore.java | 6 +- .../adapters/saml/servlet/SamlFilter.java | 20 +-- .../saml/AbstractSamlAuthenticatorValve.java | 8 +- .../saml/CatalinaSamlSessionStore.java | 2 +- .../saml/IdMapperUpdaterSessionListener.java | 2 +- .../saml/tomcat/SamlAuthenticatorValve.java | 2 +- adapters/saml/undertow/pom.xml | 4 +- .../saml/undertow/SamlServletExtension.java | 2 +- .../saml/undertow/ServletSamlAuthMech.java | 8 +- .../undertow/ServletSamlSessionStore.java | 6 +- adapters/saml/wildfly-elytron/pom.xml | 5 +- .../IdMapperUpdaterSessionListener.java | 10 +- .../KeycloakConfigurationServletListener.java | 6 +- ...loakHttpServerAuthenticationMechanism.java | 2 +- ...InfinispanSessionCacheIdMapperUpdater.java | 2 +- adapters/spi/jboss-adapter-core/pom.xml | 4 +- .../adapters/jetty/spi/JettyHttpFacade.java | 8 +- .../jetty/spi/JettySessionManager.java | 2 +- .../jetty/spi/JettyUserSessionManagement.java | 2 +- adapters/spi/pom.xml | 4 +- adapters/spi/servlet-adapter-spi/pom.xml | 4 +- .../adapters/servlet/FilterSessionStore.java | 26 +-- .../adapters/servlet/ServletHttpFacade.java | 8 +- .../adapters/tomcat/CatalinaHttpFacade.java | 6 +- adapters/spi/undertow-adapter-spi/pom.xml | 4 +- .../adapters/undertow/SavedRequest.java | 2 +- .../adapters/undertow/ServletHttpFacade.java | 4 +- .../adapters/undertow/UndertowHttpFacade.java | 25 +-- .../undertow/UndertowHttpServletRequest.java | 43 +++++ model/legacy-services/pom.xml | 4 + pom.xml | 34 +++- services/pom.xml | 4 + testsuite/integration-arquillian/pom.xml | 1 + .../servers/adapter-spi/pom.xml | 25 +++ .../undertow-adapter-jakarta-spi/.gitignore | 2 + .../undertow-adapter-jakarta-spi/pom.xml | 101 ++++++++++++ .../undertow/UndertowHttpServletRequest.java | 42 +++++ .../undertow-adapter-jakarta/.gitignore | 1 + .../undertow-adapter-jakarta/pom.xml | 156 ++++++++++++++++++ .../servers/app-server/undertow/pom.xml | 9 +- .../services/testsuite-providers/pom.xml | 16 ++ .../servers/auth-server/undertow/pom.xml | 5 +- .../integration-arquillian/servers/pom.xml | 1 + .../integration-arquillian/tests/base/pom.xml | 24 +++ .../integration-arquillian/tests/pom.xml | 2 +- testsuite/integration-arquillian/util/pom.xml | 2 +- testsuite/utils/pom.xml | 10 +- 126 files changed, 760 insertions(+), 322 deletions(-) create mode 100644 adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/pom.xml create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/.gitignore create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/pom.xml create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/.gitignore create mode 100644 testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml diff --git a/adapters/oidc/installed/pom.xml b/adapters/oidc/installed/pom.xml index 8b124ecaca5..5f9476fa919 100755 --- a/adapters/oidc/installed/pom.xml +++ b/adapters/oidc/installed/pom.xml @@ -68,8 +68,8 @@ resteasy-client - jakarta.ws.rs - jakarta.ws.rs-api + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec io.undertow diff --git a/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java b/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java index e6637ec59a7..685b55275be 100644 --- a/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java +++ b/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java @@ -40,10 +40,10 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.client.Entity; +import javax.ws.rs.core.Form; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/adapters/oidc/jaxrs-oauth-client/pom.xml b/adapters/oidc/jaxrs-oauth-client/pom.xml index 71851eb42c4..1d5b773a2d1 100755 --- a/adapters/oidc/jaxrs-oauth-client/pom.xml +++ b/adapters/oidc/jaxrs-oauth-client/pom.xml @@ -32,8 +32,8 @@ - jakarta.ws.rs - jakarta.ws.rs-api + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec provided @@ -71,8 +71,13 @@ provided - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + provided + + + javax.annotation + javax.annotation-api provided diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilter.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilter.java index 8b06402a869..9e66bc0ee00 100644 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilter.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilter.java @@ -17,11 +17,10 @@ package org.keycloak.jaxrs; -import jakarta.annotation.Priority; - -import jakarta.ws.rs.Priorities; -import jakarta.ws.rs.container.ContainerRequestFilter; -import jakarta.ws.rs.container.PreMatching; +import javax.annotation.Priority; +import javax.ws.rs.Priorities; +import javax.ws.rs.container.ContainerRequestFilter; +import javax.ws.rs.container.PreMatching; /** * @author Marek Posolda diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java index 62bf9c7853f..a44a4e56605 100755 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java @@ -17,7 +17,6 @@ package org.keycloak.jaxrs; -import jakarta.annotation.Priority; import org.keycloak.KeycloakPrincipal; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterUtils; @@ -35,11 +34,12 @@ import org.keycloak.adapters.spi.AuthOutcome; import org.keycloak.adapters.spi.UserSessionManagement; import org.keycloak.common.constants.GenericConstants; -import jakarta.ws.rs.Priorities; -import jakarta.ws.rs.container.ContainerRequestContext; -import jakarta.ws.rs.container.PreMatching; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.SecurityContext; +import javax.annotation.Priority; +import javax.ws.rs.Priorities; +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.PreMatching; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.SecurityContext; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java index cf22d8705dc..66599c45d90 100755 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java @@ -24,9 +24,9 @@ import org.keycloak.adapters.spi.LogoutError; import org.keycloak.common.util.HostUtils; import javax.security.cert.X509Certificate; -import jakarta.ws.rs.container.ContainerRequestContext; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.SecurityContext; +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.SecurityContext; import java.io.BufferedInputStream; import java.io.IOException; @@ -95,10 +95,10 @@ public class JaxrsHttpFacade implements OIDCHttpFacade { @Override public Cookie getCookie(String cookieName) { - Map cookies = requestContext.getCookies(); + Map cookies = requestContext.getCookies(); if (cookies == null) return null; - jakarta.ws.rs.core.Cookie cookie = cookies.get(cookieName); + javax.ws.rs.core.Cookie cookie = cookies.get(cookieName); if (cookie == null) return null; return new Cookie(cookie.getName(), cookie.getValue(), cookie.getVersion(), cookie.getDomain(), cookie.getPath()); @@ -153,7 +153,7 @@ public class JaxrsHttpFacade implements OIDCHttpFacade { protected class ResponseFacade implements OIDCHttpFacade.Response { - private jakarta.ws.rs.core.Response.ResponseBuilder responseBuilder = jakarta.ws.rs.core.Response.status(204); + private javax.ws.rs.core.Response.ResponseBuilder responseBuilder = javax.ws.rs.core.Response.status(204); @Override public void setStatus(int status) { @@ -190,21 +190,21 @@ public class JaxrsHttpFacade implements OIDCHttpFacade { @Override public void sendError(int code) { - jakarta.ws.rs.core.Response response = responseBuilder.status(code).build(); + javax.ws.rs.core.Response response = responseBuilder.status(code).build(); requestContext.abortWith(response); responseFinished = true; } @Override public void sendError(int code, String message) { - jakarta.ws.rs.core.Response response = responseBuilder.status(code).entity(message).build(); + javax.ws.rs.core.Response response = responseBuilder.status(code).entity(message).build(); requestContext.abortWith(response); responseFinished = true; } @Override public void end() { - jakarta.ws.rs.core.Response response = responseBuilder.build(); + javax.ws.rs.core.Response response = responseBuilder.build(); requestContext.abortWith(response); responseFinished = true; } diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsOAuthClient.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsOAuthClient.java index 39955ba2a07..2ec416d1794 100755 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsOAuthClient.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsOAuthClient.java @@ -22,17 +22,17 @@ import org.keycloak.OAuth2Constants; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.util.TokenUtil; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.InternalServerErrorException; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.core.Cookie; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.NewCookie; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; +import javax.ws.rs.BadRequestException; +import javax.ws.rs.InternalServerErrorException; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.Entity; +import javax.ws.rs.core.Cookie; +import javax.ws.rs.core.Form; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.NewCookie; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriBuilder; +import javax.ws.rs.core.UriInfo; import java.net.URI; import java.util.Map; import java.util.logging.Logger; diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java index 41c3ff31208..fca53d87f76 100644 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java @@ -17,13 +17,13 @@ package org.keycloak.jaxrs; -import jakarta.annotation.Priority; import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.common.constants.GenericConstants; import org.osgi.framework.BundleContext; -import jakarta.ws.rs.Priorities; -import jakarta.ws.rs.container.PreMatching; +import javax.annotation.Priority; +import javax.ws.rs.Priorities; +import javax.ws.rs.container.PreMatching; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java index 38a848e295a..a66252d1ab8 100755 --- a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java +++ b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java @@ -52,10 +52,10 @@ import org.keycloak.enums.TokenStore; import org.keycloak.representations.adapters.config.AdapterConfig; import javax.security.auth.Subject; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletContext; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java index a83ea637538..38a2480b540 100755 --- a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java +++ b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java @@ -30,7 +30,7 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.spi.HttpFacade; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import java.security.Principal; import java.util.Set; diff --git a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java index 7ce8a2b48b5..aada9c6fded 100755 --- a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java +++ b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java @@ -29,7 +29,7 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.spi.AdapterSessionStore; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * Handle storage of token info in HTTP Session. Per-request object diff --git a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java index 208af9c0745..78fa6f1d444 100755 --- a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java +++ b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java @@ -21,7 +21,7 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.OIDCHttpFacade; import org.keycloak.adapters.jetty.spi.JettyHttpFacade; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; /** * @author Bill Burke diff --git a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94RequestAuthenticator.java b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94RequestAuthenticator.java index cbe756c2bfd..fa6d75f7e9c 100644 --- a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94RequestAuthenticator.java +++ b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94RequestAuthenticator.java @@ -23,7 +23,7 @@ import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.jetty.core.JettyRequestAuthenticator; import org.keycloak.adapters.spi.HttpFacade; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94SessionManager.java b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94SessionManager.java index b676700089e..044e30cd8f1 100755 --- a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94SessionManager.java +++ b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94SessionManager.java @@ -21,7 +21,7 @@ import org.eclipse.jetty.server.session.Session; import org.eclipse.jetty.server.session.SessionHandler; import org.keycloak.adapters.jetty.spi.JettySessionManager; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java index 9a5b91ffc75..642bdf56639 100644 --- a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java +++ b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java @@ -24,7 +24,7 @@ import org.keycloak.adapters.jetty.spi.JettyHttpFacade; import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.common.util.MultivaluedHashMap; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/KeycloakJettyAuthenticator.java b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/KeycloakJettyAuthenticator.java index daabc4d8c22..3ae9327cfec 100644 --- a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/KeycloakJettyAuthenticator.java +++ b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/KeycloakJettyAuthenticator.java @@ -28,7 +28,7 @@ import org.keycloak.adapters.jetty.core.JettySessionTokenStore; import org.keycloak.adapters.jetty.spi.JettyHttpFacade; import org.keycloak.adapters.jetty.spi.JettyUserSessionManagement; -import jakarta.servlet.ServletRequest; +import javax.servlet.ServletRequest; /** * @author Bill Burke diff --git a/adapters/oidc/pom.xml b/adapters/oidc/pom.xml index f40e1ff77cb..f4e37273be1 100755 --- a/adapters/oidc/pom.xml +++ b/adapters/oidc/pom.xml @@ -29,10 +29,11 @@ keycloak-oidc-client-adapter-pom pom + adapter-core installed - + tomcat undertow - + wildfly + wildfly-elytron diff --git a/adapters/oidc/servlet-filter/pom.xml b/adapters/oidc/servlet-filter/pom.xml index 84104c12056..7cd29e60e8e 100755 --- a/adapters/oidc/servlet-filter/pom.xml +++ b/adapters/oidc/servlet-filter/pom.xml @@ -88,8 +88,8 @@ jackson-annotations - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec provided diff --git a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/FilterRequestAuthenticator.java b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/FilterRequestAuthenticator.java index 6e3f9cf012c..11bd5aed0ea 100755 --- a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/FilterRequestAuthenticator.java +++ b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/FilterRequestAuthenticator.java @@ -29,8 +29,8 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.spi.KeycloakAccount; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.security.Principal; import java.util.Set; import java.util.logging.Level; diff --git a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java index b7ae3135337..e8e7f8dd19a 100755 --- a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java +++ b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java @@ -30,15 +30,15 @@ import org.keycloak.adapters.spi.InMemorySessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.UserSessionManagement; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java index 4b4ddc5c97b..991c85fdf49 100755 --- a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java +++ b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java @@ -29,9 +29,9 @@ import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.common.util.DelegatingSerializationFilter; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpSession; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCServletHttpFacade.java b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCServletHttpFacade.java index a41e02be059..1d632aa760d 100755 --- a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCServletHttpFacade.java +++ b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCServletHttpFacade.java @@ -20,8 +20,8 @@ package org.keycloak.adapters.servlet; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.OIDCHttpFacade; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @author Bill Burke diff --git a/adapters/oidc/spring-security/pom.xml b/adapters/oidc/spring-security/pom.xml index 3cee2aa57fc..a72e321e86a 100644 --- a/adapters/oidc/spring-security/pom.xml +++ b/adapters/oidc/spring-security/pom.xml @@ -55,8 +55,8 @@ keycloak-policy-enforcer - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_4.0_spec provided diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/HttpHeaderInspectingApiRequestMatcher.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/HttpHeaderInspectingApiRequestMatcher.java index 3bcb276c0af..3f18a8bf8e8 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/HttpHeaderInspectingApiRequestMatcher.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/HttpHeaderInspectingApiRequestMatcher.java @@ -21,7 +21,7 @@ import org.apache.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.security.web.util.matcher.RequestMatcher; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; /** * {@link RequestMatcher} that determines if a given request is an API request or an diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationEntryPoint.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationEntryPoint.java index 766fb6844c7..95717fc2fbb 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationEntryPoint.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationEntryPoint.java @@ -19,9 +19,9 @@ package org.keycloak.adapters.springsecurity.authentication; import java.io.IOException; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.http.HttpHeaders; import org.keycloak.adapters.AdapterDeploymentContext; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationFailureHandler.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationFailureHandler.java index 4263d86577a..fdb6cb84c18 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationFailureHandler.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationFailureHandler.java @@ -20,9 +20,9 @@ package org.keycloak.adapters.springsecurity.authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.AuthenticationFailureHandler; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationSuccessHandler.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationSuccessHandler.java index 09b682c8737..7a0eab9b6a8 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationSuccessHandler.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationSuccessHandler.java @@ -18,9 +18,9 @@ package org.keycloak.adapters.springsecurity.authentication; import java.io.IOException; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakCookieBasedRedirect.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakCookieBasedRedirect.java index c6b2fd48e45..b3b8e7e5f78 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakCookieBasedRedirect.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakCookieBasedRedirect.java @@ -17,8 +17,8 @@ package org.keycloak.adapters.springsecurity.authentication; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; /** * Utility class that provides methods to create and retrieve cookies used for login redirects. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakLogoutHandler.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakLogoutHandler.java index 6694b2c0966..213788655f0 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakLogoutHandler.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakLogoutHandler.java @@ -31,8 +31,8 @@ import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutHandler; import org.springframework.util.Assert; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Logs the current user out of Keycloak. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/RequestAuthenticatorFactory.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/RequestAuthenticatorFactory.java index 27d49162e55..e640f1b8eb0 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/RequestAuthenticatorFactory.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/RequestAuthenticatorFactory.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.springsecurity.authentication; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java index 8705b19f7d0..e9b850d992c 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java @@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.util.Set; /** diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorFactory.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorFactory.java index fd0f7c6d78c..15aed06d4d2 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorFactory.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorFactory.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.springsecurity.authentication; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/SimpleHttpFacade.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/SimpleHttpFacade.java index ead34b70280..2c9876eace3 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/SimpleHttpFacade.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/SimpleHttpFacade.java @@ -27,8 +27,8 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.Assert; import javax.security.cert.X509Certificate; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * Simple {@link org.keycloak.adapters.OIDCHttpFacade} wrapping an {@link HttpServletRequest} and {@link HttpServletResponse}. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java index 544701871c6..f4fa0746911 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java @@ -23,7 +23,7 @@ import org.keycloak.adapters.spi.HttpFacade.Request; import org.keycloak.adapters.spi.LogoutError; import org.springframework.util.Assert; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.io.BufferedInputStream; import java.io.IOException; @@ -91,13 +91,13 @@ class WrappedHttpServletRequest implements Request { @Override public Cookie getCookie(String cookieName) { - jakarta.servlet.http.Cookie[] cookies = request.getCookies(); + javax.servlet.http.Cookie[] cookies = request.getCookies(); if (cookies == null) { return null; } - for (jakarta.servlet.http.Cookie cookie : request.getCookies()) { + for (javax.servlet.http.Cookie cookie : request.getCookies()) { if (cookie.getName().equals(cookieName)) { return new Cookie(cookie.getName(), cookie.getValue(), cookie.getVersion(), cookie.getDomain(), cookie.getPath()); } diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java index 442d3b676c2..c246e1328a0 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java @@ -21,8 +21,8 @@ import org.keycloak.adapters.spi.HttpFacade.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.lang.reflect.Method; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/AdapterStateCookieRequestMatcher.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/AdapterStateCookieRequestMatcher.java index 5fb46c3cc60..bee9d15000c 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/AdapterStateCookieRequestMatcher.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/AdapterStateCookieRequestMatcher.java @@ -17,8 +17,8 @@ package org.keycloak.adapters.springsecurity.filter; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; import org.keycloak.constants.AdapterConstants; import org.springframework.security.web.util.matcher.RequestMatcher; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticatedActionsFilter.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticatedActionsFilter.java index b05354c257f..3ef324fa4e5 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticatedActionsFilter.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticatedActionsFilter.java @@ -18,12 +18,12 @@ package org.keycloak.adapters.springsecurity.filter; import java.io.IOException; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java index fcdd1835cdd..930867efd64 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java @@ -19,10 +19,10 @@ package org.keycloak.adapters.springsecurity.filter; import java.io.IOException; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.keycloak.OAuth2Constants; import org.keycloak.adapters.AdapterDeploymentContext; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakCsrfRequestMatcher.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakCsrfRequestMatcher.java index 8fbec3a314a..93a48f57378 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakCsrfRequestMatcher.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakCsrfRequestMatcher.java @@ -21,7 +21,7 @@ import org.keycloak.constants.AdapterConstants; import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.StringUtils; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java index 9bf98b110ea..75bc815f27a 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java @@ -31,12 +31,12 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.web.filter.GenericFilterBean; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakSecurityContextRequestFilter.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakSecurityContextRequestFilter.java index d52d2972f40..4e17183ad30 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakSecurityContextRequestFilter.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakSecurityContextRequestFilter.java @@ -18,12 +18,12 @@ package org.keycloak.adapters.springsecurity.filter; import java.io.IOException; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/QueryParamPresenceRequestMatcher.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/QueryParamPresenceRequestMatcher.java index e4784208452..76164638e91 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/QueryParamPresenceRequestMatcher.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/QueryParamPresenceRequestMatcher.java @@ -16,7 +16,7 @@ */ package org.keycloak.adapters.springsecurity.filter; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.springframework.security.web.util.matcher.RequestMatcher; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java index 563bf5171fb..f711b3919d3 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java @@ -19,7 +19,7 @@ package org.keycloak.adapters.springsecurity.management; import java.util.List; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import org.keycloak.adapters.spi.UserSessionManagement; import org.slf4j.Logger; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/LocalSessionManagementStrategy.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/LocalSessionManagementStrategy.java index d7b698f61e1..7487ac5f513 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/LocalSessionManagementStrategy.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/LocalSessionManagementStrategy.java @@ -17,7 +17,7 @@ package org.keycloak.adapters.springsecurity.management; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/SessionManagementStrategy.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/SessionManagementStrategy.java index becaad054a7..b39ca1b562c 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/SessionManagementStrategy.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/SessionManagementStrategy.java @@ -17,7 +17,7 @@ package org.keycloak.adapters.springsecurity.management; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import java.util.Collection; /** diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/AdapterTokenStoreFactory.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/AdapterTokenStoreFactory.java index 097798739e8..b8a60ce7d20 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/AdapterTokenStoreFactory.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/AdapterTokenStoreFactory.java @@ -17,11 +17,11 @@ package org.keycloak.adapters.springsecurity.token; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; /** * Creates a per-request adapter token store. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactory.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactory.java index 1428db17634..321744cede5 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactory.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactory.java @@ -22,8 +22,8 @@ import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.enums.TokenStore; import org.springframework.util.Assert; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * {@link AdapterTokenStoreFactory} that returns a new {@link SpringSecurityTokenStore} for each request. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityCookieTokenStore.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityCookieTokenStore.java index 4a313da3f11..92699f82b42 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityCookieTokenStore.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityCookieTokenStore.java @@ -18,8 +18,8 @@ package org.keycloak.adapters.springsecurity.token; import java.util.Set; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterUtils; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityTokenStore.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityTokenStore.java index 1bf199d23c9..a932dda6c32 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityTokenStore.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityTokenStore.java @@ -30,8 +30,8 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.Assert; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; /** * Simple Spring {@link SecurityContext security context} aware {@link AdapterTokenStore adapter token store}. diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequestTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequestTest.java index 070b6d38b0d..cb259ce5f25 100644 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequestTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequestTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.bind.annotation.RequestMethod; -import jakarta.servlet.http.Cookie; +import javax.servlet.http.Cookie; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponseTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponseTest.java index 461164cbdfe..6349fbb840d 100644 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponseTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponseTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.http.HttpStatus; import org.springframework.mock.web.MockHttpServletResponse; -import jakarta.servlet.http.Cookie; +import javax.servlet.http.Cookie; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java index aa0fd865067..c0a69c12685 100755 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java @@ -44,9 +44,9 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; -import jakarta.servlet.FilterChain; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.FilterChain; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.Collections; import java.util.List; import java.util.UUID; diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilterTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilterTest.java index 6688c4c8c4b..d23fd8fea67 100644 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilterTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilterTest.java @@ -6,9 +6,9 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import jakarta.servlet.FilterChain; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.FilterChain; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.junit.After; import org.junit.Before; diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java index 17de7ec4d18..6984cd5fa53 100755 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java @@ -25,8 +25,8 @@ import org.keycloak.enums.TokenStore; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; diff --git a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractAuthenticatedActionsValve.java b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractAuthenticatedActionsValve.java index cf8293cf01a..123c2ec0aa4 100644 --- a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractAuthenticatedActionsValve.java +++ b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractAuthenticatedActionsValve.java @@ -27,7 +27,7 @@ import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AuthenticatedActionsHandler; import org.keycloak.adapters.KeycloakDeployment; -import jakarta.servlet.ServletException; +import javax.servlet.ServletException; import java.io.IOException; /** diff --git a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java index 4901800e117..97588539822 100755 --- a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java +++ b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java @@ -37,9 +37,9 @@ import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.constants.AdapterConstants; import org.keycloak.enums.TokenStore; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaRequestAuthenticator.java b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaRequestAuthenticator.java index c110b3506ed..84c39a7655d 100755 --- a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaRequestAuthenticator.java +++ b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaRequestAuthenticator.java @@ -28,7 +28,7 @@ import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import java.security.Principal; import java.util.Set; import java.util.logging.Level; diff --git a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/OIDCCatalinaHttpFacade.java b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/OIDCCatalinaHttpFacade.java index 78c63f83c30..fb180ac7bfb 100755 --- a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/OIDCCatalinaHttpFacade.java +++ b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/OIDCCatalinaHttpFacade.java @@ -20,7 +20,7 @@ package org.keycloak.adapters.tomcat; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.OIDCHttpFacade; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; /** * @author Bill Burke diff --git a/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java index 044c4910c9e..02868820579 100755 --- a/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java +++ b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java @@ -29,7 +29,7 @@ import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.spi.HttpFacade; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Method; import java.security.Principal; diff --git a/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java index e09200db378..8103959fcaa 100755 --- a/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java +++ b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java @@ -21,7 +21,7 @@ import org.apache.catalina.connector.Request; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/undertow/pom.xml b/adapters/oidc/undertow/pom.xml index 3cd802041e1..d91c8eadf8d 100755 --- a/adapters/oidc/undertow/pom.xml +++ b/adapters/oidc/undertow/pom.xml @@ -84,8 +84,8 @@ jackson-annotations - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec provided diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java index 87cfcbfb4a6..b73832192ab 100755 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java @@ -39,7 +39,7 @@ import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.NodesRegistrationManagement; import org.keycloak.constants.AdapterConstants; -import jakarta.servlet.ServletContext; +import javax.servlet.ServletContext; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java index 2cc862b8611..6e076568e45 100755 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java @@ -30,10 +30,10 @@ import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.enums.TokenStore; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import java.io.IOException; /** diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java index 4d948727b38..7f23b3bbd73 100755 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java @@ -27,8 +27,8 @@ import org.keycloak.adapters.OAuthRequestAuthenticator; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.spi.HttpFacade; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java index 5883c8642bb..ef6081a21ae 100755 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java @@ -28,8 +28,8 @@ import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; /** * Per-request object. Storage of tokens in servlet HTTP session. diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java index f2572612397..6978ea54939 100644 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java @@ -19,8 +19,8 @@ package org.keycloak.adapters.undertow; import org.keycloak.adapters.NodesRegistrationManagement; -import jakarta.servlet.ServletContextEvent; -import jakarta.servlet.ServletContextListener; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; /** * @author Marek Posolda diff --git a/adapters/oidc/wildfly-elytron/pom.xml b/adapters/oidc/wildfly-elytron/pom.xml index 2598590e989..f597b94cd1e 100755 --- a/adapters/oidc/wildfly-elytron/pom.xml +++ b/adapters/oidc/wildfly-elytron/pom.xml @@ -85,8 +85,8 @@ jackson-annotations - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec provided diff --git a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/ElytronHttpFacade.java b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/ElytronHttpFacade.java index b4ed27ac936..080fa8446a8 100644 --- a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/ElytronHttpFacade.java +++ b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/ElytronHttpFacade.java @@ -43,10 +43,10 @@ import org.wildfly.security.http.Scope; import javax.security.auth.callback.CallbackHandler; import javax.security.cert.X509Certificate; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakConfigurationServletListener.java b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakConfigurationServletListener.java index 79a3edf87e5..29aa2ff676d 100644 --- a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakConfigurationServletListener.java +++ b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakConfigurationServletListener.java @@ -24,9 +24,9 @@ import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.constants.AdapterConstants; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletContextEvent; -import jakarta.servlet.ServletContextListener; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakServletExtension.java b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakServletExtension.java index e8e12d8a318..5adf6e98f27 100644 --- a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakServletExtension.java +++ b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakServletExtension.java @@ -16,8 +16,8 @@ */ package org.keycloak.adapters.elytron; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletRequest; +import javax.servlet.ServletContext; +import javax.servlet.ServletRequest; import io.undertow.server.HttpHandler; import io.undertow.servlet.ServletExtension; diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java index 3832f4b5b1d..7f40e5aed3c 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java @@ -36,13 +36,13 @@ import org.keycloak.saml.processing.web.util.PostBindingUtil; import org.w3c.dom.Document; import org.w3c.dom.Node; -import jakarta.xml.soap.MessageFactory; -import jakarta.xml.soap.SOAPBody; -import jakarta.xml.soap.SOAPEnvelope; -import jakarta.xml.soap.SOAPException; -import jakarta.xml.soap.SOAPHeader; -import jakarta.xml.soap.SOAPHeaderElement; -import jakarta.xml.soap.SOAPMessage; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPHeader; +import javax.xml.soap.SOAPHeaderElement; +import javax.xml.soap.SOAPMessage; /** * @author Pedro Igor diff --git a/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java b/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java index 8a794169b75..415c9deaf25 100755 --- a/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java +++ b/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java @@ -53,12 +53,12 @@ import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.saml.common.exceptions.ParsingException; import javax.security.auth.Subject; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java b/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java index 23e50a8296e..ad5bd30b1bf 100755 --- a/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java +++ b/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java @@ -29,7 +29,7 @@ import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.common.util.KeycloakUriBuilder; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import java.util.LinkedList; import java.util.List; import java.util.Set; diff --git a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java index ebd4e6d1c5d..fa618cb5737 100644 --- a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java +++ b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java @@ -24,7 +24,7 @@ import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.SessionIdMapper; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SessionManager.java b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SessionManager.java index 4bd3c16af1b..bd560577b1e 100755 --- a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SessionManager.java +++ b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SessionManager.java @@ -21,7 +21,7 @@ import org.eclipse.jetty.server.session.Session; import org.eclipse.jetty.server.session.SessionHandler; import org.keycloak.adapters.jetty.spi.JettySessionManager; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java index ddc2c9546d6..17246056c67 100644 --- a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java +++ b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java @@ -24,7 +24,7 @@ import org.keycloak.adapters.jetty.spi.JettyHttpFacade; import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.common.util.MultivaluedHashMap; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java index 850f2222509..4ec71cd178b 100644 --- a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java +++ b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java @@ -25,7 +25,7 @@ import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.spi.HttpFacade; -import jakarta.servlet.ServletRequest; +import javax.servlet.ServletRequest; /** * @author Bill Burke diff --git a/adapters/saml/pom.xml b/adapters/saml/pom.xml index aafeb291e29..f941cc0876a 100755 --- a/adapters/saml/pom.xml +++ b/adapters/saml/pom.xml @@ -33,9 +33,9 @@ core-public core - + jetty undertow - + tomcat wildfly servlet-filter jakarta-servlet-filter diff --git a/adapters/saml/servlet-filter/pom.xml b/adapters/saml/servlet-filter/pom.xml index 394f6467fe4..1c7a3307149 100755 --- a/adapters/saml/servlet-filter/pom.xml +++ b/adapters/saml/servlet-filter/pom.xml @@ -68,8 +68,9 @@ keycloak-crypto-default - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + provided junit diff --git a/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java b/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java index cc5cc265bbe..731bdba26a3 100755 --- a/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java +++ b/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java @@ -28,9 +28,9 @@ import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.common.util.KeycloakUriBuilder; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpSession; import java.util.LinkedList; import java.util.List; import java.util.Set; diff --git a/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java b/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java index 45fc8d8f5cc..093f203d531 100755 --- a/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java +++ b/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java @@ -37,16 +37,16 @@ import org.keycloak.adapters.spi.InMemorySessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.saml.common.exceptions.ParsingException; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java index c46e9bcaff5..a7b8f41fd02 100755 --- a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java +++ b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java @@ -34,10 +34,10 @@ import org.keycloak.adapters.tomcat.CatalinaUserSessionManagement; import org.keycloak.adapters.tomcat.PrincipalFactory; import org.keycloak.saml.common.exceptions.ParsingException; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java index c730f967f4e..ff122ac5a66 100755 --- a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java +++ b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java @@ -29,7 +29,7 @@ import org.keycloak.adapters.tomcat.CatalinaUserSessionManagement; import org.keycloak.adapters.tomcat.PrincipalFactory; import org.keycloak.common.util.KeycloakUriBuilder; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import java.io.IOException; import java.util.LinkedList; import java.util.List; diff --git a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/IdMapperUpdaterSessionListener.java b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/IdMapperUpdaterSessionListener.java index eb03f8740bb..4fc78149fd3 100644 --- a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/IdMapperUpdaterSessionListener.java +++ b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/IdMapperUpdaterSessionListener.java @@ -19,7 +19,7 @@ package org.keycloak.adapters.saml; import org.keycloak.adapters.spi.SessionIdMapper; import java.util.Objects; -import jakarta.servlet.http.*; +import javax.servlet.http.*; /** * diff --git a/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java b/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java index c57581da0ad..58c041091fc 100755 --- a/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java +++ b/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java @@ -28,7 +28,7 @@ import org.keycloak.adapters.saml.SamlSessionStore; import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.tomcat.GenericPrincipalFactory; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Method; import java.security.Principal; diff --git a/adapters/saml/undertow/pom.xml b/adapters/saml/undertow/pom.xml index 408edd3e502..b4d5480a78c 100755 --- a/adapters/saml/undertow/pom.xml +++ b/adapters/saml/undertow/pom.xml @@ -67,8 +67,8 @@ provided - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec provided diff --git a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/SamlServletExtension.java b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/SamlServletExtension.java index 16ad990fb7a..931ecd7169e 100755 --- a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/SamlServletExtension.java +++ b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/SamlServletExtension.java @@ -41,7 +41,7 @@ import org.keycloak.adapters.undertow.ChangeSessionId; import org.keycloak.adapters.undertow.UndertowUserSessionManagement; import org.keycloak.saml.common.exceptions.ParsingException; -import jakarta.servlet.ServletContext; +import javax.servlet.ServletContext; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java index 0cc3dbb4aa0..df1a471b070 100755 --- a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java +++ b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java @@ -31,10 +31,10 @@ import org.keycloak.adapters.undertow.UndertowHttpFacade; import org.keycloak.adapters.undertow.UndertowUserSessionManagement; import io.undertow.servlet.api.DeploymentInfo; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import java.io.IOException; import java.lang.reflect.*; import java.util.Map; diff --git a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java index 89a4373994f..449a876c77b 100755 --- a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java +++ b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java @@ -38,9 +38,9 @@ import org.keycloak.adapters.undertow.UndertowUserSessionManagement; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.XMLGregorianCalendar; import java.security.Principal; diff --git a/adapters/saml/wildfly-elytron/pom.xml b/adapters/saml/wildfly-elytron/pom.xml index 6bc9f3de4f2..5dfaf1bb6e3 100755 --- a/adapters/saml/wildfly-elytron/pom.xml +++ b/adapters/saml/wildfly-elytron/pom.xml @@ -67,8 +67,9 @@ provided - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + provided org.wildfly.security diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java index 475814dcc94..d65d74a3085 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java @@ -20,11 +20,11 @@ import org.keycloak.adapters.saml.SamlSession; import org.keycloak.adapters.spi.SessionIdMapper; import java.util.Objects; -import jakarta.servlet.http.HttpSession; -import jakarta.servlet.http.HttpSessionAttributeListener; -import jakarta.servlet.http.HttpSessionBindingEvent; -import jakarta.servlet.http.HttpSessionEvent; -import jakarta.servlet.http.HttpSessionListener; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionAttributeListener; +import javax.servlet.http.HttpSessionBindingEvent; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; import org.jboss.logging.Logger; /** diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java index 7c2fa22d4f5..5ece449657b 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java @@ -22,9 +22,9 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletContextEvent; -import jakarta.servlet.ServletContextListener; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; import org.jboss.logging.Logger; import org.keycloak.adapters.saml.AdapterConstants; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java index 7cd211510f0..5f9beb65344 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.regex.Pattern; import javax.security.auth.callback.CallbackHandler; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import org.jboss.logging.Logger; import org.keycloak.adapters.saml.SamlAuthenticator; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java index 0f2120c68d2..093a85d38dc 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java @@ -23,7 +23,7 @@ import org.keycloak.adapters.spi.SessionIdMapperUpdater; import java.util.*; import javax.naming.InitialContext; import javax.naming.NamingException; -import jakarta.servlet.ServletContext; +import javax.servlet.ServletContext; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.Configuration; diff --git a/adapters/spi/jboss-adapter-core/pom.xml b/adapters/spi/jboss-adapter-core/pom.xml index c5fd1ebd28a..63fcbce25dd 100755 --- a/adapters/spi/jboss-adapter-core/pom.xml +++ b/adapters/spi/jboss-adapter-core/pom.xml @@ -65,8 +65,8 @@ jackson-annotations - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec provided diff --git a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java index 50cb9b72b33..5e822edfce3 100755 --- a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java +++ b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java @@ -24,7 +24,7 @@ import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.IOException; @@ -109,8 +109,8 @@ public class JettyHttpFacade implements HttpFacade { @Override public Cookie getCookie(String cookieName) { if (request.getCookies() == null) return null; - jakarta.servlet.http.Cookie cookie = null; - for (jakarta.servlet.http.Cookie c : request.getCookies()) { + javax.servlet.http.Cookie cookie = null; + for (javax.servlet.http.Cookie c : request.getCookies()) { if (c.getName().equals(cookieName)) { cookie = c; break; @@ -210,7 +210,7 @@ public class JettyHttpFacade implements HttpFacade { @Override public void setCookie(String name, String value, String path, String domain, int maxAge, boolean secure, boolean httpOnly) { - jakarta.servlet.http.Cookie cookie = new jakarta.servlet.http.Cookie(name, value); + javax.servlet.http.Cookie cookie = new javax.servlet.http.Cookie(name, value); if (domain != null) cookie.setDomain(domain); if (path != null) cookie.setPath(path); if (secure) cookie.setSecure(true); diff --git a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettySessionManager.java b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettySessionManager.java index e4a9b5174eb..645ce1f48c7 100644 --- a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettySessionManager.java +++ b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettySessionManager.java @@ -17,7 +17,7 @@ package org.keycloak.adapters.jetty.spi; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; /** * @author Marek Posolda diff --git a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java index 02941391bd9..55ebd32c928 100755 --- a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java +++ b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java @@ -20,7 +20,7 @@ package org.keycloak.adapters.jetty.spi; import org.jboss.logging.Logger; import org.keycloak.adapters.spi.UserSessionManagement; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import java.util.List; /** diff --git a/adapters/spi/pom.xml b/adapters/spi/pom.xml index 157a5555632..6bd05d9b412 100755 --- a/adapters/spi/pom.xml +++ b/adapters/spi/pom.xml @@ -32,11 +32,11 @@ adapter-spi - + tomcat-adapter-spi undertow-adapter-spi servlet-adapter-spi jakarta-servlet-adapter-spi jboss-adapter-core - + jetty-adapter-spi diff --git a/adapters/spi/servlet-adapter-spi/pom.xml b/adapters/spi/servlet-adapter-spi/pom.xml index abf8a522e21..2d8f0ca1f6d 100755 --- a/adapters/spi/servlet-adapter-spi/pom.xml +++ b/adapters/spi/servlet-adapter-spi/pom.xml @@ -54,8 +54,8 @@ keycloak-common - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec provided diff --git a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java index 369fdb4d16a..f2b5a47a34f 100755 --- a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java +++ b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java @@ -17,18 +17,17 @@ package org.keycloak.adapters.servlet; -import jakarta.servlet.ReadListener; import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.common.util.Encode; import org.keycloak.common.util.MultivaluedHashMap; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; -import jakarta.servlet.http.HttpSession; +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import javax.servlet.http.HttpSession; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -175,21 +174,6 @@ public class FilterSessionStore implements AdapterSessionStore { if (needRequestRestore && body != null) { final ByteArrayInputStream is = new ByteArrayInputStream(body); return new ServletInputStream() { - @Override - public boolean isFinished() { - return false; - } - - @Override - public boolean isReady() { - return false; - } - - @Override - public void setReadListener(ReadListener readListener) { - - } - @Override public int read() throws IOException { return is.read(); diff --git a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java index b3d30f45b0c..add26e1c04c 100755 --- a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java +++ b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java @@ -25,8 +25,8 @@ import org.keycloak.common.util.ServerCookie; import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.IOException; @@ -111,8 +111,8 @@ public class ServletHttpFacade implements HttpFacade { @Override public Cookie getCookie(String cookieName) { if (request.getCookies() == null) return null; - jakarta.servlet.http.Cookie cookie = null; - for (jakarta.servlet.http.Cookie c : request.getCookies()) { + javax.servlet.http.Cookie cookie = null; + for (javax.servlet.http.Cookie c : request.getCookies()) { if (c.getName().equals(cookieName)) { cookie = c; break; diff --git a/adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java b/adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java index 87a5e3a0c45..7ff1fbceb63 100755 --- a/adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java +++ b/adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java @@ -25,7 +25,7 @@ import org.keycloak.common.util.ServerCookie; import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.IOException; @@ -117,8 +117,8 @@ public class CatalinaHttpFacade implements HttpFacade { @Override public Cookie getCookie(String cookieName) { if (request.getCookies() == null) return null; - jakarta.servlet.http.Cookie cookie = null; - for (jakarta.servlet.http.Cookie c : request.getCookies()) { + javax.servlet.http.Cookie cookie = null; + for (javax.servlet.http.Cookie c : request.getCookies()) { if (c.getName().equals(cookieName)) { cookie = c; break; diff --git a/adapters/spi/undertow-adapter-spi/pom.xml b/adapters/spi/undertow-adapter-spi/pom.xml index 4d959a96ffd..884b93c7740 100755 --- a/adapters/spi/undertow-adapter-spi/pom.xml +++ b/adapters/spi/undertow-adapter-spi/pom.xml @@ -56,8 +56,8 @@ keycloak-common - jakarta.servlet - jakarta.servlet-api + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec provided diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java index 478fd275ca5..0d4aae71614 100755 --- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java +++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java @@ -22,7 +22,7 @@ import io.undertow.server.session.Session; import io.undertow.servlet.handlers.ServletRequestContext; import io.undertow.servlet.spec.HttpSessionImpl; -import jakarta.servlet.http.HttpSession; +import javax.servlet.http.HttpSession; import java.io.Serializable; import java.security.AccessController; diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java index c89f7e9e579..fbcd6d3219c 100755 --- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java +++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java @@ -22,8 +22,8 @@ import io.undertow.servlet.handlers.ServletRequestContext; import org.keycloak.adapters.spi.AuthenticationError; import org.keycloak.adapters.spi.LogoutError; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @author Bill Burke diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java index 497854d9bc4..497f772c31b 100755 --- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java +++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java @@ -27,17 +27,16 @@ import io.undertow.servlet.handlers.ServletRequestContext; import io.undertow.util.AttachmentKey; import io.undertow.util.Headers; import io.undertow.util.HttpString; -import jakarta.servlet.ReadListener; import org.keycloak.adapters.spi.AuthenticationError; import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.LogoutError; import org.keycloak.common.util.KeycloakUriBuilder; import javax.security.cert.X509Certificate; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletRequestWrapper; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; import java.io.BufferedInputStream; import java.io.IOException; @@ -202,22 +201,6 @@ public class UndertowHttpFacade implements HttpFacade { public ServletInputStream getInputStream() { inputStream.mark(0); return new ServletInputStream() { - //TODO - @Override - public boolean isFinished() { - return false; - } - - @Override - public boolean isReady() { - return false; - } - - @Override - public void setReadListener(ReadListener readListener) { - - } - @Override public int read() throws IOException { return inputStream.read(); diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java new file mode 100644 index 00000000000..5f619bcfcd6 --- /dev/null +++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java @@ -0,0 +1,43 @@ +/* + * Copyright 2023 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.undertow; + +import javax.servlet.ServletInputStream; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import java.io.IOException; +import java.io.InputStream; + +public class UndertowHttpServletRequest { + + public static HttpServletRequestWrapper setupServletInputStream(ServletRequest servletRequest, InputStream inputStream) { + return new HttpServletRequestWrapper((HttpServletRequest) servletRequest) { + @Override + public ServletInputStream getInputStream() { + inputStream.mark(0); + return new ServletInputStream() { + @Override + public int read() throws IOException { + return inputStream.read(); + } + }; + } + }; + } +} diff --git a/model/legacy-services/pom.xml b/model/legacy-services/pom.xml index 1b29f000980..2bb276f09b3 100644 --- a/model/legacy-services/pom.xml +++ b/model/legacy-services/pom.xml @@ -47,6 +47,10 @@ com.openshift openshift-restclient-java + + org.jboss.resteasy + resteasy-core + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8cb33c59f5e..bfdc60607e9 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,11 @@ 4.0.0 2.0.1 2.1.0 + 3.0.0 + 1.0.2.Final + 2.0.2.Final + 2.0.0.Final 3.4.1.Final 2.2.1.Final 2.0.11.Final @@ -111,10 +115,12 @@ 3.0.10 2.3.3-b02 2.4.0-b180830.0359 + 1.3.2 2.3.1 1.2.2 2.3.3-b02 - 2.2.19.Final + 2.2.22.Final + 2.3.2.Final 1.20.3.Final 1.9.0.Final 9.4.40.v20210413 @@ -430,6 +436,11 @@ jakarta.servlet-api ${jakarta.servlet.version} + + jakarta.xml.soap + jakarta.xml.soap-api + ${jakarta.xml.soap.version} + org.jboss.resteasy @@ -1871,6 +1882,27 @@ + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + ${servlet.api.30.version} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${jboss-jaxrs-api_2.1_spec} + + + org.jboss.spec.javax.servlet + jboss-servlet-api_4.0_spec + ${jboss-servlet-api_4.0_spec} + + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + diff --git a/services/pom.xml b/services/pom.xml index 8d3914cbaea..38d4c5a8403 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -111,6 +111,10 @@ jakarta.transaction jakarta.transaction-api + + jakarta.xml.soap + jakarta.xml.soap-api + org.jboss.resteasy resteasy-multipart-provider diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 8bbf8df8a72..3b071ffd0d3 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -53,6 +53,7 @@ 1.2.0.Beta3 1.1.0.Final 1.1.0.Final + ${undertow-jakarta.version} 1.0.0.Alpha2 1.6.1 diff --git a/testsuite/integration-arquillian/servers/adapter-spi/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/pom.xml new file mode 100644 index 00000000000..80af3a7f6a8 --- /dev/null +++ b/testsuite/integration-arquillian/servers/adapter-spi/pom.xml @@ -0,0 +1,25 @@ + + + + integration-arquillian-servers + org.keycloak.testsuite + 999-SNAPSHOT + + 4.0.0 + pom + + integration-arquillian-servers-adapter-spi + Testsuite Adapter SPI + + + undertow-adapter-jakarta-spi + undertow-adapter-jakarta + + + + 11 + 11 + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/.gitignore b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/.gitignore new file mode 100644 index 00000000000..95b63147a9c --- /dev/null +++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/.gitignore @@ -0,0 +1,2 @@ +/src/main/java/org/keycloak/adapters/undertow/* +!/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/pom.xml new file mode 100644 index 00000000000..6a1eb6e30f7 --- /dev/null +++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/pom.xml @@ -0,0 +1,101 @@ + + + + keycloak-adapters-pom + org.keycloak + 999-SNAPSHOT + ../../../../../adapters/pom.xml + + 4.0.0 + + integration-arquillian-undertow-jakarta-spi + App Server - Undertow SPI (JakartaEE) + + + 11 + 11 + + ${project.basedir}/../../../../../adapters/spi/undertow-adapter-spi + ${undertow-adapter-spi-base}/src/main/java/org/keycloak/adapters/undertow/ + ${project.basedir}/src/main/java/org/keycloak/adapters/undertow/ + + + + + org.keycloak + keycloak-adapter-spi + + + org.keycloak + keycloak-common + + + io.undertow + undertow-servlet + ${undertow-jakarta.version} + + + io.undertow + undertow-core + ${undertow-jakarta.version} + + + + + + + maven-antrun-plugin + + + transform + initialize + + run + + + + + + + + + + + + + + + + + + + + + + + + + + org.eclipse.transformer + org.eclipse.transformer.cli + 0.2.0 + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java new file mode 100644 index 00000000000..b8359bce423 --- /dev/null +++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpServletRequest.java @@ -0,0 +1,42 @@ +package org.keycloak.adapters.undertow; + +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import java.io.IOException; +import java.io.InputStream; + +public class UndertowHttpServletRequest { + + public static HttpServletRequestWrapper setupServletInputStream(ServletRequest servletRequest, InputStream inputStream) { + return new HttpServletRequestWrapper((HttpServletRequest) servletRequest) { + @Override + public ServletInputStream getInputStream() { + inputStream.mark(0); + return new ServletInputStream() { + @Override + public boolean isFinished() { + return false; + } + + @Override + public boolean isReady() { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) { + + } + + @Override + public int read() throws IOException { + return inputStream.read(); + } + }; + } + }; + } +} diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/.gitignore b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/.gitignore new file mode 100644 index 00000000000..aa8e45f12bc --- /dev/null +++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/.gitignore @@ -0,0 +1 @@ +src/ \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml new file mode 100644 index 00000000000..55d3c22aa35 --- /dev/null +++ b/testsuite/integration-arquillian/servers/adapter-spi/undertow-adapter-jakarta/pom.xml @@ -0,0 +1,156 @@ + + + + integration-arquillian-servers + org.keycloak.testsuite + 999-SNAPSHOT + ../../pom.xml + + 4.0.0 + + keycloak-undertow-adapter-jakarta + App Server - Undertow (JakartaEE) + jar + + + 11 + 11 + + + org.keycloak.adapters.undertow.* + + + io.undertow.*;version="[1.4,3)", + javax.servlet.*;version="[3.1,5)";resolution:=optional, + *;resolution:=optional + + + ${project.basedir}/../../../../../adapters/oidc/undertow + ${undertow-adapter-spi-base}/ + ${project.basedir} + + + + + org.jboss.logging + jboss-logging + provided + + + org.keycloak + keycloak-core + + + org.keycloak + keycloak-adapter-spi + + + org.keycloak + integration-arquillian-undertow-jakarta-spi + ${project.version} + + + org.keycloak + keycloak-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 + + + + jakarta.servlet + jakarta.servlet-api + + + + io.undertow + undertow-servlet + ${undertow-jakarta.version} + + + io.undertow + undertow-core + ${undertow-jakarta.version} + + + junit + junit + test + + + + + + + maven-antrun-plugin + + + transform + initialize + + run + + + + + + + + + + + + + + + + + + + + + + + + + + org.eclipse.transformer + org.eclipse.transformer.cli + 0.2.0 + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + + + + + \ No newline at end of file diff --git a/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml b/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml index 4b6d27e9fb2..537655a5f40 100644 --- a/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml @@ -29,8 +29,9 @@ - org.keycloak - keycloak-undertow-adapter + org.keycloak.testsuite + keycloak-undertow-adapter-jakarta + ${project.version} org.keycloak @@ -58,6 +59,10 @@ org.jboss.arquillian.container undertow-embedded + + commons-io + commons-io + diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 797df544650..92e5155ad32 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -1767,7 +1767,7 @@ org.keycloak - keycloak-admin-client + keycloak-admin-client-jakarta org.keycloak diff --git a/testsuite/integration-arquillian/util/pom.xml b/testsuite/integration-arquillian/util/pom.xml index 9a65e522660..4b3b5fdcd2d 100644 --- a/testsuite/integration-arquillian/util/pom.xml +++ b/testsuite/integration-arquillian/util/pom.xml @@ -95,7 +95,7 @@ jakarta.servlet jakarta.servlet-api - provided + ${jakarta.servlet.version} diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml index 4e09e1b7250..3afa8cff54e 100755 --- a/testsuite/utils/pom.xml +++ b/testsuite/utils/pom.xml @@ -156,8 +156,14 @@ keycloak-kerberos-federation - org.keycloak - keycloak-undertow-adapter + org.keycloak.testsuite + keycloak-undertow-adapter-jakarta + ${project.version} + + + io.undertow + undertow-servlet + ${undertow-jakarta.version} org.keycloak