From 36716d12ba36fe2535179009137fa366ecd264ec Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Thu, 23 Jan 2025 16:50:30 -0700
Subject: [PATCH] Serialization Support of Core Components

Issue gh-16276
---
 ...ringSecurityCoreVersionSerializableTests.java |   2 ++
 ...e.context.TransientSecurityContext.serialized | Bin 0 -> 1294 bytes
 .../security/core/ComparableVersion.java         |   1 +
 .../core/context/TransientSecurityContext.java   |   5 +++++
 4 files changed, 8 insertions(+)
 create mode 100644 config/src/test/resources/serialized/6.4.x/org.springframework.security.core.context.TransientSecurityContext.serialized

diff --git a/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java b/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
index 49e800cae0..0e1b23b646 100644
--- a/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
+++ b/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
@@ -104,6 +104,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextImpl;
+import org.springframework.security.core.context.TransientSecurityContext;
 import org.springframework.security.core.session.AbstractSessionEvent;
 import org.springframework.security.core.session.ReactiveSessionInformation;
 import org.springframework.security.core.session.SessionInformation;
@@ -444,6 +445,7 @@ class SpringSecurityCoreVersionSerializableTests {
 				(r) -> new JaasAuthenticationSuccessEvent(authentication));
 		generatorByClassName.put(AbstractSessionEvent.class, (r) -> new AbstractSessionEvent(securityContext));
 		generatorByClassName.put(SecurityConfig.class, (r) -> new SecurityConfig("value"));
+		generatorByClassName.put(TransientSecurityContext.class, (r) -> new TransientSecurityContext(authentication));
 
 		// cas
 		generatorByClassName.put(CasServiceTicketAuthenticationToken.class, (r) -> {
diff --git a/config/src/test/resources/serialized/6.4.x/org.springframework.security.core.context.TransientSecurityContext.serialized b/config/src/test/resources/serialized/6.4.x/org.springframework.security.core.context.TransientSecurityContext.serialized
new file mode 100644
index 0000000000000000000000000000000000000000..5a4ccd07b4d0d97d12c13023f0eb3ea4b04079f6
GIT binary patch
literal 1294
zcmb7E&ubGw6n^<pVkxGHqTr#PTJa#e*lXw^Ej1JtQ<~%w!7|-U<20L@b!K8Wilu_!
zK~Sg&iuezR;K{$igD3Uue_+pEM0{_Put}BL?qOkO-+b?T-}lYFKZGfxVOi<6V?r%t
zdt0+E-&MNf81DD9uzkl@n&V4a9$BZZnKXh+TN{2}8GJZM|Nij!>E==zAkwgOa=;@v
zYuzw__(=z8NO_QFJ$ncH37=Vky<pKpaQ6sXcf{5uwr+XiOeqR+$m+42Cc8Kd!?i>u
z)|oM=Mr#tVt~y*MEYlv$_?owfB@2v&bKVZS$J~I)wp-oW;l3?-FiraUB4oi`*n=rl
zsd5@d<t<}1^X)&Fe0z6wPgYv_G-R4^c5D*fLT0p9Xr$oC?Bak~&x*iZQ9*#zP*h}>
zYjMj&U<Ta66bg2QhH$9VNlMLpLv~e5Yzwv(a8DTfYj)xK#~;rMv0K>ycPtdf+E7gi
zr@i)nxTMXcW!V3G`{(5tH02YkT<qfc1f{Gs>l1qP=<D3;PwZ_5QfrVk;y#Z;bSJf&
zrT5A5JyNOf)C5M5S1{+6$G($z{lsm|WLB$yPug6wbbByq7N$3<-s)zfwz?4!?|ew<
zTRhh5_=@!~b3+&6{3R`OO(-(oS3PNOD!Cek0@K!nLbB&6ze8IW#&S4bn&XoE`YR8!
zV@B0D#q>-#j688K;F@UBRfyM7n8F9=Sx9_HT$>CB;_c5Je0lz6zd?TmIzNLai^<8l
z<{YcOzgmCs^6<&63|5g=H%_nBJY9>}s1?->nPyh$L_dTbWPvyoBMbQlQmOFaXjBVX
Gn(_}s!NceP

literal 0
HcmV?d00001

diff --git a/core/src/main/java/org/springframework/security/core/ComparableVersion.java b/core/src/main/java/org/springframework/security/core/ComparableVersion.java
index 347644734c..a517a4473d 100644
--- a/core/src/main/java/org/springframework/security/core/ComparableVersion.java
+++ b/core/src/main/java/org/springframework/security/core/ComparableVersion.java
@@ -405,6 +405,7 @@ class ComparableVersion implements Comparable<ComparableVersion> {
 	 * Represents a version list item. This class is used both for the global item list
 	 * and for sub-lists (which start with '-(number)' in the version specification).
 	 */
+	@SuppressWarnings("serial")
 	private static class ListItem extends ArrayList<Item> implements Item {
 
 		@Override
diff --git a/core/src/main/java/org/springframework/security/core/context/TransientSecurityContext.java b/core/src/main/java/org/springframework/security/core/context/TransientSecurityContext.java
index 0089ae455d..7a4b3d30fe 100644
--- a/core/src/main/java/org/springframework/security/core/context/TransientSecurityContext.java
+++ b/core/src/main/java/org/springframework/security/core/context/TransientSecurityContext.java
@@ -16,6 +16,8 @@
 
 package org.springframework.security.core.context;
 
+import java.io.Serial;
+
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.Transient;
 
@@ -30,6 +32,9 @@ import org.springframework.security.core.Transient;
 @Transient
 public class TransientSecurityContext extends SecurityContextImpl {
 
+	@Serial
+	private static final long serialVersionUID = -7925492364422193347L;
+
 	public TransientSecurityContext() {
 	}