Skip to content

NimbusReactiveJwtDecoder Takes Reactive Processor #6499

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

Merged
merged 2 commits into from
Mar 18, 2019
Merged

NimbusReactiveJwtDecoder Takes Reactive Processor #6499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07d37d9
Internalize Nimbus JwtDecoder Builder
jzheaux Mar 5, 2019
182d860
NimbusReactiveJwtDecoder Takes Reactive Processor
jzheaux Jan 12, 2019
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
4 changes: 2 additions & 2 deletions ...fig/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.springframework.security.web.util.matcher.RequestMatcher;
import org.springframework.util.Assert;

import static org.springframework.security.oauth2.jwt.JwtProcessors.withJwkSetUri;
import static org.springframework.security.oauth2.jwt.NimbusJwtDecoder.withJwkSetUri;

/**
*
Expand Down Expand Up @@ -246,7 +246,7 @@ public JwtConfigurer decoder(JwtDecoder decoder) {
}

public JwtConfigurer jwkSetUri(String uri) {
this.decoder = new NimbusJwtDecoder(withJwkSetUri(uri).build());
this.decoder = withJwkSetUri(uri).build();
return this;
}

Expand Down
14 changes: 5 additions & 9 deletions ...nnotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
import java.util.stream.Collectors;
import javax.annotation.PreDestroy;

import com.nimbusds.jose.proc.SecurityContext;
import com.nimbusds.jwt.proc.JWTProcessor;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.hamcrest.core.AllOf;
Expand Down Expand Up @@ -85,7 +83,6 @@
import org.springframework.security.oauth2.jwt.JwtClaimNames;
import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.security.oauth2.jwt.JwtException;
import org.springframework.security.oauth2.jwt.JwtProcessors;
import org.springframework.security.oauth2.jwt.JwtTimestampValidator;
import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
Expand Down Expand Up @@ -122,7 +119,8 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.security.oauth2.jwt.JwtProcessors.withPublicKey;
import static org.springframework.security.oauth2.jwt.NimbusJwtDecoder.withJwkSetUri;
import static org.springframework.security.oauth2.jwt.NimbusJwtDecoder.withPublicKey;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
Expand Down Expand Up @@ -1626,7 +1624,7 @@ protected void configure(HttpSecurity http) throws Exception {
JwtDecoder decoder() throws Exception {
RSAPublicKey publicKey = (RSAPublicKey)
KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(this.spec));
return new NimbusJwtDecoder(withPublicKey(publicKey).build());
return withPublicKey(publicKey).build();
}
}

Expand Down Expand Up @@ -1739,10 +1737,8 @@ RestOperations rest() {

@Bean
NimbusJwtDecoder jwtDecoder() {
JWTProcessor<SecurityContext> jwtProcessor =
JwtProcessors.withJwkSetUri("https://example.org/.well-known/jwks.json")
.restOperations(this.rest).build();
return new NimbusJwtDecoder(jwtProcessor);
return withJwkSetUri("https://example.org/.well-known/jwks.json")
.restOperations(this.rest).build();
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
*/
package org.springframework.security.oauth2.client.oidc.authentication;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;

import org.springframework.security.oauth2.client.registration.ClientRegistration;
import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
import org.springframework.security.oauth2.core.OAuth2Error;
Expand All @@ -27,11 +31,7 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;

import static org.springframework.security.oauth2.jwt.JwtProcessors.withJwkSetUri;
import static org.springframework.security.oauth2.jwt.NimbusJwtDecoder.withJwkSetUri;

/**
* A {@link JwtDecoderFactory factory} that provides a {@link JwtDecoder}
Expand Down Expand Up @@ -65,7 +65,7 @@ public JwtDecoder createDecoder(ClientRegistration clientRegistration) {
throw new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString());
}
String jwkSetUri = clientRegistration.getProviderDetails().getJwkSetUri();
NimbusJwtDecoder jwtDecoder = new NimbusJwtDecoder(withJwkSetUri(jwkSetUri).build());
NimbusJwtDecoder jwtDecoder = withJwkSetUri(jwkSetUri).build();
OAuth2TokenValidator<Jwt> jwtValidator = this.jwtValidatorFactory.apply(clientRegistration);
jwtDecoder.setJwtValidator(jwtValidator);
return jwtDecoder;
Expand Down
43 changes: 0 additions & 43 deletions oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JWKContext.java
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions ...auth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JWKContextJWKSource.java
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions ...oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/JWKSelectorFactory.java
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions 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
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 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.
Expand All @@ -24,7 +24,7 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;

import static org.springframework.security.oauth2.jwt.JwtProcessors.withJwkSetUri;
import static org.springframework.security.oauth2.jwt.NimbusJwtDecoder.withJwkSetUri;

/**
* Allows creating a {@link JwtDecoder} from an
Expand Down Expand Up @@ -60,8 +60,7 @@ public static JwtDecoder fromOidcIssuerLocation(String oidcIssuerLocation) {
OAuth2TokenValidator<Jwt> jwtValidator =
JwtValidators.createDefaultWithIssuer(oidcIssuerLocation);

NimbusJwtDecoder jwtDecoder = new NimbusJwtDecoder(
withJwkSetUri(openidConfiguration.get("jwks_uri").toString()).build());
NimbusJwtDecoder jwtDecoder = withJwkSetUri(openidConfiguration.get("jwks_uri").toString()).build();
jwtDecoder.setJwtValidator(jwtValidator);

return jwtDecoder;
Expand Down
Loading