changes to support single-sign-on (sso)

ghostclearsky · Apr 8, 2020 · 0ecdfc2 · 0ecdfc2
1 parent 80acc01
commit 0ecdfc2
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/main/java/tomcat/request/session/model/SingleSignOnEntry.java b/src/main/java/tomcat/request/session/model/SingleSignOnEntry.java
@@ -78,16 +78,21 @@ public synchronized void updateCredentials(Principal principal, String authType,
     }
 
     public void writeObjectData(ObjectOutputStream out) throws IOException {
-        out.defaultWriteObject();
-        out.writeBoolean(true);
-        out.writeObject(this.principal);
+        ObjectOutputStream outputStream = new ObjectOutputStream(out);
+        if (this.principal instanceof Serializable) {
+            outputStream.writeBoolean(true);
+            outputStream.writeObject(this.principal);
+        } else {
+            outputStream.writeBoolean(false);
+        }
+        outputStream.flush();
     }
 
     public void readObjectData(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-        boolean hasPrincipal = in.readBoolean();
+        ObjectInputStream inputStream = new ObjectInputStream(in);
+        boolean hasPrincipal = inputStream.readBoolean();
         if (hasPrincipal) {
-            this.principal = (Principal) in.readObject();
+            this.principal = (Principal) inputStream.readObject();
         }
     }
 }