Merge remote-tracking branch 'origin/gh-14269' into gh-14269

spring-projects · Apr 17, 2024 · 35bcb37 · 35bcb37
2 parents 5adf0b6 + 4afa21c
commit 35bcb37
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoder.java b/...2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoder.java
@@ -272,7 +272,16 @@ public static final class JwkSetUriJwtDecoderBuilder {
 
 		private Set<SignatureAlgorithm> signatureAlgorithms = new HashSet<>();
 
-		private RestOperations restOperations = new RestTemplate();
+		private RestOperations restOperations = this.buildRestTemplateWithDefaultTimeoutValues();
+
+		private RestTemplate buildRestTemplateWithDefaultTimeoutValues() {
+			int connectTimeout = Integer.parseInt(System.getProperty("sun.net.client.defaultConnectTimeout", "30000"));
+			int readTimeout = Integer.parseInt(System.getProperty("sun.net.client.defaultReadTimeout", "30000"));
+			SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+			requestFactory.setConnectTimeout(connectTimeout);
+			requestFactory.setReadTimeout(readTimeout);
+			return new RestTemplate(requestFactory);
+		}
 
 		private Cache cache;