feat (fido2): merge from jans

Signed-off-by: Yuriy Movchan <[email protected]>
GluuFederation · Jun 29, 2024 · 8517ec7 · 8517ec7
1 parent 08483bf
commit 8517ec7
Show file tree

Hide file tree

Showing 56 changed files with 313 additions and 131 deletions.
diff --git a/Server/src/main/java/org/gluu/oxauth/auth/AuthenticationFilter.java b/Server/src/main/java/org/gluu/oxauth/auth/AuthenticationFilter.java
@@ -19,6 +19,8 @@
 import org.gluu.oxauth.model.error.ErrorResponseFactory;
 import org.gluu.oxauth.model.exception.InvalidJwtException;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.oxauth.model.token.ClientAssertion;
 import org.gluu.oxauth.model.token.ClientAssertionType;
 import org.gluu.oxauth.model.token.HttpAuthTokenType;

diff --git a/Server/src/main/java/org/gluu/oxauth/auth/Authenticator.java b/Server/src/main/java/org/gluu/oxauth/auth/Authenticator.java
@@ -14,14 +14,14 @@
 import org.gluu.model.security.Credentials;
 import org.gluu.oxauth.i18n.LanguageBean;
 import org.gluu.oxauth.model.authorize.AuthorizeErrorResponseType;
-import org.gluu.oxauth.model.common.SessionId;
-import org.gluu.oxauth.model.common.SessionIdState;
 import org.gluu.oxauth.model.common.User;
 import org.gluu.oxauth.model.config.Constants;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.exception.InvalidSessionStateException;
 import org.gluu.oxauth.model.jwt.JwtClaimName;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.oxauth.security.Identity;
 import org.gluu.oxauth.service.*;
 import org.gluu.oxauth.service.external.ExternalAuthenticationService;

diff --git a/Server/src/main/java/org/gluu/oxauth/auth/MTLSService.java b/Server/src/main/java/org/gluu/oxauth/auth/MTLSService.java
@@ -6,13 +6,13 @@
 import org.gluu.oxauth.model.authorize.AuthorizeRequestParam;
 import org.gluu.oxauth.model.common.AuthenticationMethod;
 import org.gluu.oxauth.model.common.Prompt;
-import org.gluu.oxauth.model.common.SessionId;
-import org.gluu.oxauth.model.common.SessionIdState;
 import org.gluu.oxauth.model.crypto.AbstractCryptoProvider;
 import org.gluu.oxauth.model.error.ErrorResponseFactory;
 import org.gluu.oxauth.model.jwk.JSONWebKey;
 import org.gluu.oxauth.model.jwk.JSONWebKeySet;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.oxauth.model.token.TokenErrorResponseType;
 import org.gluu.oxauth.model.util.CertUtils;
 import org.gluu.oxauth.service.SessionIdService;

diff --git a/Server/src/main/java/org/gluu/oxauth/auth/SelectAccountAction.java b/Server/src/main/java/org/gluu/oxauth/auth/SelectAccountAction.java
@@ -15,8 +15,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.gluu.jsf2.service.FacesService;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.common.User;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.security.Identity;
 import org.gluu.oxauth.service.CookieService;
 import org.gluu.oxauth.service.RequestParameterService;

diff --git a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/AuthorizeAction.java b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/AuthorizeAction.java
@@ -27,6 +27,8 @@
 import org.gluu.oxauth.model.jwt.JwtClaimName;
 import org.gluu.oxauth.model.ldap.ClientAuthorization;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.oxauth.model.util.Base64Util;
 import org.gluu.oxauth.model.util.JwtUtil;
 import org.gluu.oxauth.model.util.Util;

diff --git a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/AuthorizeRestWebServiceImpl.java b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/AuthorizeRestWebServiceImpl.java
@@ -30,6 +30,8 @@
 import org.gluu.oxauth.model.jwt.JwtClaimName;
 import org.gluu.oxauth.model.ldap.ClientAuthorization;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.oxauth.model.token.JsonWebResponse;
 import org.gluu.oxauth.model.token.JwrService;
 import org.gluu.oxauth.model.util.Util;

diff --git a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/AuthorizeRestWebServiceValidator.java b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/AuthorizeRestWebServiceValidator.java
@@ -9,6 +9,7 @@
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.error.ErrorResponseFactory;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.service.ClientService;
 import org.gluu.oxauth.service.DeviceAuthorizationService;
 import org.gluu.oxauth.service.RedirectUriResponse;

