This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 4_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit c48480008c24411745ce7c3e6b04f334ffe20e50
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Wed Nov 4 11:22:31 2026 +0100

    [SYNCOPE-2007] Adding configurable JCacheSessionStore for OIDCC4UI
---
 .../syncope/client/console/topology/Topology.java  |  44 +++----
 .../client/console/topology/TopologyNodePanel.java |   2 +-
 .../core/src/main/resources/core-oidc.properties   |   9 +-
 .../resources/oidcc4ui/BeforeLogoutResource.java   |   2 +-
 .../resources/oidcc4ui/CodeConsumerResource.java   |   1 +
 .../commons/resources/oidcc4ui/LoginResource.java  |   3 +-
 .../syncope/common/lib/oidc/OIDCConstants.java     |   2 +
 .../syncope/common/lib/oidc/OIDCRequest.java       |  13 +-
 .../apache/syncope/core/logic/OIDCC4UILogic.java   |  40 +++---
 .../syncope/core/logic/OIDCC4UILogicContext.java   |  57 +++++++-
 .../syncope/core/logic/OIDCC4UIProperties.java}    |  27 ++--
 .../core/logic/oidc/JCacheSessionStore.java        | 144 +++++++++++++++++++++
 .../syncope/core/logic/oidc/OIDCC4UIContext.java   |  13 ++
 .../syncope/core/logic/oidc/OIDCClientCache.java   |   9 +-
 .../src/main/resources/core-oidcc4ui.properties    |   9 +-
 .../common/rest/api/service/OIDCC4UIService.java   |  20 +--
 .../core/rest/cxf/service/OIDCC4UIServiceImpl.java |   9 +-
 .../src/main/resources/core-all.properties         |   3 +
 18 files changed, 315 insertions(+), 92 deletions(-)

diff --git 
a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java
 
