changes to support single-sign-on (sso)

Author: ran-jit

src/main/java/tomcat/request/session/model/SingleSignOnEntry.java

@@ -16,6 +16,8 @@
 /** author: Ranjith Manickam @ 20 Mar' 2020 */
 public class SingleSignOnEntry implements Serializable {
 
+    private static final long serialVersionUID = 4590485271396917062L;
+
     private String authType;
     private String password;
     private Principal principal;
@@ -79,22 +81,20 @@ public synchronized void updateCredentials(Principal principal, String authType,
 
     public void writeObjectData(ObjectOutputStream out) throws IOException {
         try (ObjectOutputStream outputStream = new ObjectOutputStream(out)) {
-            if (this.principal instanceof Serializable) {
-                outputStream.writeBoolean(true);
-                outputStream.writeObject(this.principal);
-            } else {
-                outputStream.writeBoolean(false);
-            }
+            outputStream.writeObject(this);
             outputStream.flush();
         }
     }
 
     public void readObjectData(ObjectInputStream in) throws IOException, ClassNotFoundException {
         try (ObjectInputStream inputStream = new ObjectInputStream(in)) {
-            boolean hasPrincipal = inputStream.readBoolean();
-            if (hasPrincipal) {
-                this.principal = (Principal) inputStream.readObject();
-            }
+            SingleSignOnEntry entry = (SingleSignOnEntry) inputStream.readObject();
+            this.authType = entry.authType;
+            this.password = entry.password;
+            this.principal = entry.principal;
+            this.username = entry.username;
+            this.canReauthenticate = entry.canReauthenticate;
+            this.sessionKeys.putAll(entry.sessionKeys);
         }
     }
 }

src/main/java/tomcat/request/session/redis/SessionManager.java

@@ -361,8 +361,11 @@ void setSingleSignOnEntry(String ssoId, SingleSignOnEntry entry) {
     /** To get single-sign-on entry from cache. */
     SingleSignOnEntry getSingleSignOnEntry(String ssoId) {
         byte[] data = this.dataCache.get(ssoId);
-        SingleSignOnEntry entry = new SingleSignOnEntry();
+        if (data == null) {
+            return null;
+        }
 
+        SingleSignOnEntry entry = new SingleSignOnEntry();
         try {
             this.serializer.deserializeSingleSignOnEntry(data, entry);
         } catch (IOException | ClassNotFoundException ex) {