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
This commit is contained in:
Martin Bartoš 2023-01-09 10:57:57 +01:00 committed by Václav Muzikář
parent 3111ef0085
commit 124591ce1a
126 changed files with 760 additions and 322 deletions

View file

@ -68,8 +68,8 @@
<artifactId>resteasy-client</artifactId> <artifactId>resteasy-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.ws.rs</groupId> <groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId> <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.undertow</groupId> <groupId>io.undertow</groupId>

View file

@ -40,10 +40,10 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import jakarta.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import jakarta.ws.rs.core.Form; import javax.ws.rs.core.Form;
import jakarta.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.Response; import javax.ws.rs.core.Response;
import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;

View file

@ -32,8 +32,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>jakarta.ws.rs</groupId> <groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId> <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -71,8 +71,13 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -17,11 +17,10 @@
package org.keycloak.jaxrs; package org.keycloak.jaxrs;
import jakarta.annotation.Priority; import javax.annotation.Priority;
import javax.ws.rs.Priorities;
import jakarta.ws.rs.Priorities; import javax.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.PreMatching;
import jakarta.ws.rs.container.PreMatching;
/** /**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

View file

@ -17,7 +17,6 @@
package org.keycloak.jaxrs; package org.keycloak.jaxrs;
import jakarta.annotation.Priority;
import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakPrincipal;
import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterDeploymentContext;
import org.keycloak.adapters.AdapterUtils; import org.keycloak.adapters.AdapterUtils;
@ -35,11 +34,12 @@ import org.keycloak.adapters.spi.AuthOutcome;
import org.keycloak.adapters.spi.UserSessionManagement; import org.keycloak.adapters.spi.UserSessionManagement;
import org.keycloak.common.constants.GenericConstants; import org.keycloak.common.constants.GenericConstants;
import jakarta.ws.rs.Priorities; import javax.annotation.Priority;
import jakarta.ws.rs.container.ContainerRequestContext; import javax.ws.rs.Priorities;
import jakarta.ws.rs.container.PreMatching; import javax.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.core.Response; import javax.ws.rs.container.PreMatching;
import jakarta.ws.rs.core.SecurityContext; import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;

View file

@ -24,9 +24,9 @@ import org.keycloak.adapters.spi.LogoutError;
import org.keycloak.common.util.HostUtils; import org.keycloak.common.util.HostUtils;
import javax.security.cert.X509Certificate; import javax.security.cert.X509Certificate;
import jakarta.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.SecurityContext; import javax.ws.rs.core.SecurityContext;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
@ -95,10 +95,10 @@ public class JaxrsHttpFacade implements OIDCHttpFacade {
@Override @Override
public Cookie getCookie(String cookieName) { public Cookie getCookie(String cookieName) {
Map<String, jakarta.ws.rs.core.Cookie> cookies = requestContext.getCookies(); Map<String, javax.ws.rs.core.Cookie> cookies = requestContext.getCookies();
if (cookies == null) if (cookies == null)
return null; return null;
jakarta.ws.rs.core.Cookie cookie = cookies.get(cookieName); javax.ws.rs.core.Cookie cookie = cookies.get(cookieName);
if (cookie == null) if (cookie == null)
return null; return null;
return new Cookie(cookie.getName(), cookie.getValue(), cookie.getVersion(), cookie.getDomain(), cookie.getPath()); 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 { 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 @Override
public void setStatus(int status) { public void setStatus(int status) {
@ -190,21 +190,21 @@ public class JaxrsHttpFacade implements OIDCHttpFacade {
@Override @Override
public void sendError(int code) { 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); requestContext.abortWith(response);
responseFinished = true; responseFinished = true;
} }
@Override @Override
public void sendError(int code, String message) { 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); requestContext.abortWith(response);
responseFinished = true; responseFinished = true;
} }
@Override @Override
public void end() { public void end() {
jakarta.ws.rs.core.Response response = responseBuilder.build(); javax.ws.rs.core.Response response = responseBuilder.build();
requestContext.abortWith(response); requestContext.abortWith(response);
responseFinished = true; responseFinished = true;
} }

View file

@ -22,17 +22,17 @@ import org.keycloak.OAuth2Constants;
import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.AccessTokenResponse;
import org.keycloak.util.TokenUtil; import org.keycloak.util.TokenUtil;
import jakarta.ws.rs.BadRequestException; import javax.ws.rs.BadRequestException;
import jakarta.ws.rs.InternalServerErrorException; import javax.ws.rs.InternalServerErrorException;
import jakarta.ws.rs.client.Client; import javax.ws.rs.client.Client;
import jakarta.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import jakarta.ws.rs.core.Cookie; import javax.ws.rs.core.Cookie;
import jakarta.ws.rs.core.Form; import javax.ws.rs.core.Form;
import jakarta.ws.rs.core.HttpHeaders; import javax.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.NewCookie; import javax.ws.rs.core.NewCookie;
import jakarta.ws.rs.core.Response; import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriBuilder;
import jakarta.ws.rs.core.UriInfo; import javax.ws.rs.core.UriInfo;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;

View file

@ -17,13 +17,13 @@
package org.keycloak.jaxrs; package org.keycloak.jaxrs;
import jakarta.annotation.Priority;
import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.adapters.KeycloakConfigResolver;
import org.keycloak.common.constants.GenericConstants; import org.keycloak.common.constants.GenericConstants;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import jakarta.ws.rs.Priorities; import javax.annotation.Priority;
import jakarta.ws.rs.container.PreMatching; import javax.ws.rs.Priorities;
import javax.ws.rs.container.PreMatching;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;

View file

@ -52,10 +52,10 @@ import org.keycloak.enums.TokenStore;
import org.keycloak.representations.adapters.config.AdapterConfig; import org.keycloak.representations.adapters.config.AdapterConfig;
import javax.security.auth.Subject; import javax.security.auth.Subject;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

View file

@ -30,7 +30,7 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext;
import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.RequestAuthenticator;
import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.HttpFacade;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.security.Principal; import java.security.Principal;
import java.util.Set; import java.util.Set;

View file

@ -29,7 +29,7 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext;
import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.RequestAuthenticator;
import org.keycloak.adapters.spi.AdapterSessionStore; 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 * Handle storage of token info in HTTP Session. Per-request object

View file

@ -21,7 +21,7 @@ import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.OIDCHttpFacade; import org.keycloak.adapters.OIDCHttpFacade;
import org.keycloak.adapters.jetty.spi.JettyHttpFacade; import org.keycloak.adapters.jetty.spi.JettyHttpFacade;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -23,7 +23,7 @@ import org.keycloak.adapters.KeycloakDeployment;
import org.keycloak.adapters.jetty.core.JettyRequestAuthenticator; import org.keycloak.adapters.jetty.core.JettyRequestAuthenticator;
import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.HttpFacade;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -21,7 +21,7 @@ import org.eclipse.jetty.server.session.Session;
import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.server.session.SessionHandler;
import org.keycloak.adapters.jetty.spi.JettySessionManager; import org.keycloak.adapters.jetty.spi.JettySessionManager;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -24,7 +24,7 @@ import org.keycloak.adapters.jetty.spi.JettyHttpFacade;
import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.spi.AdapterSessionStore;
import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.MultivaluedHashMap;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -28,7 +28,7 @@ import org.keycloak.adapters.jetty.core.JettySessionTokenStore;
import org.keycloak.adapters.jetty.spi.JettyHttpFacade; import org.keycloak.adapters.jetty.spi.JettyHttpFacade;
import org.keycloak.adapters.jetty.spi.JettyUserSessionManagement; import org.keycloak.adapters.jetty.spi.JettyUserSessionManagement;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -29,10 +29,11 @@
<artifactId>keycloak-oidc-client-adapter-pom</artifactId> <artifactId>keycloak-oidc-client-adapter-pom</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>adapter-core</module> <module>adapter-core</module>
<module>installed</module> <module>installed</module>
<!-- <module>jaxrs-oauth-client</module> <module>jaxrs-oauth-client</module>
<module>jetty</module> <module>jetty</module>
<module>js</module> <module>js</module>
<module>servlet-filter</module> <module>servlet-filter</module>
@ -41,9 +42,9 @@
<module>spring-boot-adapter-core</module> <module>spring-boot-adapter-core</module>
<module>spring-boot-container-bundle</module> <module>spring-boot-container-bundle</module>
<module>spring-security</module> <module>spring-security</module>
<module>tomcat</module> --> <module>tomcat</module>
<module>undertow</module> <module>undertow</module>
<!-- <module>wildfly</module> <module>wildfly</module>
<module>wildfly-elytron</module>--> <module>wildfly-elytron</module>
</modules> </modules>
</project> </project>

View file

@ -88,8 +88,8 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -29,8 +29,8 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext;
import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.RequestAuthenticator;
import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.spi.KeycloakAccount;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.security.Principal; import java.security.Principal;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;

View file

@ -30,15 +30,15 @@ import org.keycloak.adapters.spi.InMemorySessionIdMapper;
import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper;
import org.keycloak.adapters.spi.UserSessionManagement; import org.keycloak.adapters.spi.UserSessionManagement;
import jakarta.servlet.Filter; import javax.servlet.Filter;
import jakarta.servlet.FilterChain; import javax.servlet.FilterChain;
import jakarta.servlet.FilterConfig; import javax.servlet.FilterConfig;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;

View file

@ -29,9 +29,9 @@ import org.keycloak.adapters.spi.KeycloakAccount;
import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper;
import org.keycloak.common.util.DelegatingSerializationFilter; import org.keycloak.common.util.DelegatingSerializationFilter;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.io.IOException; import java.io.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;

View file

@ -20,8 +20,8 @@ package org.keycloak.adapters.servlet;
import org.keycloak.KeycloakSecurityContext; import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.OIDCHttpFacade; import org.keycloak.adapters.OIDCHttpFacade;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -55,8 +55,8 @@
<artifactId>keycloak-policy-enforcer</artifactId> <artifactId>keycloak-policy-enforcer</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_4.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -21,7 +21,7 @@ import org.apache.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.security.web.util.matcher.RequestMatcher; 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 * {@link RequestMatcher} that determines if a given request is an API request or an

View file

@ -19,9 +19,9 @@ package org.keycloak.adapters.springsecurity.authentication;
import java.io.IOException; import java.io.IOException;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.http.HttpHeaders; import org.apache.http.HttpHeaders;
import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterDeploymentContext;

View file

@ -20,9 +20,9 @@ package org.keycloak.adapters.springsecurity.authentication;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationFailureHandler;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
/** /**

View file

@ -18,9 +18,9 @@
package org.keycloak.adapters.springsecurity.authentication; package org.keycloak.adapters.springsecurity.authentication;
import java.io.IOException; import java.io.IOException;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;

View file

@ -17,8 +17,8 @@
package org.keycloak.adapters.springsecurity.authentication; package org.keycloak.adapters.springsecurity.authentication;
import jakarta.servlet.http.Cookie; import javax.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
/** /**
* Utility class that provides methods to create and retrieve cookies used for login redirects. * Utility class that provides methods to create and retrieve cookies used for login redirects.

View file

@ -31,8 +31,8 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutHandler; import org.springframework.security.web.authentication.logout.LogoutHandler;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* Logs the current user out of Keycloak. * Logs the current user out of Keycloak.

View file

@ -1,6 +1,6 @@
package org.keycloak.adapters.springsecurity.authentication; 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.AdapterTokenStore;
import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeployment;

View file

@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.Set; import java.util.Set;
/** /**

View file

@ -1,6 +1,6 @@
package org.keycloak.adapters.springsecurity.authentication; 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.AdapterTokenStore;
import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeployment;

View file

@ -27,8 +27,8 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import javax.security.cert.X509Certificate; import javax.security.cert.X509Certificate;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* Simple {@link org.keycloak.adapters.OIDCHttpFacade} wrapping an {@link HttpServletRequest} and {@link HttpServletResponse}. * Simple {@link org.keycloak.adapters.OIDCHttpFacade} wrapping an {@link HttpServletRequest} and {@link HttpServletResponse}.

View file

@ -23,7 +23,7 @@ import org.keycloak.adapters.spi.HttpFacade.Request;
import org.keycloak.adapters.spi.LogoutError; import org.keycloak.adapters.spi.LogoutError;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
@ -91,13 +91,13 @@ class WrappedHttpServletRequest implements Request {
@Override @Override
public Cookie getCookie(String cookieName) { public Cookie getCookie(String cookieName) {
jakarta.servlet.http.Cookie[] cookies = request.getCookies(); javax.servlet.http.Cookie[] cookies = request.getCookies();
if (cookies == null) { if (cookies == null) {
return null; return null;
} }
for (jakarta.servlet.http.Cookie cookie : request.getCookies()) { for (javax.servlet.http.Cookie cookie : request.getCookies()) {
if (cookie.getName().equals(cookieName)) { if (cookie.getName().equals(cookieName)) {
return new Cookie(cookie.getName(), cookie.getValue(), cookie.getVersion(), cookie.getDomain(), cookie.getPath()); return new Cookie(cookie.getName(), cookie.getValue(), cookie.getVersion(), cookie.getDomain(), cookie.getPath());
} }

View file

@ -21,8 +21,8 @@ import org.keycloak.adapters.spi.HttpFacade.Response;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import jakarta.servlet.http.Cookie; import javax.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.lang.reflect.Method; import java.lang.reflect.Method;

View file

@ -17,8 +17,8 @@
package org.keycloak.adapters.springsecurity.filter; package org.keycloak.adapters.springsecurity.filter;
import jakarta.servlet.http.Cookie; import javax.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.keycloak.constants.AdapterConstants; import org.keycloak.constants.AdapterConstants;
import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher;

View file

@ -18,12 +18,12 @@ package org.keycloak.adapters.springsecurity.filter;
import java.io.IOException; import java.io.IOException;
import jakarta.servlet.FilterChain; import javax.servlet.FilterChain;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakPrincipal;
import org.keycloak.KeycloakSecurityContext; import org.keycloak.KeycloakSecurityContext;

View file

@ -19,10 +19,10 @@ package org.keycloak.adapters.springsecurity.filter;
import java.io.IOException; import java.io.IOException;
import jakarta.servlet.FilterChain; import javax.servlet.FilterChain;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.keycloak.OAuth2Constants; import org.keycloak.OAuth2Constants;
import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterDeploymentContext;

View file

@ -21,7 +21,7 @@ import org.keycloak.constants.AdapterConstants;
import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;

View file

@ -31,12 +31,12 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.web.filter.GenericFilterBean; import org.springframework.web.filter.GenericFilterBean;
import jakarta.servlet.FilterChain; import javax.servlet.FilterChain;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
/** /**

View file

@ -18,12 +18,12 @@ package org.keycloak.adapters.springsecurity.filter;
import java.io.IOException; import java.io.IOException;
import jakarta.servlet.FilterChain; import javax.servlet.FilterChain;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakPrincipal;
import org.keycloak.KeycloakSecurityContext; import org.keycloak.KeycloakSecurityContext;

View file

@ -16,7 +16,7 @@
*/ */
package org.keycloak.adapters.springsecurity.filter; package org.keycloak.adapters.springsecurity.filter;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher;