diff --git a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/ConsentGathererService.java b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/ConsentGathererService.java
@@ -11,9 +11,9 @@
 import org.gluu.oxauth.i18n.LanguageBean;
 import org.gluu.oxauth.model.authorize.AuthorizeRequestParam;
 import org.gluu.oxauth.model.authorize.ScopeChecker;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.config.Constants;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.service.AuthorizeService;
 import org.gluu.oxauth.service.ClientService;
 import org.gluu.oxauth.service.SessionIdService;

diff --git a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/ConsentGatheringSessionService.java b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/ConsentGatheringSessionService.java
@@ -7,9 +7,9 @@
 package org.gluu.oxauth.authorize.ws.rs;
 
 import org.apache.commons.lang.StringUtils;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.common.User;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.model.util.Util;
 import org.gluu.oxauth.service.ClientService;
 import org.gluu.oxauth.service.CookieService;

diff --git a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/DeviceAuthorizationAction.java b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/DeviceAuthorizationAction.java
@@ -11,9 +11,9 @@
 import org.gluu.oxauth.i18n.LanguageBean;
 import org.gluu.oxauth.model.common.DeviceAuthorizationCacheControl;
 import org.gluu.oxauth.model.common.DeviceAuthorizationStatus;
-import org.gluu.oxauth.model.common.SessionId;
-import org.gluu.oxauth.model.common.SessionIdState;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.oxauth.model.util.Util;
 import org.gluu.oxauth.service.CookieService;
 import org.gluu.oxauth.service.DeviceAuthorizationService;

diff --git a/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/LogoutAction.java b/Server/src/main/java/org/gluu/oxauth/authorize/ws/rs/LogoutAction.java
@@ -14,9 +14,9 @@
 import org.gluu.oxauth.i18n.LanguageBean;
 import org.gluu.oxauth.model.common.AuthorizationGrant;
 import org.gluu.oxauth.model.common.AuthorizationGrantList;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.session.EndSessionRequestParam;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.model.util.Base64Util;
 import org.gluu.oxauth.model.util.Util;
 import org.gluu.oxauth.service.SessionIdService;

