diff --git a/pom.xml b/pom.xml index 8bdab3b..0819bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -20,13 +20,13 @@ de.acosix.alfresco.maven - de.acosix.alfresco.maven.project.parent-6.0.7 - 1.4.1 + de.acosix.alfresco.maven.project.parent-23.1.0 + 1.5.0 de.acosix.alfresco.keycloak de.acosix.alfresco.keycloak.parent - 1.1.0-rc8-SNAPSHOT + 1.2.0-rc2-SNAPSHOT pom Acosix Alfresco Keycloak - Parent @@ -61,6 +61,15 @@ twitter.com/ReluctantBird83 + + blong + Brian Long + brian@inteligr8.com + Inteligr8 LLC + + twitter.com/brian_m_long + + @@ -68,18 +77,16 @@ acosix.keycloak acosix-keycloak - 1.8 - 1.8 + 3.13.0 + 3.6.0 - 3.2.4 - - 16.1.0 + 22.0.3 3.15.1.Final 4.5.13 - 4.4.14 + 4.4.16 - 1.2.5 + 1.4.3 1.1.0.0 @@ -132,13 +139,13 @@ org.keycloak - keycloak-servlet-adapter-spi + keycloak-jakarta-servlet-adapter-spi ${keycloak.version} org.keycloak - keycloak-servlet-filter-adapter + keycloak-jakarta-servlet-filter-adapter ${keycloak.version} @@ -150,7 +157,7 @@ org.keycloak - keycloak-admin-client + keycloak-admin-client-jakarta ${keycloak.version} @@ -298,6 +305,14 @@ + + maven-source-plugin + ${maven.source.version} + + + maven-compiler-plugin + ${maven.compiler.version} + maven-shade-plugin ${maven.shade.version} diff --git a/repository/pom.xml b/repository/pom.xml index 9d253e8..dc1b868 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -21,7 +21,7 @@ de.acosix.alfresco.keycloak de.acosix.alfresco.keycloak.parent - 1.1.0-rc8-SNAPSHOT + 1.2.0-rc2-SNAPSHOT de.acosix.alfresco.keycloak.repo @@ -44,12 +44,12 @@ - + - javax.servlet - javax.servlet-api - - + jakarta.servlet + jakarta.servlet-api + + org.keycloak keycloak-adapter-core @@ -71,12 +71,17 @@ org.jboss.resteasy * + + + org.apache.httpcomponents + httpclient + org.keycloak - keycloak-servlet-adapter-spi + keycloak-jakarta-servlet-adapter-spi @@ -105,7 +110,7 @@ org.keycloak - keycloak-servlet-filter-adapter + keycloak-jakarta-servlet-filter-adapter @@ -233,7 +238,8 @@ shade - true + + false true false diff --git a/repository/src/main/config/log4j2.properties b/repository/src/main/config/log4j2.properties new file mode 100644 index 0000000..1501180 --- /dev/null +++ b/repository/src/main/config/log4j2.properties @@ -0,0 +1,12 @@ + +logger.acosix-alfresco-keycloak.name=${project.artifactId} +logger.acosix-alfresco-keycloak.level=INFO + +logger.acosix-alfresco-keycloak-deps.name=${project.artifactId}.deps +logger.acosix-alfresco-keycloak-deps.level=ERROR + +logger.acosix-alfresco-keycloak-deps-keycloak.name=${project.artifactId}.deps.keycloak +logger.acosix-alfresco-keycloak-deps-keycloak.level=ERROR + +logger.acosix-alfresco-keycloak-deps-jboss.name=${project.artifactId}.deps.jboss +logger.acosix-alfresco-keycloak-deps-jboss.level=ERROR diff --git a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakAuthenticationFilter.java b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakAuthenticationFilter.java index 9ff5b36..4ecead3 100644 --- a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakAuthenticationFilter.java +++ b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakAuthenticationFilter.java @@ -21,16 +21,16 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.repo.SessionUser; import org.alfresco.repo.cache.SimpleCache; diff --git a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakRemoteUserMapper.java b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakRemoteUserMapper.java index a4f525d..24c75cf 100644 --- a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakRemoteUserMapper.java +++ b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakRemoteUserMapper.java @@ -17,8 +17,8 @@ package de.acosix.alfresco.keycloak.repo.authentication; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.alfresco.repo.management.subsystems.ActivateableBean; import org.alfresco.repo.security.authentication.AuthenticationException; diff --git a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakWebScriptCookieAuthenticationFilter.java b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakWebScriptCookieAuthenticationFilter.java index ce859dd..28dd529 100644 --- a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakWebScriptCookieAuthenticationFilter.java +++ b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakWebScriptCookieAuthenticationFilter.java @@ -17,13 +17,13 @@ package de.acosix.alfresco.keycloak.repo.authentication; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.alfresco.repo.SessionUser; import org.alfresco.repo.web.scripts.bean.LoginPost; diff --git a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakWebScriptSSOAuthenticationFilter.java b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakWebScriptSSOAuthenticationFilter.java index a4ace4b..8fa48ee 100644 --- a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakWebScriptSSOAuthenticationFilter.java +++ b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/KeycloakWebScriptSSOAuthenticationFilter.java @@ -17,12 +17,12 @@ package de.acosix.alfresco.keycloak.repo.authentication; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.repo.management.subsystems.ActivateableBean; import org.alfresco.repo.web.filter.beans.DependencyInjectedFilter; diff --git a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/ResponseHeaderCookieCaptureServletHttpFacade.java b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/ResponseHeaderCookieCaptureServletHttpFacade.java index 8b1828a..31d955a 100644 --- a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/ResponseHeaderCookieCaptureServletHttpFacade.java +++ b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/authentication/ResponseHeaderCookieCaptureServletHttpFacade.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.util.Pair; import org.keycloak.adapters.servlet.ServletHttpFacade; @@ -39,7 +39,7 @@ import org.keycloak.adapters.spi.HttpFacade; public class ResponseHeaderCookieCaptureServletHttpFacade extends ServletHttpFacade { - protected final Map, javax.servlet.http.Cookie> cookies = new HashMap<>(); + protected final Map, jakarta.servlet.http.Cookie> cookies = new HashMap<>(); protected final Map> headers = new HashMap<>(); @@ -71,7 +71,7 @@ public class ResponseHeaderCookieCaptureServletHttpFacade extends ServletHttpFac /** * @return the cookies */ - public List getCookies() + public List getCookies() { return new ArrayList<>(this.cookies.values()); } @@ -157,7 +157,7 @@ public class ResponseHeaderCookieCaptureServletHttpFacade extends ServletHttpFac public void setCookie(final String name, final String value, final String path, final String domain, final int maxAge, final boolean secure, final boolean httpOnly) { - final javax.servlet.http.Cookie cookie = new javax.servlet.http.Cookie(name, value); + final jakarta.servlet.http.Cookie cookie = new jakarta.servlet.http.Cookie(name, value); cookie.setPath(path); if (domain != null) { diff --git a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/token/AccessTokenClient.java b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/token/AccessTokenClient.java index 80e7df9..a06cc17 100644 --- a/repository/src/main/java/de/acosix/alfresco/keycloak/repo/token/AccessTokenClient.java +++ b/repository/src/main/java/de/acosix/alfresco/keycloak/repo/token/AccessTokenClient.java @@ -6,7 +6,10 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.function.Consumer; import org.alfresco.util.ParameterCheck; @@ -22,13 +25,13 @@ import org.keycloak.TokenVerifier; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.ServerRequest; import org.keycloak.adapters.ServerRequest.HttpFailure; -import org.keycloak.adapters.authentication.ClientCredentialsProviderUtils; import org.keycloak.adapters.rotation.AdapterTokenVerifier; import org.keycloak.adapters.rotation.AdapterTokenVerifier.VerifiedTokens; import org.keycloak.common.VerificationException; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.Time; import org.keycloak.constants.ServiceUrlConstants; +import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProviderUtils; import org.keycloak.representations.AccessToken; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.util.JsonSerialization; @@ -284,8 +287,16 @@ public class AccessTokenClient final List formParams = new ArrayList<>(); postParamProvider.accept(formParams); + + Map formMap = new HashMap<>(); + for (NameValuePair pair : formParams) + formMap.put(pair.getName(), pair.getValue()); - ClientCredentialsProviderUtils.setClientCredentials(this.deployment, post, formParams); + ClientCredentialsProviderUtils.setClientCredentials( + this.deployment.getAdapterConfig(), + this.deployment.getClientAuthenticator(), + Collections.emptyMap(), + formMap); final UrlEncodedFormEntity form = new UrlEncodedFormEntity(formParams, "UTF-8"); post.setEntity(form); diff --git a/share/pom.xml b/share/pom.xml index 5da6c5b..8f36ede 100644 --- a/share/pom.xml +++ b/share/pom.xml @@ -21,7 +21,7 @@ de.acosix.alfresco.keycloak de.acosix.alfresco.keycloak.parent - 1.1.0-rc8-SNAPSHOT + 1.2.0-rc2-SNAPSHOT de.acosix.alfresco.keycloak.share @@ -61,8 +61,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api @@ -83,7 +83,7 @@ org.keycloak - keycloak-servlet-adapter-spi + keycloak-jakarta-servlet-adapter-spi @@ -104,7 +104,7 @@ org.keycloak - keycloak-servlet-filter-adapter + keycloak-jakarta-servlet-filter-adapter @@ -284,7 +284,8 @@ shade - true + + false true false diff --git a/share/src/main/config/log4j2.properties b/share/src/main/config/log4j2.properties new file mode 100644 index 0000000..f01f616 --- /dev/null +++ b/share/src/main/config/log4j2.properties @@ -0,0 +1,15 @@ + +logger.acosix-alfresco-keycloak.name=${project.artifactId} +logger.acosix-alfresco-keycloak.level=INFO + +logger.acosix-alfresco-keycloak-deps.name=${project.artifactId}.deps +logger.acosix-alfresco-keycloak-deps.level=ERROR + +logger.acosix-alfresco-keycloak-deps-keycloak.name=${project.artifactId}.deps.keycloak +logger.acosix-alfresco-keycloak-deps-keycloak.level=ERROR + +logger.acosix-alfresco-keycloak-deps-jackson.name=${project.artifactId}.deps.jackson +logger.acosix-alfresco-keycloak-deps-jackson.level=ERROR + +logger.acosix-alfresco-keycloak-deps-jboss.name=${project.artifactId}.deps.jboss +logger.acosix-alfresco-keycloak-deps-jboss.level=ERROR diff --git a/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareAlfrescoAuthenticator.java b/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareAlfrescoAuthenticator.java index 3dec055..fb4359c 100644 --- a/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareAlfrescoAuthenticator.java +++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareAlfrescoAuthenticator.java @@ -15,7 +15,7 @@ */ package de.acosix.alfresco.keycloak.share.remote; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.spi.KeycloakAccount; diff --git a/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareSlingshotAlfrescoConnector.java b/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareSlingshotAlfrescoConnector.java index 86f6b0f..ee43cf8 100644 --- a/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareSlingshotAlfrescoConnector.java +++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/remote/AccessTokenAwareSlingshotAlfrescoConnector.java @@ -17,7 +17,7 @@ package de.acosix.alfresco.keycloak.share.remote; import java.util.Collections; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.alfresco.web.site.servlet.SlingshotAlfrescoConnector; import org.keycloak.KeycloakSecurityContext; diff --git a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/KeycloakAuthenticationFilter.java b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/KeycloakAuthenticationFilter.java index 877d12e..7dbde98 100644 --- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/KeycloakAuthenticationFilter.java +++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/KeycloakAuthenticationFilter.java @@ -26,23 +26,25 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.function.BiFunction; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.util.EqualsHelper; @@ -73,7 +75,6 @@ import org.keycloak.adapters.OAuthRequestAuthenticator; import org.keycloak.adapters.OIDCAuthenticationError; import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.PreAuthActionsHandler; -import org.keycloak.adapters.authentication.ClientCredentialsProviderUtils; import org.keycloak.adapters.rotation.AdapterTokenVerifier; import org.keycloak.adapters.rotation.AdapterTokenVerifier.VerifiedTokens; import org.keycloak.adapters.servlet.FilterRequestAuthenticator; @@ -88,6 +89,7 @@ import org.keycloak.common.VerificationException; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.Time; import org.keycloak.constants.ServiceUrlConstants; +import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProviderUtils; import org.keycloak.representations.AccessToken; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.util.JsonSerialization; @@ -1748,8 +1750,16 @@ public class KeycloakAuthenticationFilter implements DependencyInjectedFilter, I throw new IllegalStateException( "Either an active security context or access token should be present in the session, or previous validations have caught their non-existence and prevented this operation form being called"); } + + Map formMap = new HashMap<>(); + for (NameValuePair formParam : formParams) + formMap.put(formParam.getName(), formParam.getValue()); - ClientCredentialsProviderUtils.setClientCredentials(this.keycloakDeployment, post, formParams); + ClientCredentialsProviderUtils.setClientCredentials( + this.keycloakDeployment.getAdapterConfig(), + this.keycloakDeployment.getClientAuthenticator(), + Collections.emptyMap(), + formMap); final UrlEncodedFormEntity form = new UrlEncodedFormEntity(formParams, "UTF-8"); post.setEntity(form); diff --git a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/PopulatingRequestContextInterceptor.java b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/PopulatingRequestContextInterceptor.java index 6fd2637..471a3c4 100644 --- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/PopulatingRequestContextInterceptor.java +++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/PopulatingRequestContextInterceptor.java @@ -15,7 +15,7 @@ */ package de.acosix.alfresco.keycloak.share.web; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.extensions.surf.RequestContext; import org.springframework.extensions.surf.RequestContextUtil; @@ -27,7 +27,7 @@ import org.springframework.web.context.request.WebRequest; /** * This specialisation of the request context interceptor exists only to ensure that a newly created request context is properly - * {@link RequestContextUtil#populateRequestContext(org.springframework.extensions.surf.RequestContext, javax.servlet.http.HttpServletRequest) + * {@link RequestContextUtil#populateRequestContext(org.springframework.extensions.surf.RequestContext, jakarta.servlet.http.HttpServletRequest) * populated} as to ensure that somewhat important data, such as the user object, is properly initialised. * * @author Axel Faust diff --git a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/ResponseHeaderCookieCaptureServletHttpFacade.java b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/ResponseHeaderCookieCaptureServletHttpFacade.java index 2c7d637..73fc943 100644 --- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/ResponseHeaderCookieCaptureServletHttpFacade.java +++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/ResponseHeaderCookieCaptureServletHttpFacade.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.alfresco.util.Pair; import org.keycloak.adapters.servlet.ServletHttpFacade; @@ -39,7 +39,7 @@ import org.keycloak.adapters.spi.HttpFacade; public class ResponseHeaderCookieCaptureServletHttpFacade extends ServletHttpFacade { - protected final Map, javax.servlet.http.Cookie> cookies = new HashMap<>(); + protected final Map, jakarta.servlet.http.Cookie> cookies = new HashMap<>(); protected final Map> headers = new HashMap<>(); @@ -67,7 +67,7 @@ public class ResponseHeaderCookieCaptureServletHttpFacade extends ServletHttpFac /** * @return the cookies */ - public List getCookies() + public List getCookies() { return new ArrayList<>(this.cookies.values()); } @@ -137,7 +137,7 @@ public class ResponseHeaderCookieCaptureServletHttpFacade extends ServletHttpFac public void setCookie(final String name, final String value, final String path, final String domain, final int maxAge, final boolean secure, final boolean httpOnly) { - final javax.servlet.http.Cookie cookie = new javax.servlet.http.Cookie(name, value); + final jakarta.servlet.http.Cookie cookie = new jakarta.servlet.http.Cookie(name, value); cookie.setPath(path); if (domain != null) { diff --git a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserGroupsLoadFilter.java b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserGroupsLoadFilter.java index 200e305..6b0f826 100644 --- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserGroupsLoadFilter.java +++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserGroupsLoadFilter.java @@ -18,13 +18,13 @@ package de.acosix.alfresco.keycloak.share.web; import java.io.IOException; import java.util.Date; -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.alfresco.util.PropertyCheck; import org.alfresco.web.site.SlingshotUserFactory; diff --git a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserNameCorrectingSlingshotLoginController.java b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserNameCorrectingSlingshotLoginController.java index 180620d..fe7b150 100644 --- a/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserNameCorrectingSlingshotLoginController.java +++ b/share/src/main/java/de/acosix/alfresco/keycloak/share/web/UserNameCorrectingSlingshotLoginController.java @@ -18,10 +18,10 @@ package de.acosix.alfresco.keycloak.share.web; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.alfresco.util.PropertyCheck; import org.alfresco.web.site.servlet.SlingshotLoginController;