-
Notifications
You must be signed in to change notification settings - Fork 6.1k
Add JSON session support for SwitchUserGrantedAuthority #11758
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0e281be
Add SwitchUserGrantedAuthorityMixIn
markusheiden 40f99a8
Add tests
markusheiden 9f82a00
Add license
markusheiden 5cb1d1e
Fix format
markusheiden ac6e7fa
Fix format
markusheiden f41a310
Fix import order
markusheiden 0f33227
Fix order of imports
markusheiden File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
46 changes: 46 additions & 0 deletions
46
.../main/java/org/springframework/security/web/jackson2/SwitchUserGrantedAuthorityMixIn.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* Copyright 2002-2022 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.security.web.jackson2; | ||
|
||
import com.fasterxml.jackson.annotation.JsonAutoDetect; | ||
import com.fasterxml.jackson.annotation.JsonCreator; | ||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
import com.fasterxml.jackson.annotation.JsonProperty; | ||
import com.fasterxml.jackson.annotation.JsonTypeInfo; | ||
|
||
import org.springframework.security.core.Authentication; | ||
import org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority; | ||
|
||
/** | ||
* Jackson mixin class to serialize/deserialize {@link SwitchUserGrantedAuthority}. | ||
* | ||
* @author Markus Heiden | ||
* @since 5.8 | ||
* @see WebServletJackson2Module | ||
* @see org.springframework.security.jackson2.SecurityJackson2Modules | ||
*/ | ||
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) | ||
@JsonIgnoreProperties(ignoreUnknown = true) | ||
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, | ||
isGetterVisibility = JsonAutoDetect.Visibility.NONE) | ||
public abstract class SwitchUserGrantedAuthorityMixIn { | ||
|
||
@JsonCreator | ||
SwitchUserGrantedAuthorityMixIn(@JsonProperty("role") String role, @JsonProperty("source") Authentication source) { | ||
} | ||
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
...t/java/org/springframework/security/web/jackson2/SwitchUserGrantedAuthorityMixInTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/* | ||
* Copyright 2002-2022 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.security.web.jackson2; | ||
|
||
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.Test; | ||
import org.skyscreamer.jsonassert.JSONAssert; | ||
|
||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; | ||
import org.springframework.security.core.Authentication; | ||
import org.springframework.security.core.authority.AuthorityUtils; | ||
import org.springframework.security.jackson2.AbstractMixinTests; | ||
import org.springframework.security.jackson2.SimpleGrantedAuthorityMixinTests; | ||
import org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
/** | ||
* @author Markus Heiden | ||
* @since 5.8 | ||
*/ | ||
public class SwitchUserGrantedAuthorityMixInTest extends AbstractMixinTests { | ||
|
||
// language=JSON | ||
private static final String SWITCH_JSON = """ | ||
{ | ||
"@class": "org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority", | ||
"role": "switched", | ||
"source": { | ||
"@class": "org.springframework.security.authentication.UsernamePasswordAuthenticationToken", | ||
"principal": "principal", | ||
"credentials": "credentials", | ||
"authenticated": true, | ||
"details": null, | ||
"authorities": %s | ||
} | ||
} | ||
""".formatted(SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON); | ||
SwitchUserGrantedAuthority expected; | ||
|
||
Authentication source; | ||
|
||
@BeforeEach | ||
public void setupExpected() { | ||
this.source = new UsernamePasswordAuthenticationToken("principal", "credentials", | ||
AuthorityUtils.createAuthorityList("ROLE_USER")); | ||
this.expected = new SwitchUserGrantedAuthority("switched", this.source); | ||
} | ||
|
||
@Test | ||
public void serializeWhenPrincipalCredentialsAuthoritiesThenSuccess() throws Exception { | ||
String serializedJson = this.mapper.writeValueAsString(this.expected); | ||
JSONAssert.assertEquals(SWITCH_JSON, serializedJson, true); | ||
} | ||
|
||
@Test | ||
public void deserializeAuthenticatedUsernamePasswordAuthenticationTokenMixinTest() throws Exception { | ||
SwitchUserGrantedAuthority deserialized = this.mapper.readValue(SWITCH_JSON, SwitchUserGrantedAuthority.class); | ||
assertThat(deserialized).isNotNull(); | ||
assertThat(deserialized.getAuthority()).isEqualTo("switched"); | ||
assertThat(deserialized.getSource()).isEqualTo(this.source); | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did we forget to set up this mixin for WebServerJackson2Module?