Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-07 03:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polish NimbusJwtDecoder

Browse Source 
- Follow convention to prefix member variable references with "this."
- Reduce stack trace when IOException is thrown
- Name tests to follow conventions

Issue gh-8332
This commit is contained in:
Josh Cummings 2020-04-10 16:39:01 -06:00
parent 9133cc24e4
commit 10aa9743ed
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoder.java
View File

@ -365,7 +365,14 @@ public final class NimbusJwtDecoder implements JwtDecoder {
public Resource retrieveResource(URL url) throws IOException { public Resource retrieveResource(URL url) throws IOException {
String jwkSet; String jwkSet;
try { try {
jwkSet = cache.get(url.toString(), () -> resourceRetriever.retrieveResource(url).getContent()); jwkSet = this.cache.get(url.toString(),
() -> this.resourceRetriever.retrieveResource(url).getContent());
} catch (Cache.ValueRetrievalException ex) {
Throwable thrownByValueLoader = ex.getCause();
if (thrownByValueLoader instanceof IOException) {
throw (IOException) thrownByValueLoader;
}
throw new IOException(thrownByValueLoader);
} catch (Exception ex) { } catch (Exception ex) {
throw new IOException(ex); throw new IOException(ex);
} }

10
oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java
View File

@ -255,7 +255,7 @@ public class NimbusJwtDecoderTests {
} }
@Test @Test
public void shouldThrowJwtExceptionWhenJwkSetEndpointHasNotRespondedAndCacheIsConfigured() throws Exception { public void decodeWhenJwkEndpointIsUnresponsiveAndCacheIsConfiguredThenReturnsJwtException() throws Exception {
try ( MockWebServer server = new MockWebServer() ) { try ( MockWebServer server = new MockWebServer() ) {
Cache cache = new ConcurrentMapCache("test-jwk-set-cache"); Cache cache = new ConcurrentMapCache("test-jwk-set-cache");
String jwkSetUri = server.url("/.well-known/jwks.json").toString(); String jwkSetUri = server.url("/.well-known/jwks.json").toString();
@ -287,7 +287,7 @@ public class NimbusJwtDecoderTests {
} }
@Test @Test
public void shouldThrowIllegalArgumentExceptionWhenJwkSetCacheIsNull() { public void cacheWhenNullThenThrowsException() {
NimbusJwtDecoder.JwkSetUriJwtDecoderBuilder builder = withJwkSetUri(JWK_SET_URI); NimbusJwtDecoder.JwkSetUriJwtDecoderBuilder builder = withJwkSetUri(JWK_SET_URI);
Assertions.assertThatCode(() -> builder.cache(null)).isInstanceOf(IllegalArgumentException.class); Assertions.assertThatCode(() -> builder.cache(null)).isInstanceOf(IllegalArgumentException.class);
} }
@ -465,7 +465,7 @@ public class NimbusJwtDecoderTests {
} }
@Test @Test
public void shouldStoreRetrievedJwkSetToCache() { public void decodeWhenCacheThenStoreRetrievedJwkSetToCache() {
// given // given
Cache cache = new ConcurrentMapCache("test-jwk-set-cache"); Cache cache = new ConcurrentMapCache("test-jwk-set-cache");
RestOperations restOperations = mock(RestOperations.class); RestOperations restOperations = mock(RestOperations.class);
@ -487,7 +487,7 @@ public class NimbusJwtDecoderTests {
} }
@Test @Test
public void shouldDecodeJwtUsingJwkSetCache() { public void decodeWhenCacheThenRetrieveFromCache() {
// given // given
RestOperations restOperations = mock(RestOperations.class); RestOperations restOperations = mock(RestOperations.class);
Cache cache = mock(Cache.class); Cache cache = mock(Cache.class);
@ -505,7 +505,7 @@ public class NimbusJwtDecoderTests {
} }
@Test @Test
public void shouldThrowJwtExceptionWhenExceptionOccurredWhileRetrievingJwkSetInsideCachingRetriever() { public void decodeWhenCacheIsConfiguredAndValueLoaderErrorsThenThrowsJwtException() {
// given // given
Cache cache = new ConcurrentMapCache("test-jwk-set-cache"); Cache cache = new ConcurrentMapCache("test-jwk-set-cache");
RestOperations restOperations = mock(RestOperations.class); RestOperations restOperations = mock(RestOperations.class);