Merge branch '6.2.x'

spring-projects · Jan 5, 2024 · 1daa9e2 · 1daa9e2
2 parents 85177c0 + e2bab7b
commit 1daa9e2
Show file tree

Hide file tree

Showing 52 changed files with 3 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -15,3 +15,4 @@
 *.otg      binary
 *.png      binary
 *.hsx      binary
+*.serialized binary
diff --git a/...rc/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java b/...rc/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
@@ -227,7 +227,7 @@ class SpringSecurityCoreVersionSerializableTests {
 	@Disabled("This method should only be used to serialize the classes once")
 	void serializeCurrentVersionClasses(Class<?> clazz) throws Exception {
 		Files.createDirectories(currentVersionFolder);
-		Path filePath = Paths.get(currentVersionFolder.toAbsolutePath() + "/" + clazz.getName());
+		Path filePath = Paths.get(currentVersionFolder.toAbsolutePath() + "/" + clazz.getName() + ".serialized");
 		File file = filePath.toFile();
 		if (file.exists()) {
 			return;
@@ -252,7 +252,7 @@ void shouldBeAbleToDeserializeClassFromPreviousVersion(Path filePath) {
 		try (FileInputStream fileInputStream = new FileInputStream(filePath.toFile());
 				ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream)) {
 			Object obj = objectInputStream.readObject();
-			Class<?> clazz = Class.forName(filePath.getFileName().toString());
+			Class<?> clazz = Class.forName(filePath.getFileName().toString().replace(".serialized", ""));
 			assertThat(obj).isInstanceOf(clazz);
 		}
 		catch (IOException | ClassNotFoundException ex) {

diff --git a/....security.access.intercept.RunAsUserToken → ...ccess.intercept.RunAsUserToken.serialized b/....security.access.intercept.RunAsUserToken → ...ccess.intercept.RunAsUserToken.serialized
diff --git a/...hentication.RememberMeAuthenticationToken → ....RememberMeAuthenticationToken.serialized b/...hentication.RememberMeAuthenticationToken → ....RememberMeAuthenticationToken.serialized
diff --git a/...ation.UsernamePasswordAuthenticationToken → ...amePasswordAuthenticationToken.serialized b/...ation.UsernamePasswordAuthenticationToken → ...amePasswordAuthenticationToken.serialized
diff --git a/...thentication.jaas.JaasAuthenticationToken → ...n.jaas.JaasAuthenticationToken.serialized b/...thentication.jaas.JaasAuthenticationToken → ...n.jaas.JaasAuthenticationToken.serialized
diff --git a/....authentication.jaas.JaasGrantedAuthority → ...tion.jaas.JaasGrantedAuthority.serialized b/....authentication.jaas.JaasGrantedAuthority → ...tion.jaas.JaasGrantedAuthority.serialized
diff --git a/...ntication.CasAssertionAuthenticationToken → ...asAssertionAuthenticationToken.serialized b/...ntication.CasAssertionAuthenticationToken → ...asAssertionAuthenticationToken.serialized
diff --git a/...cas.authentication.CasAuthenticationToken → ...ication.CasAuthenticationToken.serialized b/...cas.authentication.CasAuthenticationToken → ...ication.CasAuthenticationToken.serialized
diff --git a/...ation.CasServiceTicketAuthenticationToken → ...rviceTicketAuthenticationToken.serialized b/...ation.CasServiceTicketAuthenticationToken → ...rviceTicketAuthenticationToken.serialized
diff --git a/...ity.core.authority.SimpleGrantedAuthority → ...thority.SimpleGrantedAuthority.serialized b/...ity.core.authority.SimpleGrantedAuthority → ...thority.SimpleGrantedAuthority.serialized
diff --git a/...security.core.context.SecurityContextImpl → ...re.context.SecurityContextImpl.serialized b/...security.core.context.SecurityContextImpl → ...re.context.SecurityContextImpl.serialized
diff --git a/....security.core.session.SessionInformation → ...ore.session.SessionInformation.serialized b/....security.core.session.SessionInformation → ...ore.session.SessionInformation.serialized
diff --git a/...core.userdetails.User$AuthorityComparator → ...tails.User$AuthorityComparator.serialized b/...core.userdetails.User$AuthorityComparator → ...tails.User$AuthorityComparator.serialized
diff --git a/...gframework.security.core.userdetails.User → ...security.core.userdetails.User.serialized b/...gframework.security.core.userdetails.User → ...security.core.userdetails.User.serialized
diff --git a/...k.security.ldap.userdetails.InetOrgPerson → ...ldap.userdetails.InetOrgPerson.serialized b/...k.security.ldap.userdetails.InetOrgPerson → ...ldap.userdetails.InetOrgPerson.serialized
diff --git a/...rity.ldap.userdetails.LdapUserDetailsImpl → ...serdetails.LdapUserDetailsImpl.serialized b/...rity.ldap.userdetails.LdapUserDetailsImpl → ...serdetails.LdapUserDetailsImpl.serialized
diff --git a/...ramework.security.ldap.userdetails.Person → ...curity.ldap.userdetails.Person.serialized b/...ramework.security.ldap.userdetails.Person → ...curity.ldap.userdetails.Person.serialized
diff --git a/...rity.oauth2.client.OAuth2AuthorizedClient → ....client.OAuth2AuthorizedClient.serialized b/...rity.oauth2.client.OAuth2AuthorizedClient → ....client.OAuth2AuthorizedClient.serialized
diff --git a/...ty.oauth2.client.OAuth2AuthorizedClientId → ...lient.OAuth2AuthorizedClientId.serialized b/...ty.oauth2.client.OAuth2AuthorizedClientId → ...lient.OAuth2AuthorizedClientId.serialized
diff --git a/....authentication.OAuth2AuthenticationToken → ...tion.OAuth2AuthenticationToken.serialized b/....authentication.OAuth2AuthenticationToken → ...tion.OAuth2AuthenticationToken.serialized
diff --git a/...Auth2AuthorizationCodeAuthenticationToken → ...izationCodeAuthenticationToken.serialized b/...Auth2AuthorizationCodeAuthenticationToken → ...izationCodeAuthenticationToken.serialized
diff --git a/...entication.OAuth2LoginAuthenticationToken → ...OAuth2LoginAuthenticationToken.serialized b/...entication.OAuth2LoginAuthenticationToken → ...OAuth2LoginAuthenticationToken.serialized
diff --git a/...t.registration.ClientRegistration$Builder → ...ion.ClientRegistration$Builder.serialized b/...t.registration.ClientRegistration$Builder → ...ion.ClientRegistration$Builder.serialized
diff --git a/...h2.client.registration.ClientRegistration → ...egistration.ClientRegistration.serialized b/...h2.client.registration.ClientRegistration → ...egistration.ClientRegistration.serialized
diff --git a/...security.oauth2.core.AuthenticationMethod → ...uth2.core.AuthenticationMethod.serialized b/...security.oauth2.core.AuthenticationMethod → ...uth2.core.AuthenticationMethod.serialized
diff --git a/...curity.oauth2.core.AuthorizationGrantType → ...h2.core.AuthorizationGrantType.serialized b/...curity.oauth2.core.AuthorizationGrantType → ...h2.core.AuthorizationGrantType.serialized
diff --git a/...rces/serialized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod b/...rces/serialized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod
diff --git a/...ized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod.serialized b/...ized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod.serialized
diff --git a/...y.oauth2.core.OAuth2AccessToken$TokenType → ...re.OAuth2AccessToken$TokenType.serialized b/...y.oauth2.core.OAuth2AccessToken$TokenType → ...re.OAuth2AccessToken$TokenType.serialized
diff --git a/...ramework.security.oauth2.core.OAuth2Error → ...curity.oauth2.core.OAuth2Error.serialized b/...ramework.security.oauth2.core.OAuth2Error → ...curity.oauth2.core.OAuth2Error.serialized
diff --git a/...core.endpoint.OAuth2AuthorizationExchange → ...nt.OAuth2AuthorizationExchange.serialized b/...core.endpoint.OAuth2AuthorizationExchange → ...nt.OAuth2AuthorizationExchange.serialized
diff --git a/....core.endpoint.OAuth2AuthorizationRequest → ...int.OAuth2AuthorizationRequest.serialized b/....core.endpoint.OAuth2AuthorizationRequest → ...int.OAuth2AuthorizationRequest.serialized
diff --git a/...core.endpoint.OAuth2AuthorizationResponse → ...nt.OAuth2AuthorizationResponse.serialized b/...core.endpoint.OAuth2AuthorizationResponse → ...nt.OAuth2AuthorizationResponse.serialized
diff --git a/....endpoint.OAuth2AuthorizationResponseType → ...Auth2AuthorizationResponseType.serialized b/....endpoint.OAuth2AuthorizationResponseType → ...Auth2AuthorizationResponseType.serialized
diff --git a/...rk.security.oauth2.core.oidc.OidcUserInfo → ....oauth2.core.oidc.OidcUserInfo.serialized b/...rk.security.oauth2.core.oidc.OidcUserInfo → ....oauth2.core.oidc.OidcUserInfo.serialized
diff --git a/...curity.oauth2.core.user.DefaultOAuth2User → ...h2.core.user.DefaultOAuth2User.serialized b/...curity.oauth2.core.user.DefaultOAuth2User → ...h2.core.user.DefaultOAuth2User.serialized
diff --git a/...rity.oauth2.core.user.OAuth2UserAuthority → ....core.user.OAuth2UserAuthority.serialized b/...rity.oauth2.core.user.OAuth2UserAuthority → ....core.user.OAuth2UserAuthority.serialized
diff --git a/...r.resource.BearerTokenAuthenticationToken → ...BearerTokenAuthenticationToken.serialized b/...r.resource.BearerTokenAuthenticationToken → ...BearerTokenAuthenticationToken.serialized
diff --git a/....authentication.BearerTokenAuthentication → ...tion.BearerTokenAuthentication.serialized b/....authentication.BearerTokenAuthentication → ...tion.BearerTokenAuthentication.serialized
diff --git a/...entication.BearerTokenAuthenticationToken → ...BearerTokenAuthenticationToken.serialized b/...entication.BearerTokenAuthenticationToken → ...BearerTokenAuthenticationToken.serialized
diff --git a/...rce.authentication.JwtAuthenticationToken → ...ication.JwtAuthenticationToken.serialized b/...rce.authentication.JwtAuthenticationToken → ...ication.JwtAuthenticationToken.serialized
diff --git a/...amework.security.provisioning.MutableUser → ...urity.provisioning.MutableUser.serialized b/...amework.security.provisioning.MutableUser → ...urity.provisioning.MutableUser.serialized
diff --git a/...ig/src/test/resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error b/...ig/src/test/resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error
diff --git a/.../resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error.serialized b/.../resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error.serialized
diff --git a/...b.authentication.WebAuthenticationDetails → ...ation.WebAuthenticationDetails.serialized b/...b.authentication.WebAuthenticationDetails → ...ation.WebAuthenticationDetails.serialized
diff --git a/...eauth.PreAuthenticatedAuthenticationToken → ...thenticatedAuthenticationToken.serialized b/...eauth.PreAuthenticatedAuthenticationToken → ...thenticatedAuthenticationToken.serialized
diff --git a/...rantedAuthoritiesWebAuthenticationDetails → ...ritiesWebAuthenticationDetails.serialized b/...rantedAuthoritiesWebAuthenticationDetails → ...ritiesWebAuthenticationDetails.serialized
diff --git a/...ion.switchuser.SwitchUserGrantedAuthority → ...ser.SwitchUserGrantedAuthority.serialized b/...ion.switchuser.SwitchUserGrantedAuthority → ...ser.SwitchUserGrantedAuthority.serialized
diff --git a/...ources/serialized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest b/...ources/serialized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest
diff --git a/...alized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest.serialized b/...alized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest.serialized
diff --git a/...ork.security.web.savedrequest.SavedCookie → ...y.web.savedrequest.SavedCookie.serialized b/...ork.security.web.savedrequest.SavedCookie → ...y.web.savedrequest.SavedCookie.serialized