Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow at+jwt, according to RFC-9068 #13186

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow at+jwt, according to RFC-9068 #13186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtDecoders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import java.util.Map;

import com.nimbusds.jose.JOSEObjectType;
import com.nimbusds.jose.proc.DefaultJOSEObjectTypeVerifier;
import org.springframework.security.oauth2.core.OAuth2TokenValidator;
import org.springframework.util.Assert;

Expand Down Expand Up @@ -111,7 +113,16 @@ private static JwtDecoder withProviderConfiguration(Map<String, Object> configur
OAuth2TokenValidator<Jwt> jwtValidator = JwtValidators.createDefaultWithIssuer(issuer);
String jwkSetUri = configuration.get("jwks_uri").toString();
NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withJwkSetUri(jwkSetUri)
.jwtProcessorCustomizer(JwtDecoderProviderConfigurationUtils::addJWSAlgorithms).build();
.jwtProcessorCustomizer(customizer -> {
customizer.setJWSTypeVerifier(new DefaultJOSEObjectTypeVerifier<>(
new JOSEObjectType("jwt"), // for compatibility
new JOSEObjectType("application/at+jwt"), // according to RFC-9068
new JOSEObjectType("at+jwt"), // according to RFC-9068
null
));
JwtDecoderProviderConfigurationUtils.addJWSAlgorithms(customizer);
})
.build();
jwtDecoder.setJwtValidator(jwtValidator);
return jwtDecoder;
}
Expand Down
13 changes: 4 additions & 9 deletions oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtValidators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@

package org.springframework.security.oauth2.jwt;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.springframework.security.oauth2.core.DelegatingOAuth2TokenValidator;
import org.springframework.security.oauth2.core.OAuth2TokenValidator;

Expand Down Expand Up @@ -50,10 +46,9 @@ private JwtValidators() {
* supplied
*/
public static OAuth2TokenValidator<Jwt> createDefaultWithIssuer(String issuer) {
List<OAuth2TokenValidator<Jwt>> validators = new ArrayList<>();
validators.add(new JwtTimestampValidator());
validators.add(new JwtIssuerValidator(issuer));
return new DelegatingOAuth2TokenValidator<>(validators);
JwtTimestampValidator jwtTimestampValidator = new JwtTimestampValidator();
JwtIssuerValidator jwtIssuerValidator = new JwtIssuerValidator(issuer);
return new DelegatingOAuth2TokenValidator<>(jwtTimestampValidator, jwtIssuerValidator);
}

/**
Expand All @@ -69,7 +64,7 @@ public static OAuth2TokenValidator<Jwt> createDefaultWithIssuer(String issuer) {
* supplied
*/
public static OAuth2TokenValidator<Jwt> createDefault() {
return new DelegatingOAuth2TokenValidator<>(Arrays.asList(new JwtTimestampValidator()));
return new DelegatingOAuth2TokenValidator<>(new JwtTimestampValidator());
}

}