diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java index cc372e87d2980dd0f3b2d5a266214880150fc7d0..3ca82d9e66a7e029be9f94a278c236699c6a723f 100644 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java +++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java @@ -20,7 +20,7 @@ package org.maxkey.authn.support.basic; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.RealmAuthenticationProvider; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.util.AuthorizationHeaderUtils; import org.slf4j.Logger; @@ -39,7 +39,7 @@ public class BasicEntryPoint extends HandlerInterceptorAdapter { @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; public BasicEntryPoint() { diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java index 3e01c0208edd46eea201f5462315e7d9e3884bb4..af6d06f1e22602011b245cb2870c8c937bb738de 100644 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java +++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java @@ -20,7 +20,7 @@ package org.maxkey.authn.support.httpheader; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.maxkey.authn.RealmAuthenticationProvider; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.constants.ConstantsLoginType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ public class HttpHeaderEntryPoint extends HandlerInterceptorAdapter { @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; String []skipRequestURI={ "/oauth/v20/token", diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java index 976e35990382ffb3094c4da57008978fc32600e2..ce0018d63aedcd1c56a84afda502ed9e82ce10ce 100644 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java +++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/kerberos/RemoteKerberosService.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import org.joda.time.DateTime; -import org.maxkey.authn.RealmAuthenticationProvider; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.util.DateUtils; @@ -35,7 +35,7 @@ public class RemoteKerberosService implements KerberosService{ private static Logger _logger = LoggerFactory.getLogger(RemoteKerberosService.class); List kerberosProxys; - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; public boolean login(String kerberosTokenString,String kerberosUserDomain){ _logger.debug("encoder Kerberos Token "+kerberosTokenString); diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java index 8084afb1a744bfc1fc3ca3ba5dc4312258b15e5f..57eff2364d0dd793ef98cc3b9b076475bfa59841 100644 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java +++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java @@ -20,7 +20,7 @@ */ package org.maxkey.authn.support.socialsignon; -import org.maxkey.authn.RealmAuthenticationProvider; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.authn.support.socialsignon.service.SocialsAssociateService; @@ -76,7 +76,7 @@ public class AbstractSocialSignOnEndpoint { @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; protected AuthRequest buildAuthRequest(String provider){ diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java index 7820341fc26ff1ba616fceb7857641c4983bb0fe..ae2c11a7277d3c4ffc25c4cb5ae937713a2b3ce4 100644 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java +++ b/maxkey-authentications/src/main/java/org/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java @@ -19,7 +19,7 @@ package org.maxkey.authn.support.wsfederation; import javax.servlet.http.HttpServletRequest; -import org.maxkey.authn.RealmAuthenticationProvider; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.util.StringUtils; import org.opensaml.saml1.core.impl.AssertionImpl; @@ -36,7 +36,7 @@ public class WsFederationServiceImpl implements WsFederationService{ @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; public boolean login(String wsFederationWA,String wsFederationWResult,HttpServletRequest request){ // it's an authentication diff --git a/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java b/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java index 62f020f61cd83d77b79d6e800e103b041cea24c0..2604ba11a7623b0875ac355179f2297dd3914990 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java @@ -64,7 +64,16 @@ public abstract class AbstractAuthenticationProvider { protected abstract String getProviderName(); protected abstract Authentication doInternalAuthenticate(Authentication authentication); + + public abstract Authentication basicAuthenticate(Authentication authentication) ; + public abstract Authentication trustAuthentication( + String username, + String type, + String provider, + String code, + String message); + @SuppressWarnings("rawtypes") public boolean supports(Class authentication) { return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication)); diff --git a/maxkey-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java b/maxkey-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java index cd1e5cc6d2b00bbccd09e7e36b5eca93f14e7d69..ca66ae8e66c45628fa008eb24830bd8984d391fa 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java @@ -105,6 +105,7 @@ public class RealmAuthenticationProvider extends AbstractAuthenticationProvider return usernamePasswordAuthenticationToken; } + @Override public Authentication basicAuthenticate(Authentication authentication) { BasicAuthentication basicAuth = (BasicAuthentication) authentication; UserInfo loadeduserInfo = loadUserInfo(basicAuth.getUsername(), ""); @@ -142,6 +143,7 @@ public class RealmAuthenticationProvider extends AbstractAuthenticationProvider * @param message String * @return boolean */ + @Override public Authentication trustAuthentication(String username, String type, String provider, diff --git a/maxkey-core/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java b/maxkey-core/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java index 2c83c663df28a9a83e940d6e8c3d662a8782d404..4f8638d5d9e92bb348f1a5ac273f564e531d6927 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/support/jwt/JwtLoginService.java @@ -30,8 +30,7 @@ import java.util.Date; import java.util.UUID; import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; -import org.maxkey.authn.RealmAuthenticationProvider; -import org.maxkey.configuration.ApplicationConfig; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.configuration.oidc.OIDCProviderMetadataDetails; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; @@ -43,14 +42,23 @@ import org.slf4j.LoggerFactory; public class JwtLoginService { private static final Logger _logger = LoggerFactory.getLogger(JwtLoginService.class); - protected ApplicationConfig applicationConfig; OIDCProviderMetadataDetails jwtProviderMetadata; DefaultJwtSigningAndValidationService jwtSignerValidationService; - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; + + public JwtLoginService(AbstractAuthenticationProvider authenticationProvider, + OIDCProviderMetadataDetails jwtProviderMetadata, + DefaultJwtSigningAndValidationService jwtSignerValidationService + ) { + this.authenticationProvider = authenticationProvider; + this.jwtProviderMetadata = jwtProviderMetadata; + this.jwtSignerValidationService = jwtSignerValidationService; + + } public boolean login(String jwt, HttpServletResponse response) { _logger.debug("jwt : " + jwt); @@ -188,9 +196,6 @@ public class JwtLoginService { return loginResult; } - public void setApplicationConfig(ApplicationConfig applicationConfig) { - this.applicationConfig = applicationConfig; - } public void setJwtProviderMetadata(OIDCProviderMetadataDetails jwtProviderMetadata) { this.jwtProviderMetadata = jwtProviderMetadata; @@ -200,7 +205,7 @@ public class JwtLoginService { this.jwtSignerValidationService = jwtSignerValidationService; } - public void setAuthenticationProvider(RealmAuthenticationProvider authenticationProvider) { + public void setAuthenticationProvider(AbstractAuthenticationProvider authenticationProvider) { this.authenticationProvider = authenticationProvider; } diff --git a/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java b/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java index 03c0e94c161be9628ab96390666d05e9f694427e..7911b4064115714bb8c15c506fa0de827ff9cd5e 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java @@ -23,7 +23,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.joda.time.DateTime; -import org.maxkey.authn.RealmAuthenticationProvider; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.configuration.ApplicationConfig; import org.maxkey.constants.ConstantsLoginType; import org.maxkey.constants.ConstantsTimeInterval; @@ -50,7 +50,7 @@ public abstract class AbstractRemeberMeService { @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; // follow function is for persist public abstract void save(RemeberMe remeberMe); diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java index 275e9176d56db7d65648981ace627b47eecfc586..efaf5d0260c4bf8ae457c088b18f2a66dc968a00 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java @@ -23,6 +23,8 @@ import java.util.HashMap; import java.util.Map; import javax.sql.DataSource; + +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.RealmAuthenticationProvider; import org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; @@ -117,7 +119,7 @@ public class ApplicationAutoConfiguration implements InitializingBean { } @Bean(name = "authenticationProvider") - public RealmAuthenticationProvider authenticationProvider() { + public AbstractAuthenticationProvider authenticationProvider() { return new RealmAuthenticationProvider(); } diff --git a/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java b/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java index 4147f67d670d7c7384aa9b85fbb524461d798d3d..889e45492115f7b082c7bbd2f224ec2ebe5b0931 100644 --- a/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java @@ -23,7 +23,7 @@ import java.net.URI; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; -import org.maxkey.authn.RealmAuthenticationProvider; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.support.jwt.JwtLoginService; import org.maxkey.configuration.oidc.OIDCProviderMetadataDetails; import org.maxkey.constants.ConstantsProperties; @@ -127,11 +127,14 @@ public class JwtAuthnAutoConfiguration implements InitializingBean { public JwtLoginService jwtLoginService( DefaultJwtSigningAndValidationService jwtSignerValidationService, OIDCProviderMetadataDetails oidcProviderMetadata, - RealmAuthenticationProvider authenticationProvider) { - JwtLoginService jwtLoginService = new JwtLoginService(); - jwtLoginService.setJwtSignerValidationService(jwtSignerValidationService); - jwtLoginService.setJwtProviderMetadata(oidcProviderMetadata); - jwtLoginService.setAuthenticationProvider(authenticationProvider); + AbstractAuthenticationProvider authenticationProvider) { + + JwtLoginService jwtLoginService = new JwtLoginService( + authenticationProvider, + oidcProviderMetadata, + jwtSignerValidationService + ); + return jwtLoginService; } diff --git a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java index 98f3a8dbfdad348df87da372449311efbfeec6d1..394ff9db48295073a2b485a723208b99cc77750f 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/WebContext.java @@ -104,28 +104,6 @@ public final class WebContext { removeAttribute(WebConstants.CURRENT_MESSAGE); } - /** - * setAuthentication. - * @param username String - * @param type String - * @param provider String - * @param code String - * @param message String - * @return boolean - - public static boolean setAuthentication(String username, - String type, - String provider, - String code, - String message) { - - RealmAuthenticationProvider authenticationProvider = - (RealmAuthenticationProvider) getBean("authenticationProvider"); - authenticationProvider.trustAuthentication(username, type, provider, code, message); - - return isAuthenticated(); - }*/ - public static void setAuthentication(Authentication authentication) { setAttribute(WebConstants.AUTHENTICATION, authentication); } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java index b651fb110521b23705e61bc72922326743ff392c..18fc9367bf6ffd616006251134618e5e42e1af5c 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java @@ -23,8 +23,8 @@ package org.maxkey.authz.cas.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.BasicAuthentication; -import org.maxkey.authn.RealmAuthenticationProvider; import org.maxkey.authz.cas.endpoint.response.ServiceResponseBuilder; import org.maxkey.authz.cas.endpoint.ticket.CasConstants; import org.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl; @@ -58,7 +58,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; @RequestMapping(value="/authz/cas/v1/tickets", diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java index fa0c538af516cb048d1034b5b60ca36c32995914..926823664faddd8697ad7d06b98b996d354f1e50 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java @@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; -import org.maxkey.authn.RealmAuthenticationProvider; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authz.saml.common.EndpointGenerator; import org.maxkey.authz.saml.common.TrustResolver; import org.maxkey.authz.saml.service.IDService; @@ -91,7 +91,7 @@ public class ConsumerEndpoint { @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; private String singleSignOnServiceURL; private String assertionConsumerServiceURL; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index 11fb949abba8b11e97f65c3837b1c6dc8c9765fa..16448b67f63ec94fb069cfacf5a86b4e25bc8a52 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -20,8 +20,8 @@ package org.maxkey.web.endpoint; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.BasicAuthentication; -import org.maxkey.authn.RealmAuthenticationProvider; import org.maxkey.authn.support.jwt.JwtLoginService; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.configuration.ApplicationConfig; @@ -62,7 +62,7 @@ public class LoginEndpoint { @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; /** * init login diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java index cbb408254cc19415b4e8765223e03b2cc4499df4..cbd4c78e6dab639abe403b83e777238b8b0374bc 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java @@ -23,6 +23,7 @@ import java.security.spec.InvalidKeySpecException; import javax.sql.DataSource; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.support.jwt.JwtLoginService; import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.approval.TokenApprovalStore; @@ -46,6 +47,7 @@ import org.maxkey.constants.ConstantsProperties; import org.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; import org.maxkey.crypto.jwt.signer.service.impl.DefaultJwtSigningAndValidationService; +import org.maxkey.crypto.password.NoOpPasswordEncoder; import org.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,7 +61,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.security.authentication.ProviderManager; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.crypto.password.NoOpPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import com.nimbusds.jose.JOSEException; @@ -156,11 +157,15 @@ public class Oauth20AutoConfiguration implements InitializingBean { @Bean(name = "jwtLoginService") public JwtLoginService jwtLoginService( DefaultJwtSigningAndValidationService jwtSignerValidationService, - OIDCProviderMetadataDetails oidcProviderMetadata) { - JwtLoginService jwkSetKeyStore = new JwtLoginService(); - jwkSetKeyStore.setJwtSignerValidationService(jwtSignerValidationService); - jwkSetKeyStore.setJwtProviderMetadata(oidcProviderMetadata); - return jwkSetKeyStore; + OIDCProviderMetadataDetails oidcProviderMetadata, + AbstractAuthenticationProvider authenticationProvider) { + + JwtLoginService jwtLoginService = new JwtLoginService( + authenticationProvider, + oidcProviderMetadata, + jwtSignerValidationService + ); + return jwtLoginService; } diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index 91b994d7d37e659269332e8e1b198666f2ebd526..c6fc47ed2c572c7e114db7f79d20fc91226d1dd8 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -24,8 +24,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.maxkey.authn.AbstractAuthenticationProvider; import org.maxkey.authn.BasicAuthentication; -import org.maxkey.authn.RealmAuthenticationProvider; import org.maxkey.authn.support.kerberos.KerberosService; import org.maxkey.authn.support.rememberme.AbstractRemeberMeService; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; @@ -87,7 +87,7 @@ public class LoginEndpoint { @Autowired @Qualifier("authenticationProvider") - RealmAuthenticationProvider authenticationProvider ; + AbstractAuthenticationProvider authenticationProvider ; @Autowired @Qualifier("tfaOptAuthn")