Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish gh-11758

This commit is contained in:
Steve Riesenberg 2024-02-29 12:15:30 -06:00
parent 5c5503924b
commit bd345fb2a8
No known key found for this signature in database
GPG Key ID: 3D0169B18AB8F0A9
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/main/java/org/springframework/security/web/jackson2/SwitchUserGrantedAuthorityMixIn.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,15 +29,15 @@ import org.springframework.security.web.authentication.switchuser.SwitchUserGran
* Jackson mixin class to serialize/deserialize {@link SwitchUserGrantedAuthority}. * Jackson mixin class to serialize/deserialize {@link SwitchUserGrantedAuthority}.
* *
* @author Markus Heiden * @author Markus Heiden
* @since 5.8 * @since 6.3
* @see WebServletJackson2Module * @see WebServletJackson2Module
* @see org.springframework.security.jackson2.SecurityJackson2Modules * @see org.springframework.security.jackson2.SecurityJackson2Modules
*/ */
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
isGetterVisibility = JsonAutoDetect.Visibility.NONE) isGetterVisibility = JsonAutoDetect.Visibility.NONE)
public abstract class SwitchUserGrantedAuthorityMixIn { @JsonIgnoreProperties(ignoreUnknown = true)
abstract class SwitchUserGrantedAuthorityMixIn {
@JsonCreator @JsonCreator
SwitchUserGrantedAuthorityMixIn(@JsonProperty("role") String role, @JsonProperty("source") Authentication source) { SwitchUserGrantedAuthorityMixIn(@JsonProperty("role") String role, @JsonProperty("source") Authentication source) {

14
web/src/main/java/org/springframework/security/web/jackson2/WebServletJackson2Module.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2015-2016 the original author or authors. * Copyright 2015-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -27,12 +27,12 @@ import org.springframework.security.web.savedrequest.DefaultSavedRequest;
import org.springframework.security.web.savedrequest.SavedCookie; import org.springframework.security.web.savedrequest.SavedCookie;
/** /**
* Jackson module for spring-security-web related to servlet. This module register * Jackson module for spring-security-web related to servlet. This module registers
* {@link CookieMixin}, {@link SavedCookieMixin}, {@link DefaultSavedRequestMixin} and * {@link CookieMixin}, {@link SavedCookieMixin}, {@link DefaultSavedRequestMixin},
* {@link WebAuthenticationDetailsMixin}. If no default typing enabled by default then * {@link WebAuthenticationDetailsMixin}, and {@link SwitchUserGrantedAuthorityMixIn}. If
* it'll enable it because typing info is needed to properly serialize/deserialize * no default typing is enabled by default then it will be enabled, because typing info is
* objects. In order to use this module just add this module into your ObjectMapper * needed to properly serialize/deserialize objects. In order to use this module just add
* configuration. * this module into your ObjectMapper configuration.
* *
* <pre> * <pre>
* ObjectMapper mapper = new ObjectMapper(); * ObjectMapper mapper = new ObjectMapper();

17
web/src/test/java/org/springframework/security/web/jackson2/SwitchUserGrantedAuthorityMixInTest.java → web/src/test/java/org/springframework/security/web/jackson2/SwitchUserGrantedAuthorityMixInTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,9 +31,9 @@ import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Markus Heiden * @author Markus Heiden
* @since 5.8 * @since 6.3
*/ */
public class SwitchUserGrantedAuthorityMixInTest extends AbstractMixinTests { public class SwitchUserGrantedAuthorityMixInTests extends AbstractMixinTests {
// language=JSON // language=JSON
private static final String SWITCH_JSON = """ private static final String SWITCH_JSON = """
@ -50,25 +50,24 @@ public class SwitchUserGrantedAuthorityMixInTest extends AbstractMixinTests {
} }
} }
""".formatted(SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON); """.formatted(SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON);
SwitchUserGrantedAuthority expected;
Authentication source; private Authentication source;
@BeforeEach @BeforeEach
public void setupExpected() { public void setUp() {
this.source = new UsernamePasswordAuthenticationToken("principal", "credentials", this.source = new UsernamePasswordAuthenticationToken("principal", "credentials",
AuthorityUtils.createAuthorityList("ROLE_USER")); AuthorityUtils.createAuthorityList("ROLE_USER"));
this.expected = new SwitchUserGrantedAuthority("switched", this.source);
} }
@Test @Test
public void serializeWhenPrincipalCredentialsAuthoritiesThenSuccess() throws Exception { public void serializeWhenPrincipalCredentialsAuthoritiesThenSuccess() throws Exception {
String serializedJson = this.mapper.writeValueAsString(this.expected); SwitchUserGrantedAuthority expected = new SwitchUserGrantedAuthority("switched", this.source);
String serializedJson = this.mapper.writeValueAsString(expected);
JSONAssert.assertEquals(SWITCH_JSON, serializedJson, true); JSONAssert.assertEquals(SWITCH_JSON, serializedJson, true);
} }
@Test @Test
public void deserializeAuthenticatedUsernamePasswordAuthenticationTokenMixinTest() throws Exception { public void deserializeWhenSourceIsUsernamePasswordAuthenticationTokenThenSuccess() throws Exception {
SwitchUserGrantedAuthority deserialized = this.mapper.readValue(SWITCH_JSON, SwitchUserGrantedAuthority.class); SwitchUserGrantedAuthority deserialized = this.mapper.readValue(SWITCH_JSON, SwitchUserGrantedAuthority.class);
assertThat(deserialized).isNotNull(); assertThat(deserialized).isNotNull();
assertThat(deserialized.getAuthority()).isEqualTo("switched"); assertThat(deserialized.getAuthority()).isEqualTo("switched");