(cxf-fediz) branch main updated: FEDIZ-256 - Tomcat authenticationSessionTimeout

[coheigea]

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

coheigea pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


The following commit(s) were added to refs/heads/main by this push:
     new 860c298d FEDIZ-256 - Tomcat authenticationSessionTimeout
860c298d is described below

commit 860c298dd17cf57b7d9e87097a3915985311c5d7
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Thu Feb 1 10:17:05 2024 +0000

    FEDIZ-256 - Tomcat authenticationSessionTimeout
---
 .../java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git 
a/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
 
b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
index 4a94d744..caeb7910 100644
--- 
a/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
+++ 
b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
@@ -243,6 +243,14 @@ public class FederationAuthenticator extends 
FormAuthenticator {
             String originalURL = 
(String)session.getNote(FederationAuthenticator.SESSION_SAVED_URI_PREFIX + 
contextId);
             
session.removeNote(FederationAuthenticator.SESSION_SAVED_URI_PREFIX + 
contextId); // Cleanup session
 
+            SavedRequest saved = (SavedRequest) 
session.getNote(SESSION_SAVED_REQUEST_PREFIX
+                    + ((Request)request).getDecodedRequestURI());
+            if (saved != null) {
+                // FEDIZ-256: Restore original session timeout
+                
session.setMaxInactiveInterval(saved.getOriginalMaxInactiveInterval());
+                LOG.debug("Session timeout set to {}", 
session.getMaxInactiveInterval());
+            }
+
             try {
                 if (originalURL != null) {
                     LOG.debug("Restore request to {}", originalURL);