View file

@ -19,7 +19,7 @@ package org.keycloak.adapters.springsecurity.management;
import java.util.List; import java.util.List;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.keycloak.adapters.spi.UserSessionManagement; import org.keycloak.adapters.spi.UserSessionManagement;
import org.slf4j.Logger; import org.slf4j.Logger;

View file

@ -17,7 +17,7 @@
package org.keycloak.adapters.springsecurity.management; package org.keycloak.adapters.springsecurity.management;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;

View file

@ -17,7 +17,7 @@
package org.keycloak.adapters.springsecurity.management; package org.keycloak.adapters.springsecurity.management;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.Collection; import java.util.Collection;
/** /**

View file

@ -17,11 +17,11 @@
package org.keycloak.adapters.springsecurity.token; 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.AdapterTokenStore;
import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeployment;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
/** /**
* Creates a per-request adapter token store. * Creates a per-request adapter token store.

View file

@ -22,8 +22,8 @@ import org.keycloak.adapters.KeycloakDeployment;
import org.keycloak.enums.TokenStore; import org.keycloak.enums.TokenStore;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* {@link AdapterTokenStoreFactory} that returns a new {@link SpringSecurityTokenStore} for each request. * {@link AdapterTokenStoreFactory} that returns a new {@link SpringSecurityTokenStore} for each request.

View file

@ -18,8 +18,8 @@
package org.keycloak.adapters.springsecurity.token; package org.keycloak.adapters.springsecurity.token;
import java.util.Set; import java.util.Set;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakPrincipal;
import org.keycloak.KeycloakSecurityContext; import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.AdapterUtils; import org.keycloak.adapters.AdapterUtils;

View file

@ -30,8 +30,8 @@ import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* Simple Spring {@link SecurityContext security context} aware {@link AdapterTokenStore adapter token store}. * Simple Spring {@link SecurityContext security context} aware {@link AdapterTokenStore adapter token store}.

View file

@ -22,7 +22,7 @@ import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import jakarta.servlet.http.Cookie; import javax.servlet.http.Cookie;
import java.util.List; import java.util.List;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

View file

@ -23,7 +23,7 @@ import org.junit.Test;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockHttpServletResponse; 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.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

View file

@ -44,9 +44,9 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationFailureHandler;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
import jakarta.servlet.FilterChain; import javax.servlet.FilterChain;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;

View file

@ -6,9 +6,9 @@ import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks; import static org.mockito.MockitoAnnotations.initMocks;
import jakarta.servlet.FilterChain; import javax.servlet.FilterChain;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

View file

@ -25,8 +25,8 @@ import org.keycloak.enums.TokenStore;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;

View file

@ -27,7 +27,7 @@ import org.keycloak.adapters.AdapterDeploymentContext;
import org.keycloak.adapters.AuthenticatedActionsHandler; import org.keycloak.adapters.AuthenticatedActionsHandler;
import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeployment;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import java.io.IOException; import java.io.IOException;
/** /**

View file

@ -37,9 +37,9 @@ import org.keycloak.adapters.spi.HttpFacade;
import org.keycloak.constants.AdapterConstants; import org.keycloak.constants.AdapterConstants;
import org.keycloak.enums.TokenStore; import org.keycloak.enums.TokenStore;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

View file

@ -28,7 +28,7 @@ import org.keycloak.adapters.OidcKeycloakAccount;
import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RefreshableKeycloakSecurityContext;
import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.RequestAuthenticator;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.security.Principal; import java.security.Principal;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;

View file

@ -20,7 +20,7 @@ package org.keycloak.adapters.tomcat;
import org.keycloak.KeycloakSecurityContext; import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.OIDCHttpFacade; import org.keycloak.adapters.OIDCHttpFacade;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -29,7 +29,7 @@ import org.keycloak.adapters.AdapterTokenStore;
import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeployment;
import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.HttpFacade;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.security.Principal; import java.security.Principal;

View file

@ -21,7 +21,7 @@ import org.apache.catalina.connector.Request;
import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.AdapterTokenStore;
import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeployment;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -84,8 +84,8 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

View file

@ -39,7 +39,7 @@ import org.keycloak.adapters.KeycloakDeploymentBuilder;
import org.keycloak.adapters.NodesRegistrationManagement; import org.keycloak.adapters.NodesRegistrationManagement;
import org.keycloak.constants.AdapterConstants; import org.keycloak.constants.AdapterConstants;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

View file

@ -30,10 +30,10 @@ import org.keycloak.adapters.RequestAuthenticator;
import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.HttpFacade;
import org.keycloak.enums.TokenStore; import org.keycloak.enums.TokenStore;
import jakarta.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import java.io.IOException; import java.io.IOException;
/** /**

View file

@ -27,8 +27,8 @@ import org.keycloak.adapters.OAuthRequestAuthenticator;
import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RefreshableKeycloakSecurityContext;
import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.HttpFacade;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -28,8 +28,8 @@ import org.keycloak.adapters.OidcKeycloakAccount;
import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RefreshableKeycloakSecurityContext;
import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.RequestAuthenticator;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* Per-request object. Storage of tokens in servlet HTTP session. * Per-request object. Storage of tokens in servlet HTTP session.

View file

@ -19,8 +19,8 @@ package org.keycloak.adapters.undertow;
import org.keycloak.adapters.NodesRegistrationManagement; import org.keycloak.adapters.NodesRegistrationManagement;
import jakarta.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
/** /**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

View file

@ -85,8 +85,8 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -43,10 +43,10 @@ import org.wildfly.security.http.Scope;
import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.CallbackHandler;
import javax.security.cert.X509Certificate; import javax.security.cert.X509Certificate;
import jakarta.servlet.ServletInputStream; import javax.servlet.ServletInputStream;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;

View file

@ -24,9 +24,9 @@ import org.keycloak.adapters.KeycloakDeployment;
import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.KeycloakDeploymentBuilder;
import org.keycloak.constants.AdapterConstants; import org.keycloak.constants.AdapterConstants;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import jakarta.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

View file

@ -16,8 +16,8 @@
*/ */
package org.keycloak.adapters.elytron; package org.keycloak.adapters.elytron;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import io.undertow.server.HttpHandler; import io.undertow.server.HttpHandler;
import io.undertow.servlet.ServletExtension; import io.undertow.servlet.ServletExtension;

