Merge pull request #61 from sswguo/duration_setting

sswguo · web-flow · commit 6e65e6a67203 · 2024-12-18T16:40:55.000+08:00
Add timeout for fetching token
diff --git a/src/main/java/org/commonjava/service/metadata/client/util/CustomClientRequestFilter.java b/src/main/java/org/commonjava/service/metadata/client/util/CustomClientRequestFilter.java
@@ -29,6 +29,8 @@
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.ext.Provider;
 
+import java.time.Duration;
+
 @Provider
 @Priority(Priorities.AUTHENTICATION)
 public class CustomClientRequestFilter implements ClientRequestFilter
@@ -51,7 +53,7 @@ public void filter( ClientRequestContext requestContext )
             if ( tokens == null || tokens.isAccessTokenExpired() )
             {
                 logger.debug("Security enabled, get oidc Tokens");
-                tokens = client.getTokens().await().indefinitely();
+                tokens = client.getTokens().await().atMost( Duration.ofSeconds( 30 ) );
             }
             requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + tokens.getAccessToken());
         }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`	`import jakarta.ws.rs.core.HttpHeaders;`
`30`	`30`	`import jakarta.ws.rs.ext.Provider;`
`31`	`31`
	`32`	`+import java.time.Duration;`
	`33`	`+`
`32`	`34`	`@Provider`
`33`	`35`	`@Priority(Priorities.AUTHENTICATION)`
`34`	`36`	`public class CustomClientRequestFilter implements ClientRequestFilter`
`@@ -51,7 +53,7 @@ public void filter( ClientRequestContext requestContext )`
`51`	`53`	`if ( tokens == null \|\| tokens.isAccessTokenExpired() )`
`52`	`54`	`{`
`53`	`55`	`logger.debug("Security enabled, get oidc Tokens");`
`54`		`- tokens = client.getTokens().await().indefinitely();`
	`56`	`+ tokens = client.getTokens().await().atMost( Duration.ofSeconds( 30 ) );`
`55`	`57`	`}`
`56`	`58`	`requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + tokens.getAccessToken());`
`57`	`59`	`}`