[tomcat] branch master updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=64043

[kfujino]

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

kfujino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new a365a7e  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=64043
a365a7e is described below

commit a365a7e0fdc1f7756edf5bc28c81b6da9d73be1c
Author: KeiichiFujino <kfuj...@apache.org>
AuthorDate: Sun Jan 12 23:34:33 2020 +0900

    Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=64043
---
 java/org/apache/catalina/ha/session/DeltaManager.java | 18 +++++++++++++++++-
 webapps/docs/changelog.xml                            |  8 ++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 54a1e5d..db48bc7 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -485,7 +485,12 @@ public class DeltaManager extends ClusterManagerBase{
 
     @Override
     public void changeSessionId(Session session) {
-        changeSessionId(session, true);
+       rotateSessionId(session);
+    }
+
+    @Override
+    public String rotateSessionId(Session session) {
+        return rotateSessionId(session, true);
     }
 
     @Override
@@ -493,12 +498,23 @@ public class DeltaManager extends ClusterManagerBase{
         changeSessionId(session, newId, true);
     }
 
+    /**
+     * @deprecated Will be removed in Tomcat 10
+     */
+    @Deprecated
     protected void changeSessionId(Session session, boolean notify) {
         String orgSessionID = session.getId();
         super.changeSessionId(session);
         if (notify) sendChangeSessionId(session.getId(), orgSessionID);
     }
 
+    protected String rotateSessionId(Session session, boolean notify) {
+        String orgSessionID = session.getId();
+        String newId = super.rotateSessionId(session);
+        if (notify) sendChangeSessionId(session.getId(), orgSessionID);
+        return newId;
+    }
+
     protected void changeSessionId(Session session, String newId, boolean 
notify) {
         String orgSessionID = session.getId();
         super.changeSessionId(session, newId);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 921e03e..dafce54 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Cluster">
+    <changelog>
+      <fix>
+        <bug>64043</bug>: Ensure that session ID changes are replicated during
+        form-authentication. (kfujino)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <fix>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org