diff --git a/Server/src/main/java/org/gluu/oxauth/model/error/ErrorMessage.java b/Server/src/main/java/org/gluu/oxauth/model/error/ErrorMessage.java
diff --git a/Server/src/main/java/org/gluu/oxauth/model/error/ErrorMessageList.java b/Server/src/main/java/org/gluu/oxauth/model/error/ErrorMessageList.java
@@ -11,6 +11,8 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.gluu.model.error.ErrorMessage;
+
 
 /**
  * Represents an error message list in a configuration XML file.

diff --git a/Server/src/main/java/org/gluu/oxauth/model/error/ErrorMessages.java b/Server/src/main/java/org/gluu/oxauth/model/error/ErrorMessages.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import javax.xml.bind.annotation.*;
+
+import org.gluu.model.error.ErrorMessage;
+
 import java.util.List;
 
 /**

diff --git a/Server/src/main/java/org/gluu/oxauth/model/error/ErrorResponseFactory.java b/Server/src/main/java/org/gluu/oxauth/model/error/ErrorResponseFactory.java
@@ -6,6 +6,7 @@
 
 package org.gluu.oxauth.model.error;
 
+import org.gluu.model.error.ErrorMessage;
 import org.gluu.oxauth.model.authorize.AuthorizeErrorResponseType;
 import org.gluu.oxauth.model.ciba.BackchannelAuthenticationErrorResponseType;
 import org.gluu.oxauth.model.clientinfo.ClientInfoErrorResponseType;

diff --git a/Server/src/main/java/org/gluu/oxauth/model/token/IdTokenFactory.java b/Server/src/main/java/org/gluu/oxauth/model/token/IdTokenFactory.java
@@ -22,6 +22,7 @@
 import org.gluu.oxauth.model.jwt.JwtClaimName;
 import org.gluu.oxauth.model.jwt.JwtSubClaimObject;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.service.AttributeService;
 import org.gluu.oxauth.service.ScopeService;
 import org.gluu.oxauth.service.SessionIdService;

diff --git a/Server/src/main/java/org/gluu/oxauth/revoke/RevokeSessionRestWebService.java b/Server/src/main/java/org/gluu/oxauth/revoke/RevokeSessionRestWebService.java
@@ -1,13 +1,13 @@
 package org.gluu.oxauth.revoke;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.gluu.oxauth.model.common.SessionId;
-import org.gluu.oxauth.model.common.SessionIdState;
 import org.gluu.oxauth.model.common.User;
 import org.gluu.oxauth.model.config.Constants;
 import org.gluu.oxauth.model.error.ErrorResponseFactory;
 import org.gluu.oxauth.model.session.EndSessionErrorResponseType;
 import org.gluu.oxauth.model.session.SessionClient;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.oxauth.security.Identity;
 import org.gluu.oxauth.service.ScopeService;
 import org.gluu.oxauth.service.SessionIdService;

diff --git a/Server/src/main/java/org/gluu/oxauth/security/Identity.java b/Server/src/main/java/org/gluu/oxauth/security/Identity.java
@@ -12,8 +12,8 @@
 import javax.inject.Named;
 import javax.interceptor.Interceptor;
 
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.session.SessionClient;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.model.common.User;
 
 /**

diff --git a/Server/src/main/java/org/gluu/oxauth/service/AuthenticationService.java b/Server/src/main/java/org/gluu/oxauth/service/AuthenticationService.java
@@ -37,13 +37,13 @@
 import org.gluu.model.metric.MetricType;
 import org.gluu.model.security.Credentials;
 import org.gluu.model.security.SimplePrincipal;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.common.SimpleUser;
 import org.gluu.oxauth.model.common.User;
 import org.gluu.oxauth.model.config.Constants;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.registration.Client;
 import org.gluu.oxauth.model.session.SessionClient;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.model.util.Util;
 import org.gluu.oxauth.security.Identity;
 import org.gluu.oxauth.service.common.ApplicationFactory;

diff --git a/Server/src/main/java/org/gluu/oxauth/service/AuthorizeService.java b/Server/src/main/java/org/gluu/oxauth/service/AuthorizeService.java
@@ -20,6 +20,7 @@
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.error.ErrorResponseFactory;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.security.Identity;
 import org.gluu.oxauth.service.ciba.CibaRequestService;
 import org.gluu.oxauth.util.RedirectUri;

diff --git a/Server/src/main/java/org/gluu/oxauth/service/CleanerTimer.java b/Server/src/main/java/org/gluu/oxauth/service/CleanerTimer.java
@@ -21,14 +21,14 @@
 
 import org.gluu.model.ApplicationType;
 import org.gluu.model.metric.ldap.MetricEntry;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.config.StaticConfiguration;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.fido.u2f.DeviceRegistration;
 import org.gluu.oxauth.model.fido.u2f.RegisterRequestMessageLdap;
 import org.gluu.oxauth.model.ldap.ClientAuthorization;
 import org.gluu.oxauth.model.ldap.TokenLdap;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.model.uma.persistence.UmaResource;
 import org.gluu.oxauth.service.fido.u2f.RequestService;
 import org.gluu.oxauth.uma.authorization.UmaPCT;

diff --git a/Server/src/main/java/org/gluu/oxauth/service/CookieService.java b/Server/src/main/java/org/gluu/oxauth/service/CookieService.java
@@ -2,10 +2,10 @@
 
 import com.google.common.collect.Sets;
 import org.apache.commons.lang.StringUtils;
-import org.gluu.oxauth.model.common.SessionId;
-import org.gluu.oxauth.model.common.SessionIdState;
 import org.gluu.oxauth.model.config.ConfigurationFactory;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.persist.exception.EntryPersistenceException;
 import org.gluu.service.cdi.util.CdiUtil;
 import org.json.JSONArray;

diff --git a/Server/src/main/java/org/gluu/oxauth/service/DeviceAuthorizationService.java b/Server/src/main/java/org/gluu/oxauth/service/DeviceAuthorizationService.java
@@ -11,10 +11,10 @@
 import org.gluu.oxauth.model.common.DeviceAuthorizationCacheControl;
 import org.gluu.oxauth.model.common.DeviceAuthorizationStatus;
 import org.gluu.oxauth.model.common.GrantType;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.error.ErrorResponseFactory;
 import org.gluu.oxauth.model.registration.Client;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.service.CacheService;
 import org.slf4j.Logger;
 

diff --git a/Server/src/main/java/org/gluu/oxauth/service/RedirectionUriService.java b/Server/src/main/java/org/gluu/oxauth/service/RedirectionUriService.java
@@ -11,11 +11,11 @@
 import com.google.common.collect.Sets;
 import org.apache.commons.lang.StringUtils;
 import org.gluu.oxauth.client.QueryStringDecoder;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.error.ErrorResponseFactory;
 import org.gluu.oxauth.model.registration.Client;
 import org.gluu.oxauth.model.session.EndSessionErrorResponseType;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.model.util.URLPatternList;
 import org.gluu.oxauth.model.util.Util;
 import org.jetbrains.annotations.NotNull;

diff --git a/Server/src/main/java/org/gluu/oxauth/service/RequestParameterService.java b/Server/src/main/java/org/gluu/oxauth/service/RequestParameterService.java
@@ -11,8 +11,8 @@
 import org.gluu.model.security.Identity;
 import org.gluu.oxauth.model.authorize.AuthorizeRequestParam;
 import org.gluu.oxauth.model.authorize.JwtAuthorizationRequest;
-import org.gluu.oxauth.model.common.SessionId;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.model.util.Util;
 import org.gluu.util.Pair;
 import org.gluu.util.StringHelper;

diff --git a/Server/src/main/java/org/gluu/oxauth/service/SessionIdService.java b/Server/src/main/java/org/gluu/oxauth/service/SessionIdService.java
@@ -17,8 +17,6 @@
 import org.gluu.oxauth.model.audit.OAuth2AuditLog;
 import org.gluu.oxauth.model.authorize.AuthorizeRequestParam;
 import org.gluu.oxauth.model.common.Prompt;
-import org.gluu.oxauth.model.common.SessionId;
-import org.gluu.oxauth.model.common.SessionIdState;
 import org.gluu.oxauth.model.common.User;
 import org.gluu.oxauth.model.config.Constants;
 import org.gluu.oxauth.model.config.StaticConfiguration;
@@ -30,6 +28,8 @@
 import org.gluu.oxauth.model.jwt.Jwt;
 import org.gluu.oxauth.model.jwt.JwtClaimName;
 import org.gluu.oxauth.model.jwt.JwtSubClaimObject;
+import org.gluu.oxauth.model.session.SessionId;
+import org.gluu.oxauth.model.session.SessionIdState;
 import org.gluu.oxauth.model.token.JwtSigner;
 import org.gluu.oxauth.model.util.JwtUtil;
 import org.gluu.oxauth.model.util.Pair;

diff --git a/Server/src/main/java/org/gluu/oxauth/service/UserService.java b/Server/src/main/java/org/gluu/oxauth/service/UserService.java
@@ -12,13 +12,13 @@
 import javax.inject.Inject;
 
 import org.apache.commons.lang.StringUtils;
-import org.gluu.fido2.model.entry.Fido2RegistrationEntry;
 import org.gluu.oxauth.model.config.StaticConfiguration;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
 import org.gluu.oxauth.model.fido.u2f.DeviceRegistration;
 import org.gluu.oxauth.model.fido.u2f.DeviceRegistrationStatus;
 import org.gluu.persist.model.base.CustomEntry;
 import org.gluu.persist.model.base.SimpleBranch;
+import org.gluu.persist.model.fido2.Fido2RegistrationEntry;
 import org.gluu.search.filter.Filter;
 import org.gluu.service.net.NetworkService;
 import org.gluu.util.StringHelper;

diff --git a/Server/src/main/java/org/gluu/oxauth/service/expiration/ExpirationNotificatorTimer.java b/Server/src/main/java/org/gluu/oxauth/service/expiration/ExpirationNotificatorTimer.java
@@ -3,9 +3,10 @@
 import net.jodah.expiringmap.ExpirationListener;
 import net.jodah.expiringmap.ExpirationPolicy;
 import net.jodah.expiringmap.ExpiringMap;
-import org.gluu.oxauth.model.common.SessionId;
+
 import org.gluu.oxauth.model.config.StaticConfiguration;
 import org.gluu.oxauth.model.configuration.AppConfiguration;
+import org.gluu.oxauth.model.session.SessionId;
 import org.gluu.oxauth.service.cdi.event.ExpirationEvent;
 import org.gluu.oxauth.service.external.ExternalApplicationSessionService;
 import org.gluu.oxauth.service.external.session.SessionEvent;