Skip to content

Commit 204bda3

Browse files
committed
fixed bug in claims creation - reusing map(potential unmodifiable map
1 parent d5f38a0 commit 204bda3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
import java.time.Instant;
4040
import java.util.Collection;
41-
import java.util.HashMap;
41+
import java.util.LinkedHashMap;
4242
import java.util.Map;
4343
import java.util.Optional;
4444

@@ -117,7 +117,8 @@ private boolean hasInvalidClaims(Map<String, Object> claims) {
117117

118118
private Map<String, Object> generateTokenIntrospectionClaims(Token<? extends AbstractOAuth2Token> tokenHolder,
119119
String clientId, String username) {
120-
Map<String, Object> claims = Optional.ofNullable(tokenHolder.getClaims()).orElse(new HashMap<>());
120+
Map<String, Object> claims = Optional.ofNullable(tokenHolder.getClaims()).map(LinkedHashMap::new)
121+
.orElse(new LinkedHashMap<>());
121122
AbstractOAuth2Token token = tokenHolder.getToken();
122123
claims.put(ACTIVE, true);
123124
claims.put(CLIENT_ID, clientId);

0 commit comments

Comments
 (0)