Author: markt
Date: Thu Dec 18 14:59:48 2014
New Revision: 1646471

URL: http://svn.apache.org/r1646471
Log:
kfujino review of  BZ 57338 fix.
Need to replicate updates to SSOEntry
Modified:
    tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
    
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1646471&r1=1646470&r2=1646471&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Thu 
Dec 18 14:59:48 2014
@@ -543,8 +543,11 @@ public class SingleSignOn extends ValveB
      *                  DIGEST or FORM)
      * @param username  the username (if any) used for the authentication
      * @param password  the password (if any) used for the authentication
+     *
+     * @return <code>true</code> if the crednetials were updated, otherwise
+     *         <code>false</code>
      */
-    protected void update(String ssoId, Principal principal, String authType,
+    protected boolean update(String ssoId, Principal principal, String 
authType,
                           String username, String password) {
 
         SingleSignOnEntry sso = cache.get(ssoId);
@@ -554,7 +557,9 @@ public class SingleSignOn extends ValveB
             }
 
             sso.updateCredentials(principal, authType, username, password);
+            return true;
         }
+        return false;
     }
 
 

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1646471&r1=1646470&r2=1646471&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java 
Thu Dec 18 14:59:48 2014
@@ -16,10 +16,13 @@
  */
 package org.apache.catalina.ha.authenticator;
 
+import java.security.Principal;
+
 import org.apache.catalina.Container;
 import org.apache.catalina.Host;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.authenticator.SingleSignOn;
+import org.apache.catalina.authenticator.SingleSignOnEntry;
 import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.catalina.ha.ClusterValve;
 import org.apache.catalina.tribes.tipis.AbstractReplicatedMap.MapOwner;
@@ -67,6 +70,19 @@ public class ClusterSingleSignOn extends
     }
 
 
+    // ---------------------------------------------------- SingleSignOn 
Methods
+
+    @Override
+    protected boolean update(String ssoId, Principal principal, String 
authType,
+            String username, String password) {
+        boolean result = super.update(ssoId, principal, authType, username, 
password);
+        if (result) {
+            ((ReplicatedMap<String,SingleSignOnEntry>) cache).replicate(ssoId, 
true);
+        }
+        return result;
+    }
+
+
     // -------------------------------------------------------- MapOwner 
Methods
 
     @Override



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

Reply via email to