b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java
index 7708dbe392..6d0c3cb2ea 100644
--- 
a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java
+++ 
b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java
@@ -73,6 +73,10 @@ public class Topology extends BasePage {
 
     public static final String CONNECTOR_SERVER_LOCATION_PREFIX = "connid://";
 
+    public static String sanitizeMarkupId(final String input) {
+        return input.replaceAll("[^a-zA-Z0-9._-]", "_");
+    }
+
     @SpringBean
     protected ServiceOps serviceOps;
 
@@ -224,7 +228,7 @@ public class Topology extends BasePage {
         // Add Syncope (root topologynode)
         // -----------------------------------------
         String rootName = StringUtils.capitalize(Constants.SYNCOPE);
-        final TopologyNode syncopeTopologyNode = new TopologyNode(rootName, 
rootName, TopologyNode.Kind.SYNCOPE);
+        TopologyNode syncopeTopologyNode = new TopologyNode(rootName, 
rootName, TopologyNode.Kind.SYNCOPE);
         syncopeTopologyNode.setX(origX);
         syncopeTopologyNode.setY(origY);
 
@@ -234,9 +238,9 @@ public class Topology extends BasePage {
 
         body.add(topologyNodePanel(Constants.SYNCOPE, syncopeTopologyNode, 
false));
 
-        Map<Serializable, Map<Serializable, TopologyNode>> connections = new 
HashMap<>();
-        Map<Serializable, TopologyNode> syncopeConnections = new HashMap<>();
-        connections.put(syncopeTopologyNode.getKey(), syncopeConnections);
+        Map<String, Map<String, TopologyNode>> connections = new HashMap<>();
+        Map<String, TopologyNode> syncopeConnections = new HashMap<>();
+        connections.put(sanitizeMarkupId(syncopeTopologyNode.getKey()), 
syncopeConnections);
 
         // required to retrieve parent positions
         Map<String, TopologyNode> servers = new HashMap<>();
@@ -273,8 +277,8 @@ public class Topology extends BasePage {
 
                 item.add(topologyNodePanel("cs", topologynode, false));
 
-                syncopeConnections.put(url, topologynode);
-                connections.put(url, new HashMap<>());
+                syncopeConnections.put(sanitizeMarkupId(url), topologynode);
+                connections.put(sanitizeMarkupId(url), new HashMap<>());
             }
         };
 
@@ -312,8 +316,8 @@ public class Topology extends BasePage {
 
                 item.add(topologyNodePanel("fp", topologynode, false));
 
-                syncopeConnections.put(url, topologynode);
-                connections.put(url, new HashMap<>());
+                syncopeConnections.put(sanitizeMarkupId(url), topologynode);
+                connections.put(sanitizeMarkupId(url), new HashMap<>());
             }
         };
 
@@ -369,7 +373,7 @@ public class Topology extends BasePage {
                         item.add(topologyNodePanel("conn", topologynode, 
conn.isErrored()));
 
                         // Update connections
-                        Map<Serializable, TopologyNode> remoteConnections;
+                        Map<String, TopologyNode> remoteConnections;
                         if (connections.containsKey(conn.getLocation())) {
                             remoteConnections = 
connections.get(conn.getLocation());
                         } else {
@@ -404,7 +408,7 @@ public class Topology extends BasePage {
                     TopologyNode topologynode = new TopologyNode(
                             resourceTO.getKey(), resourceTO.getKey(), 
TopologyNode.Kind.RESOURCE);
 
-                    Map<Serializable, TopologyNode> remoteConnections;
+                    Map<String, TopologyNode> remoteConnections;
                     if (connections.containsKey(resourceTO.getConnector())) {
                         remoteConnections = 
connections.get(resourceTO.getConnector());
                     } else {
@@ -480,10 +484,11 @@ public class Topology extends BasePage {
 
             @Override
             public void renderHead(final Component component, final 
IHeaderResponse response) {
-                final StringBuilder jsPlumbConf = new StringBuilder();
-                jsPlumbConf.append(String.format(Locale.US, "activate(%.2f);", 
0.68f));
+                StringBuilder jsPlumbConf = new 
StringBuilder(String.format(Locale.US, "activate(%.2f);", 0.68f));
+
+                connections.forEach((key, value) -> value.forEach((label, 
node) -> jsPlumbConf.append(
+                        
"connect('%s','%s','%s');".formatted(sanitizeMarkupId(key), label, 
node.getKind()))));
 
-                createConnections(connections).forEach(jsPlumbConf::append);
                 jsPlumbConf.append("restoreTopologyLayout();");
 
                 
response.render(OnDomReadyHeaderItem.forScript(jsPlumbConf.toString()));
@@ -538,18 +543,9 @@ public class Topology extends BasePage {
         newlyCreatedContainer.add(newlyCreated);
     }
 
-    private static List<String> createConnections(final Map<Serializable, 
Map<Serializable, TopologyNode>> targets) {
-        List<String> list = new ArrayList<>();
-
-        targets.forEach((key, value) -> value.forEach((label, node) -> 
list.add(
-                "connect('%s','%s','%s');".formatted(key, label, 
node.getKind()))));
-
-        return list;
-    }
-
     private TopologyNodePanel topologyNodePanel(final String id, final 
TopologyNode node, final boolean errored) {
         TopologyNodePanel panel = new TopologyNodePanel(id, node, errored);
-        panel.setMarkupId(String.valueOf(node.getKey()));
+        panel.setMarkupId(sanitizeMarkupId(node.getKey()));
         panel.setOutputMarkupId(true);
 
         List<Behavior> behaviors = new ArrayList<>();
@@ -561,7 +557,7 @@ public class Topology extends BasePage {
             @Override
             public void renderHead(final Component component, final 
IHeaderResponse response) {
                 
response.render(OnDomReadyHeaderItem.forScript("setPosition('%s', %d, %d)".
-                        formatted(node.getKey(), node.getX(), node.getY())));
+                        formatted(sanitizeMarkupId(node.getKey()), 
node.getX(), node.getY())));
             }
         });
 
diff --git 
a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
 
b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
index e2f773deb8..4fec79e306 100644
--- 
a/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
+++ 
b/client/idm/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
@@ -94,7 +94,7 @@ public class TopologyNodePanel extends Panel implements 
IAjaxIndicatorAware {
             add(AttributeModifier.append("data-original-title", title));
         }
 
-        this.setMarkupId(node.getDisplayName());
+        setMarkupId(Topology.sanitizeMarkupId(node.getDisplayName()));
     }
 
     @Override
diff --git a/fit/core-reference/src/main/resources/core-all.properties 
b/docker/core/src/main/resources/core-oidc.properties
similarity index 75%
copy from fit/core-reference/src/main/resources/core-all.properties
copy to docker/core/src/main/resources/core-oidc.properties
index 3a13cbf963..b26911a2b1 100644
--- a/fit/core-reference/src/main/resources/core-all.properties
+++ b/docker/core/src/main/resources/core-oidc.properties
@@ -15,9 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-saml2.sp4ui.keystore=file://${syncope.conf.dir}/saml.keystore.jks
-saml2.sp4ui.keystore-type=jks
-saml2.sp4ui.keystore-storepass=changeit
-saml2.sp4ui.keystore-keypass=changeit
-saml2.sp4ui.maximum-authentication-lifetime=3600
-saml2.sp4ui.accepted-skew=300
+# with Core replication, enabling the session store requires to setup a JCache 
distributed provider
+oidc.c4ui.session-store-enabled=false
+oidc.c4ui.session-store-expiration-minutes=10
diff --git 
a/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/BeforeLogoutResource.java
 
b/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/BeforeLogoutResource.java
index 2ba9cabe1f..d50b0836e7 100644
--- 
a/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/BeforeLogoutResource.java
+++ 
b/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/BeforeLogoutResource.java
@@ -50,7 +50,7 @@ public class BeforeLogoutResource extends AbstractResource {
         response.setStatusCode(Response.Status.FOUND.getStatusCode());
         response.getHeaders().addHeader(HttpHeaders.CACHE_CONTROL, "no-cache, 
no-store");
         response.getHeaders().addHeader("Pragma", "no-cache");
-        response.getHeaders().addHeader(HttpHeaders.LOCATION, 
logoutRequest.getLocation());
+        response.getHeaders().addHeader(HttpHeaders.LOCATION, 
logoutRequest.location());
 
         Session.get().invalidate();
 
diff --git 
a/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/CodeConsumerResource.java
 
b/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/CodeConsumerResource.java
index df68e574cd..7b5cfa9781 100644
--- 
a/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/CodeConsumerResource.java
+++ 
b/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/CodeConsumerResource.java
@@ -61,6 +61,7 @@ public abstract class CodeConsumerResource extends 
AbstractResource {
 
         OIDCC4UIService service = 
BaseSession.class.cast(Session.get()).getAnonymousService(OIDCC4UIService.class);
         OIDCLoginResponse response = service.login(
+                
Session.get().getAttribute(OIDCConstants.REQUEST_ID).toString(),
                 request.getRequestURL().toString(),
                 authorizationCode,
                 Session.get().getAttribute(OIDCConstants.OP).toString());
diff --git 
a/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/LoginResource.java
 
b/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/LoginResource.java
index 2e0db8252d..0c16f4aa69 100644
--- 
a/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/LoginResource.java
+++ 
b/ext/oidcc4ui/client-common-ui/src/main/java/org/apache/syncope/client/ui/commons/resources/oidcc4ui/LoginResource.java
@@ -54,12 +54,13 @@ public class LoginResource extends AbstractResource {
         OIDCRequest loginRequest = service.createLoginRequest(redirectURI, op, 
reauth);
 
         Session.get().setAttribute(OIDCConstants.OP, op);
+        Session.get().setAttribute(OIDCConstants.REQUEST_ID, 
loginRequest.id());
 
         ResourceResponse response = new ResourceResponse();
         response.setStatusCode(Response.Status.FOUND.getStatusCode());
         response.getHeaders().addHeader(HttpHeaders.CACHE_CONTROL, "no-cache, 
no-store");
         response.getHeaders().addHeader("Pragma", "no-cache");
-        response.getHeaders().addHeader(HttpHeaders.LOCATION, 
loginRequest.getLocation());
+        response.getHeaders().addHeader(HttpHeaders.LOCATION, 
loginRequest.location());
 
         return response;
     }
diff --git 
a/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCConstants.java
 
b/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCConstants.java
index 9de52e994b..1fdef14406 100644
--- 
a/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCConstants.java
+++ 
b/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCConstants.java
@@ -26,6 +26,8 @@ public final class OIDCConstants {
 
     public static final String OP = "op";
 
+    public static final String REQUEST_ID = "requestId";
+
     public static final String LOGOUT_TOKEN = "logout_token";
 
     private OIDCConstants() {
diff --git 
a/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCRequest.java
 
b/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCRequest.java
index a0333f2568..afb5c68b2b 100644
--- 
a/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCRequest.java
+++ 
b/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCRequest.java
@@ -20,17 +20,6 @@ package org.apache.syncope.common.lib.oidc;
 
 import java.io.Serializable;
 
-public class OIDCRequest implements Serializable {
+public record OIDCRequest(String id, String location) implements Serializable {
 
-    private static final long serialVersionUID = -3509031322459942441L;
-
-    private String location;
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(final String location) {
-        this.location = location;
-    }
 }
diff --git 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UILogic.java
 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UILogic.java
index bc02e1a9b1..86ccb834e5 100644
--- 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UILogic.java
+++ 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UILogic.java
@@ -41,7 +41,6 @@ import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.common.lib.types.CipherAlgorithm;
 import org.apache.syncope.common.lib.types.ClientExceptionType;
 import org.apache.syncope.common.lib.types.IdRepoEntitlement;
-import org.apache.syncope.core.logic.oidc.NoOpSessionStore;
 import org.apache.syncope.core.logic.oidc.OIDCC4UIContext;
 import org.apache.syncope.core.logic.oidc.OIDCClientCache;
 import org.apache.syncope.core.logic.oidc.OIDCUserManager;
@@ -56,6 +55,7 @@ import 
org.apache.syncope.core.spring.security.AuthContextUtils;
 import org.apache.syncope.core.spring.security.AuthDataAccessor;
 import org.pac4j.core.context.CallContext;
 import org.pac4j.core.context.WebContext;
+import org.pac4j.core.context.session.SessionStore;
 import org.pac4j.core.credentials.Credentials;
 import org.pac4j.core.credentials.SessionKeyCredentials;
 import org.pac4j.core.exception.http.WithLocationAction;
@@ -73,6 +73,8 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
 
     protected static final String JWT_CLAIM_ID_TOKEN = "ID_TOKEN";
 
+    protected static final String NO_OP_REQUEST_ID = "noop";
+
     protected final OIDCClientCache oidcClientCacheLogin;
 
     protected final OIDCClientCache oidcClientCacheLogout;
@@ -89,6 +91,8 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
 
     protected final EncryptorManager encryptorManager;
 
+    protected final SessionStore sessionStore;
+
     public OIDCC4UILogic(
             final OIDCClientCache oidcClientCacheLogin,
             final OIDCClientCache oidcClientCacheLogout,
@@ -97,7 +101,8 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
             final OIDCC4UIProviderDAO opDAO,
             final AccessTokenDAO accessTokenDAO,
             final OIDCUserManager userManager,
-            final EncryptorManager encryptorManager) {
+            final EncryptorManager encryptorManager,
+            final SessionStore sessionStore) {
 
         this.oidcClientCacheLogin = oidcClientCacheLogin;
         this.oidcClientCacheLogout = oidcClientCacheLogout;
@@ -107,6 +112,7 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
         this.accessTokenDAO = accessTokenDAO;
         this.userManager = userManager;
         this.encryptorManager = encryptorManager;
+        this.sessionStore = sessionStore;
     }
 
     protected OidcClient getOidcClient(
@@ -147,8 +153,8 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
         });
 
         // 2. create OIDCRequest
-        WithLocationAction action = oidcClient.getRedirectionAction(
-                new CallContext(new OIDCC4UIContext(), 
NoOpSessionStore.INSTANCE)).
+        OIDCC4UIContext ctx = new OIDCC4UIContext();
+        WithLocationAction action = oidcClient.getRedirectionAction(new 
CallContext(ctx, sessionStore)).
                 map(WithLocationAction.class::cast).
                 orElseThrow(() -> {
                     SyncopeClientException sce = 
SyncopeClientException.build(ClientExceptionType.Unknown);
@@ -156,13 +162,16 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
                     return sce;
                 });
 
-        OIDCRequest loginRequest = new OIDCRequest();
-        loginRequest.setLocation(action.getLocation());
-        return loginRequest;
+        return new 
OIDCRequest(Optional.ofNullable(ctx.getId()).orElse(NO_OP_REQUEST_ID), 
action.getLocation());
     }
 
     @PreAuthorize("hasRole('" + IdRepoEntitlement.ANONYMOUS + "')")
-    public OIDCLoginResponse login(final String redirectURI, final String 
authorizationCode, final String opName) {
+    public OIDCLoginResponse login(
+            final String requestId,
+            final String redirectURI,
+            final String authorizationCode,
+            final String opName) {
+
         // 0. look for OP
         OIDCC4UIProvider op = opDAO.findByName(opName).
                 orElseThrow(() -> new NotFoundException("OIDC Provider '" + 
opName + '\''));
@@ -171,14 +180,16 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
         OidcClient oidcClient = getOidcClient(oidcClientCacheLogin, op, 
redirectURI);
 
         // 2. get OpenID Connect tokens
+        OIDCC4UIContext ctx = new OIDCC4UIContext();
+        ctx.setId(requestId);
+
         String idTokenHint = null;
         JWTClaimsSet claimsSet = null;
         try {
             OidcCredentials credentials = new OidcCredentials();
             credentials.setCode(authorizationCode);
 
-            oidcClient.getAuthenticator().validate(
-                    new CallContext(new OIDCC4UIContext(), 
NoOpSessionStore.INSTANCE), credentials);
+            oidcClient.getAuthenticator().validate(new CallContext(ctx, 
sessionStore), credentials);
 
             JWT idToken = credentials.toIdToken();
             if (idToken == null) {
@@ -324,8 +335,9 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
         OidcProfile profile = new OidcProfile();
         profile.setIdTokenString((String) 
claimsSet.getClaim(JWT_CLAIM_ID_TOKEN));
 
+        OIDCC4UIContext ctx = new OIDCC4UIContext();
         WithLocationAction action = oidcClient.getLogoutAction(
-                new CallContext(new OIDCC4UIContext(), 
NoOpSessionStore.INSTANCE),
+                new CallContext(ctx, sessionStore),
                 profile,
                 redirectURI).
                 map(WithLocationAction.class::cast).
@@ -335,9 +347,7 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
                     return sce;
                 });
 
-        OIDCRequest logoutRequest = new OIDCRequest();
-        logoutRequest.setLocation(action.getLocation());
-        return logoutRequest;
+        return new 
OIDCRequest(Optional.ofNullable(ctx.getId()).orElse(NO_OP_REQUEST_ID), 
action.getLocation());
     }
 
     @PreAuthorize("hasRole('" + IdRepoEntitlement.ANONYMOUS + "')")
@@ -371,7 +381,7 @@ public class OIDCC4UILogic extends 
AbstractTransactionalLogic<EntityTO> {
                 }
                 return Optional.empty();
             }
-        }, NoOpSessionStore.INSTANCE)).orElseThrow(() -> {
+        }, sessionStore)).orElseThrow(() -> {
             SyncopeClientException sce = 
SyncopeClientException.build(ClientExceptionType.Unknown);
             sce.getElements().add("Could not validate the logout token");
             return sce;
diff --git 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UILogicContext.java
 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UILogicContext.java
index be6614e234..c232a8708e 100644
--- 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UILogicContext.java
+++ 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UILogicContext.java
@@ -18,7 +18,16 @@
  */
 package org.apache.syncope.core.logic;
 
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.configuration.MutableConfiguration;
+import javax.cache.expiry.Duration;
+import javax.cache.expiry.TouchedExpiryPolicy;
 import org.apache.syncope.core.logic.init.OIDCC4UILoader;
+import org.apache.syncope.core.logic.oidc.JCacheSessionStore;
+import org.apache.syncope.core.logic.oidc.NoOpSessionStore;
 import org.apache.syncope.core.logic.oidc.OIDCClientCache;
 import org.apache.syncope.core.logic.oidc.OIDCUserManager;
 import org.apache.syncope.core.persistence.api.EncryptorManager;
@@ -34,24 +43,57 @@ import 
org.apache.syncope.core.provisioning.api.data.UserDataBinder;
 import org.apache.syncope.core.provisioning.api.jexl.TemplateUtils;
 import org.apache.syncope.core.provisioning.java.pushpull.InboundMatcher;
 import org.apache.syncope.core.spring.security.AuthDataAccessor;
+import org.pac4j.core.context.session.SessionStore;
 import org.springframework.beans.factory.annotation.Qualifier;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+@EnableConfigurationProperties(OIDCC4UIProperties.class)
 @Configuration(proxyBeanMethods = false)
 public class OIDCC4UILogicContext {
 
+    @ConditionalOnMissingBean(name = "oidcSessionStore")
+    @Bean
+    public SessionStore oidcSessionStore(
+            final CacheManager cacheManager,
+            final EncryptorManager encryptorManager,
+            final OIDCC4UIProperties props) {
+
+        if (props.isSessionStoreEnabled()) {
+            @SuppressWarnings("unchecked")
+            MutableConfiguration<String, Map<String, Object>> config =
+                    new MutableConfiguration<String, Map<String, Object>>().
+                            setTypes(String.class, (Class<Map<String, 
Object>>) (Class<?>) Map.class).
+                            setStoreByValue(false).
+                            setReadThrough(false).
+                            
setExpiryPolicyFactory(TouchedExpiryPolicy.factoryOf(
+                                    new Duration(TimeUnit.MINUTES, 
props.getSessionStoreExpirationMinutes())));
+            Cache<String, Map<String, Object>> cache = 
cacheManager.createCache("oidcSessionStore", config);
+
+            return new JCacheSessionStore(cache, encryptorManager);
+        }
+
+        return NoOpSessionStore.INSTANCE;
+    }
+
     @ConditionalOnMissingBean(name = "oidcClientCacheLogin")
     @Bean
-    public OIDCClientCache oidcClientCacheLogin() {
-        return new OIDCClientCache();
+    public OIDCClientCache oidcClientCacheLogin(
+            @Qualifier("oidcSessionStore")
+            final SessionStore oidcSessionStore) {
+
+        return new OIDCClientCache(oidcSessionStore);
     }
 
     @ConditionalOnMissingBean(name = "oidcClientCacheLogout")
     @Bean
-    public OIDCClientCache oidcClientCacheLogout() {
-        return new OIDCClientCache();
+    public OIDCClientCache oidcClientCacheLogout(
+            @Qualifier("oidcSessionStore")
+            final SessionStore oidcSessionStore) {
+
+        return new OIDCClientCache(oidcSessionStore);
     }
 
     @ConditionalOnMissingBean
@@ -93,7 +135,9 @@ public class OIDCC4UILogicContext {
             final OIDCC4UIProviderDAO opDAO,
             final AccessTokenDAO accessTokenDAO,
             final OIDCUserManager userManager,
-            final EncryptorManager encryptorManager) {
+            final EncryptorManager encryptorManager,
+            @Qualifier("oidcSessionStore")
+            final SessionStore oidcSessionStore) {
 
         return new OIDCC4UILogic(
                 oidcClientCacheLogin,
@@ -103,7 +147,8 @@ public class OIDCC4UILogicContext {
                 opDAO,
                 accessTokenDAO,
                 userManager,
-                encryptorManager);
+                encryptorManager,
+                oidcSessionStore);
     }
 
     @ConditionalOnMissingBean
diff --git 
a/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCRequest.java
 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UIProperties.java
similarity index 51%
copy from 
ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCRequest.java
copy to 
ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UIProperties.java
index a0333f2568..55765df0d9 100644
--- 
a/ext/oidcc4ui/common-lib/src/main/java/org/apache/syncope/common/lib/oidc/OIDCRequest.java
+++ 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/OIDCC4UIProperties.java
@@ -16,21 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.oidc;
+package org.apache.syncope.core.logic;
 
-import java.io.Serializable;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
-public class OIDCRequest implements Serializable {
+@ConfigurationProperties("oidc.c4ui")
+public class OIDCC4UIProperties {
 
-    private static final long serialVersionUID = -3509031322459942441L;
+    private boolean sessionStoreEnabled = false;
 
-    private String location;
+    private long sessionStoreExpirationMinutes = 10;
 
-    public String getLocation() {
-        return location;
+    public boolean isSessionStoreEnabled() {
+        return sessionStoreEnabled;
     }
 
-    public void setLocation(final String location) {
-        this.location = location;
+    public void setSessionStoreEnabled(final boolean sessionStoreEnabled) {
+        this.sessionStoreEnabled = sessionStoreEnabled;
+    }
+
+    public long getSessionStoreExpirationMinutes() {
+        return sessionStoreExpirationMinutes;
+    }
+
+    public void setSessionStoreExpirationMinutes(final long 
sessionStoreExpirationMinutes) {
+        this.sessionStoreExpirationMinutes = sessionStoreExpirationMinutes;
     }
 }
diff --git 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/JCacheSessionStore.java
 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/JCacheSessionStore.java
new file mode 100644
index 0000000000..1ea7ce66c6
--- /dev/null
+++ 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/JCacheSessionStore.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.core.logic.oidc;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import javax.cache.Cache;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.common.lib.types.CipherAlgorithm;
+import org.apache.syncope.core.persistence.api.EncryptorManager;
+import org.apache.syncope.core.spring.security.SecureRandomUtils;
+import org.pac4j.core.context.WebContext;
+import org.pac4j.core.context.session.SessionStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JCacheSessionStore implements SessionStore {
+
+    protected static final Logger LOG = 
LoggerFactory.getLogger(JCacheSessionStore.class);
+
+    protected final Cache<String, Map<String, Object>> cache;
+
+    protected final EncryptorManager encryptorManager;
+
+    public JCacheSessionStore(
+            final Cache<String, Map<String, Object>> cache,
+            final EncryptorManager encryptorManager) {
+
+        this.cache = cache;
+        this.encryptorManager = encryptorManager;
+    }
+
+    @Override
+    public Optional<String> getSessionId(final WebContext webContext, final 
boolean createSession) {
+        return webContext instanceof OIDCC4UIContext ctx
+                ? Optional.ofNullable(ctx.getId()).or(() -> {
+                    if (createSession) {
+                        String id = 
SecureRandomUtils.generateRandomUUID().toString();
+                        ctx.setId(id);
+                        cache.put(id, new HashMap<>());
+                        return Optional.of(id);
+                    }
+                    return Optional.empty();
+                })
+                : Optional.empty();
+    }
+
+    @Override
+    public Optional<Object> get(final WebContext webContext, final String key) 
{
+        return webContext instanceof OIDCC4UIContext ctx
+                ? Optional.ofNullable(ctx.getId()).
+                        or(() -> getSessionId(webContext, true)).
+                        map(cache::get).
+                        flatMap(session -> 
Optional.ofNullable(session.get(key))).
+                        map(value -> {
+                            try {
+                                return encryptorManager.getInstance().
+                                        decode((String) value, 
CipherAlgorithm.AES);
+                            } catch (NoSuchAlgorithmException | 
NoSuchPaddingException | InvalidKeyException
+                                    | IllegalBlockSizeException | 
BadPaddingException e) {
+
+                                LOG.error("While getting {} from JCache with 
id {}", key, ctx.getId());
+                                return StringUtils.EMPTY;
+                            }
+                        })
+                : Optional.empty();
+    }
+
+    @Override
+    public void set(final WebContext webContext, final String key, final 
Object value) {
+        if (webContext instanceof OIDCC4UIContext ctx) {
+            Optional.ofNullable(ctx.getId()).
+                    or(() -> getSessionId(webContext, true)).
+                    ifPresent(id -> cache.invoke(id, (entry, args) -> {
+                        if (!entry.exists()) {
+                            entry.setValue(new HashMap<>());
+                        }
+                        if (value == null) {
+                            entry.getValue().remove(key);
+                        } else {
+                            try {
+                                entry.getValue().put(
+                                        key,
+                                        
encryptorManager.getInstance().encode(value.toString(), CipherAlgorithm.AES));
+                            } catch (NoSuchAlgorithmException | 
NoSuchPaddingException | InvalidKeyException
+                                    | IllegalBlockSizeException | 
BadPaddingException e) {
+
+                                LOG.error("While setting {}={} from JCache 
with id {}", key, value, id);
+                            }
+                        }
+                        return entry.getValue();
+                    }));
+        }
+    }
+
+    @Override
+    public boolean destroySession(final WebContext webContext) {
+        if (webContext instanceof OIDCC4UIContext ctx) {
+            Optional.ofNullable(ctx.getId()).ifPresent(cache::remove);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Optional<Object> getTrackableSession(final WebContext webContext) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<SessionStore> buildFromTrackableSession(
+            final WebContext webContext,
+            final Object trackableSession) {
+
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean renewSession(final WebContext webContext) {
+        return false;
+    }
+}
diff --git 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCC4UIContext.java
 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCC4UIContext.java
index ebcf19541e..6e981995aa 100644
--- 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCC4UIContext.java
+++ 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCC4UIContext.java
@@ -28,6 +28,19 @@ import org.pac4j.core.context.WebContext;
 
 public class OIDCC4UIContext implements WebContext {
 
+    private String id;
+
+    public OIDCC4UIContext() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
     @Override
     public Optional<String> getQueryString() {
         return Optional.empty();
diff --git 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCClientCache.java
 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCClientCache.java
index 8595a7cf49..22843559b4 100644
--- 
a/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCClientCache.java
+++ 
b/ext/oidcc4ui/logic/src/main/java/org/apache/syncope/core/logic/oidc/OIDCClientCache.java
@@ -36,6 +36,7 @@ import java.util.Optional;
 import java.util.function.Function;
 import org.apache.syncope.common.lib.to.OIDCC4UIProviderTO;
 import org.apache.syncope.core.persistence.api.entity.OIDCC4UIProvider;
+import org.pac4j.core.context.session.SessionStore;
 import org.pac4j.core.http.callback.NoParameterCallbackUrlResolver;
 import org.pac4j.oidc.client.OidcClient;
 import org.pac4j.oidc.config.OidcConfiguration;
@@ -87,6 +88,12 @@ public class OIDCClientCache {
 
     protected final List<OidcClient> cache = Collections.synchronizedList(new 
ArrayList<>());
 
+    protected final boolean useNonce;
+
+    public OIDCClientCache(final SessionStore sessionStore) {
+        useNonce = !(sessionStore instanceof NoOpSessionStore);
+    }
+
     public Optional<OidcClient> get(final String opName) {
         return cache.stream().filter(c -> 
opName.equals(c.getName())).findFirst();
     }
@@ -96,7 +103,7 @@ public class OIDCClientCache {
         cfg.setClientId(op.getClientID());
         cfg.setSecret(op.getClientSecret());
         cfg.setScope(String.join(" ", op.getScopes()));
-        cfg.setUseNonce(false);
+        cfg.setUseNonce(useNonce);
 
         OIDCProviderMetadata metadata = new OIDCProviderMetadata(
                 new Issuer(op.getIssuer()),
diff --git a/fit/core-reference/src/main/resources/core-all.properties 
b/ext/oidcc4ui/logic/src/main/resources/core-oidcc4ui.properties
similarity index 75%
copy from fit/core-reference/src/main/resources/core-all.properties
copy to ext/oidcc4ui/logic/src/main/resources/core-oidcc4ui.properties
index 3a13cbf963..b26911a2b1 100644
--- a/fit/core-reference/src/main/resources/core-all.properties
+++ b/ext/oidcc4ui/logic/src/main/resources/core-oidcc4ui.properties
@@ -15,9 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-saml2.sp4ui.keystore=file://${syncope.conf.dir}/saml.keystore.jks
-saml2.sp4ui.keystore-type=jks
-saml2.sp4ui.keystore-storepass=changeit
-saml2.sp4ui.keystore-keypass=changeit
-saml2.sp4ui.maximum-authentication-lifetime=3600
-saml2.sp4ui.accepted-skew=300
+# with Core replication, enabling the session store requires to setup a JCache 
distributed provider
+oidc.c4ui.session-store-enabled=false
+oidc.c4ui.session-store-expiration-minutes=10
diff --git 
a/ext/oidcc4ui/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCC4UIService.java
 
b/ext/oidcc4ui/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCC4UIService.java
index d56c5b4276..92f9222eeb 100644
--- 
a/ext/oidcc4ui/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCC4UIService.java
+++ 
b/ext/oidcc4ui/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/OIDCC4UIService.java
@@ -21,9 +21,11 @@ package org.apache.syncope.common.rest.api.service;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.security.SecurityRequirements;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
@@ -61,18 +63,20 @@ public interface OIDCC4UIService extends JAXRSService {
      * Uses the provided authorization code to go through the OpenID Connect 
tokens process and finally creates JWT for
      * the matching user, if found.
      *
+     * @param requestId request id
      * @param redirectURI redirect URI
      * @param authorizationCode authorization code generated by the remote 
OpenID Connect Provider
      * @param op OpenID Connect Provider
      * @return JWT for the matching user plus attributes returned in the 
response
      */
     @POST
-    @Path("login")
+    @Path("login/{id}")
     @Produces({ MediaType.APPLICATION_JSON })
     OIDCLoginResponse login(
-            @QueryParam(OIDCConstants.REDIRECT_URI) String redirectURI,
-            @QueryParam("authorizationCode") String authorizationCode,
-            @QueryParam(OIDCConstants.OP) String op);
+            @PathParam("id") String requestId,
+            @NotNull @QueryParam(OIDCConstants.REDIRECT_URI) String 
redirectURI,
+            @NotNull @QueryParam("authorizationCode") String authorizationCode,
+            @NotNull @QueryParam(OIDCConstants.OP) String op);
 
     /**
      * Returns the endSession endpoint for the OP matching the requesting 
access token.
@@ -81,9 +85,9 @@ public interface OIDCC4UIService extends JAXRSService {
      * @return endSession endpoint for the OP matching the requesting access 
token
      */
     @POST
-    @Path("logout")
+    @Path("logoutReqest")
     @Produces({ MediaType.APPLICATION_JSON })
-    OIDCRequest createLogoutRequest(@QueryParam(OIDCConstants.REDIRECT_URI) 
String redirectURI);
+    OIDCRequest createLogoutRequest(@NotNull 
@QueryParam(OIDCConstants.REDIRECT_URI) String redirectURI);
 
     /**
      * Removes the JWT matching the provided OIDC logout token.
@@ -95,6 +99,6 @@ public interface OIDCC4UIService extends JAXRSService {
     @Path("backChannelLogout")
     @Produces({ MediaType.APPLICATION_JSON })
     void backChannelLogout(
-            @QueryParam(OIDCConstants.LOGOUT_TOKEN) String logoutToken,
-            @QueryParam(OIDCConstants.REDIRECT_URI) String redirectURI);
+            @NotNull @QueryParam(OIDCConstants.LOGOUT_TOKEN) String 
logoutToken,
+            @NotNull @QueryParam(OIDCConstants.REDIRECT_URI) String 
redirectURI);
 }
diff --git 
a/ext/oidcc4ui/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCC4UIServiceImpl.java
 
b/ext/oidcc4ui/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCC4UIServiceImpl.java
index 88f1946700..95b8dc6915 100644
--- 
a/ext/oidcc4ui/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCC4UIServiceImpl.java
+++ 
b/ext/oidcc4ui/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/OIDCC4UIServiceImpl.java
@@ -39,8 +39,13 @@ public class OIDCC4UIServiceImpl extends AbstractService 
implements OIDCC4UIServ
     }
 
     @Override
-    public OIDCLoginResponse login(final String redirectURI, final String 
authorizationCode, final String op) {
-        return logic.login(redirectURI, authorizationCode, op);
+    public OIDCLoginResponse login(
+            final String requestId,
+            final String redirectURI,
+            final String authorizationCode,
+            final String op) {
+
+        return logic.login(requestId, redirectURI, authorizationCode, op);
     }
 
     @Override
diff --git a/fit/core-reference/src/main/resources/core-all.properties 
b/fit/core-reference/src/main/resources/core-all.properties
index 3a13cbf963..78e8834c90 100644
--- a/fit/core-reference/src/main/resources/core-all.properties
+++ b/fit/core-reference/src/main/resources/core-all.properties
@@ -21,3 +21,6 @@ saml2.sp4ui.keystore-storepass=changeit
 saml2.sp4ui.keystore-keypass=changeit
 saml2.sp4ui.maximum-authentication-lifetime=3600
 saml2.sp4ui.accepted-skew=300
+
+oidc.c4ui.session-store-enabled=true
+oidc.c4ui.session-store-expiration-minutes=10

Reply via email to