Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JSON UserDetails deserializes null

Browse Source 
JSON UserDetails null use to be treated as "".

This changes null to be treated as a null

Issue gh-3736
This commit is contained in:
Rob Winch
2016-09-01 15:01:13 -05:00
parent 3fb77f3b59
commit df613ed4cc
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/springframework/security/jackson2/UserDeserializer.java
View File

@@ -58,12 +58,18 @@ class UserDeserializer extends JsonDeserializer<User> {
JsonNode jsonNode = mapper.readTree(jp);
Set<GrantedAuthority> authorities = mapper.convertValue(jsonNode.get("authorities"), new TypeReference<Set<SimpleGrantedAuthority>>() {
});
return new User(
readJsonNode(jsonNode, "username").asText(), readJsonNode(jsonNode, "password").asText(""),
JsonNode password = readJsonNode(jsonNode, "password");
User result = new User(
readJsonNode(jsonNode, "username").asText(), password.asText(""),
readJsonNode(jsonNode, "enabled").asBoolean(), readJsonNode(jsonNode, "accountNonExpired").asBoolean(),
readJsonNode(jsonNode, "credentialsNonExpired").asBoolean(),
readJsonNode(jsonNode, "accountNonLocked").asBoolean(), authorities
);
if(password.asText(null) == null) {
result.eraseCredentials();
}
return result;
}
private JsonNode readJsonNode(JsonNode jsonNode, String field) {