View file

@ -36,13 +36,13 @@ import org.keycloak.saml.processing.web.util.PostBindingUtil;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import jakarta.xml.soap.MessageFactory; import javax.xml.soap.MessageFactory;
import jakarta.xml.soap.SOAPBody; import javax.xml.soap.SOAPBody;
import jakarta.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPEnvelope;
import jakarta.xml.soap.SOAPException; import javax.xml.soap.SOAPException;
import jakarta.xml.soap.SOAPHeader; import javax.xml.soap.SOAPHeader;
import jakarta.xml.soap.SOAPHeaderElement; import javax.xml.soap.SOAPHeaderElement;
import jakarta.xml.soap.SOAPMessage; import javax.xml.soap.SOAPMessage;
/** /**
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a> * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>

View file

@ -53,12 +53,12 @@ import org.keycloak.adapters.spi.SessionIdMapper;
import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ParsingException;
import javax.security.auth.Subject; import javax.security.auth.Subject;
import jakarta.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

View file

@ -29,7 +29,7 @@ import org.keycloak.adapters.spi.HttpFacade;
import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper;
import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.KeycloakUriBuilder;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

View file

@ -24,7 +24,7 @@ import org.keycloak.adapters.spi.AdapterSessionStore;
import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.HttpFacade;
import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -21,7 +21,7 @@ import org.eclipse.jetty.server.session.Session;
import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.server.session.SessionHandler;
import org.keycloak.adapters.jetty.spi.JettySessionManager; import org.keycloak.adapters.jetty.spi.JettySessionManager;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -24,7 +24,7 @@ import org.keycloak.adapters.jetty.spi.JettyHttpFacade;
import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.spi.AdapterSessionStore;
import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.MultivaluedHashMap;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -25,7 +25,7 @@ import org.keycloak.adapters.saml.SamlDeployment;
import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.spi.AdapterSessionStore;
import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.HttpFacade;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

View file

@ -33,9 +33,9 @@
<modules> <modules>
<module>core-public</module> <module>core-public</module>
<module>core</module> <module>core</module>
<!--<module>jetty</module>--> <module>jetty</module>
<module>undertow</module> <module>undertow</module>
<!-- <module>tomcat</module>--> <module>tomcat</module>
<module>wildfly</module> <module>wildfly</module>
<module>servlet-filter</module> <module>servlet-filter</module>
<module>jakarta-servlet-filter</module> <module>jakarta-servlet-filter</module>

View file

@ -68,8 +68,9 @@
<artifactId>keycloak-crypto-default</artifactId> <artifactId>keycloak-crypto-default</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

View file

@ -28,9 +28,9 @@ import org.keycloak.adapters.spi.KeycloakAccount;
import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper;
import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.KeycloakUriBuilder;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

View file

@ -37,16 +37,16 @@ import org.keycloak.adapters.spi.InMemorySessionIdMapper;
import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper;
import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ParsingException;
import jakarta.servlet.Filter; import javax.servlet.Filter;
import jakarta.servlet.FilterChain; import javax.servlet.FilterChain;
import jakarta.servlet.FilterConfig; import javax.servlet.FilterConfig;
import jakarta.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;

View file

@ -34,10 +34,10 @@ import org.keycloak.adapters.tomcat.CatalinaUserSessionManagement;
import org.keycloak.adapters.tomcat.PrincipalFactory; import org.keycloak.adapters.tomcat.PrincipalFactory;
import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ParsingException;
import jakarta.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

View file

@ -29,7 +29,7 @@ import org.keycloak.adapters.tomcat.CatalinaUserSessionManagement;
import org.keycloak.adapters.tomcat.PrincipalFactory; import org.keycloak.adapters.tomcat.PrincipalFactory;
import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.KeycloakUriBuilder;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.io.IOException; import java.io.IOException;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;

View file

@ -19,7 +19,7 @@ package org.keycloak.adapters.saml;
import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper;
import java.util.Objects; import java.util.Objects;
import jakarta.servlet.http.*; import javax.servlet.http.*;
/** /**
* *

View file

@ -28,7 +28,7 @@ import org.keycloak.adapters.saml.SamlSessionStore;
import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.HttpFacade;
import org.keycloak.adapters.tomcat.GenericPrincipalFactory; import org.keycloak.adapters.tomcat.GenericPrincipalFactory;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.security.Principal; import java.security.Principal;

View file

@ -67,8 +67,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -41,7 +41,7 @@ import org.keycloak.adapters.undertow.ChangeSessionId;
import org.keycloak.adapters.undertow.UndertowUserSessionManagement; import org.keycloak.adapters.undertow.UndertowUserSessionManagement;
import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ParsingException;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

View file

@ -31,10 +31,10 @@ import org.keycloak.adapters.undertow.UndertowHttpFacade;
import org.keycloak.adapters.undertow.UndertowUserSessionManagement; import org.keycloak.adapters.undertow.UndertowUserSessionManagement;
import io.undertow.servlet.api.DeploymentInfo; import io.undertow.servlet.api.DeploymentInfo;
import jakarta.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import jakarta.servlet.ServletException; import javax.servlet.ServletException;
import jakarta.servlet.ServletRequest; import javax.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import javax.servlet.ServletResponse;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.*; import java.lang.reflect.*;
import java.util.Map; import java.util.Map;

View file

@ -38,9 +38,9 @@ import org.keycloak.adapters.undertow.UndertowUserSessionManagement;
import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.KeycloakUriBuilder;
import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil;
import jakarta.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeConstants;
import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.XMLGregorianCalendar;
import java.security.Principal; import java.security.Principal;

View file

@ -67,8 +67,9 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wildfly.security</groupId> <groupId>org.wildfly.security</groupId>

View file

@ -20,11 +20,11 @@ import org.keycloak.adapters.saml.SamlSession;
import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper;
import java.util.Objects; import java.util.Objects;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionAttributeListener; import javax.servlet.http.HttpSessionAttributeListener;
import jakarta.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingEvent;
import jakarta.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionEvent;
import jakarta.servlet.http.HttpSessionListener; import javax.servlet.http.HttpSessionListener;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
/** /**

View file

@ -22,9 +22,9 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.InputStream; import java.io.InputStream;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import jakarta.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.keycloak.adapters.saml.AdapterConstants; import org.keycloak.adapters.saml.AdapterConstants;

View file

@ -22,7 +22,7 @@ import java.util.Map;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.CallbackHandler;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.keycloak.adapters.saml.SamlAuthenticator; import org.keycloak.adapters.saml.SamlAuthenticator;

View file

@ -23,7 +23,7 @@ import org.keycloak.adapters.spi.SessionIdMapperUpdater;
import java.util.*; import java.util.*;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.naming.NamingException; import javax.naming.NamingException;
import jakarta.servlet.ServletContext; import javax.servlet.ServletContext;
import org.infinispan.Cache; import org.infinispan.Cache;
import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.CacheMode;
import org.infinispan.configuration.cache.Configuration; import org.infinispan.configuration.cache.Configuration;

View file

@ -65,8 +65,8 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -24,7 +24,7 @@ import org.keycloak.common.util.MultivaluedHashMap;
import org.keycloak.common.util.UriUtils; import org.keycloak.common.util.UriUtils;
import javax.security.cert.X509Certificate; import javax.security.cert.X509Certificate;
import jakarta.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
@ -109,8 +109,8 @@ public class JettyHttpFacade implements HttpFacade {
@Override @Override
public Cookie getCookie(String cookieName) { public Cookie getCookie(String cookieName) {
if (request.getCookies() == null) return null; if (request.getCookies() == null) return null;
jakarta.servlet.http.Cookie cookie = null; javax.servlet.http.Cookie cookie = null;
for (jakarta.servlet.http.Cookie c : request.getCookies()) { for (javax.servlet.http.Cookie c : request.getCookies()) {
if (c.getName().equals(cookieName)) { if (c.getName().equals(cookieName)) {
cookie = c; cookie = c;
break; break;
@ -210,7 +210,7 @@ public class JettyHttpFacade implements HttpFacade {
@Override @Override
public void setCookie(String name, String value, String path, String domain, int maxAge, boolean secure, boolean httpOnly) { 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 (domain != null) cookie.setDomain(domain);
if (path != null) cookie.setPath(path); if (path != null) cookie.setPath(path);
if (secure) cookie.setSecure(true); if (secure) cookie.setSecure(true);

View file

@ -17,7 +17,7 @@
package org.keycloak.adapters.jetty.spi; package org.keycloak.adapters.jetty.spi;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
/** /**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

View file

@ -20,7 +20,7 @@ package org.keycloak.adapters.jetty.spi;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.keycloak.adapters.spi.UserSessionManagement; import org.keycloak.adapters.spi.UserSessionManagement;
import jakarta.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.List; import java.util.List;
/** /**

View file

@ -32,11 +32,11 @@
<modules> <modules>
<module>adapter-spi</module> <module>adapter-spi</module>
<!--<module>tomcat-adapter-spi</module>--> <module>tomcat-adapter-spi</module>
<module>undertow-adapter-spi</module> <module>undertow-adapter-spi</module>
<module>servlet-adapter-spi</module> <module>servlet-adapter-spi</module>
<module>jakarta-servlet-adapter-spi</module> <module>jakarta-servlet-adapter-spi</module>
<module>jboss-adapter-core</module> <module>jboss-adapter-core</module>
<!--<module>jetty-adapter-spi</module>--> <module>jetty-adapter-spi</module>
</modules> </modules>
</project> </project>

View file

@ -54,8 +54,8 @@
<artifactId>keycloak-common</artifactId> <artifactId>keycloak-common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId> <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

Some files were not shown because too many files have changed in this diff Show more