libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #5090 from TorstenF76/configure-request-timeout

Browse source 
configurable request timeout
This commit is contained in:
Bill Burke 2018-04-01 13:34:13 -04:00 committed by GitHub
commit 8fe10b3331
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
proxy/proxy-server/src/main/java/org/keycloak/proxy/ProxyConfig.java
View file

@ -56,6 +56,9 @@ public class ProxyConfig {
protected Boolean directBuffers;
@JsonProperty("target-url")
protected String targetUrl;
/** Defaults to 30 seconds */
@JsonProperty("target-request-timeout")
protected Integer targetRequestTimeout = 30000;
@JsonProperty("send-access-token")
protected boolean sendAccessToken;
@JsonProperty("applications")
@ -159,6 +162,14 @@ public class ProxyConfig {
this.targetUrl = targetUrl;
}
public Integer getTargetRequestTimeout() {
return targetRequestTimeout;
}
public void setTargetRequestTimeout(Integer targetRequestTimeout) {
this.targetRequestTimeout = targetRequestTimeout;
}
public List<Application> getApplications() {
return applications;
}

8
proxy/proxy-server/src/main/java/org/keycloak/proxy/ProxyServerBuilder.java
View file

@ -97,14 +97,14 @@ public class ProxyServerBuilder {
protected Map<String, String> headerNameConfig;
public ProxyServerBuilder target(String uri) {
public ProxyServerBuilder target(ProxyConfig config) {
SimpleProxyClientProvider provider = null;
try {
provider = new SimpleProxyClientProvider(new URI(uri));
provider = new SimpleProxyClientProvider(new URI(config.getTargetUrl()));
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
final HttpHandler handler = new ProxyHandler(provider, 30000, ResponseCodeHandler.HANDLE_404);
final HttpHandler handler = new ProxyHandler(provider, config.getTargetRequestTimeout(), ResponseCodeHandler.HANDLE_404);
proxyHandler = new HttpHandler() {
@Override
public void handleRequest(HttpServerExchange exchange) throws Exception {
@ -385,7 +385,7 @@ public class ProxyServerBuilder {
log.error("Must set Target URL");
return null;
}
builder.target(config.getTargetUrl());
builder.target(config);
if (config.getApplications() == null || config.getApplications().size() == 0) {
log.error("No applications defined");
return null;