apply review feedback and update java docs to clarify authentication retry behaviour
This commit is contained in:
parent
7a9eb0b296
commit
9e8f29ee3a
@ -328,7 +328,7 @@ class AuthenticationFilter implements HeaderFilter {
|
|||||||
req = HttpRequestImpl.newInstanceForAuthentication(req);
|
req = HttpRequestImpl.newInstanceForAuthentication(req);
|
||||||
addBasicCredentials(req, proxy, pw, isUTF8);
|
addBasicCredentials(req, proxy, pw, isUTF8);
|
||||||
return req;
|
return req;
|
||||||
} else if (au.retries >= retry_limit) {
|
} else if (au.retries > retry_limit) {
|
||||||
throw new IOException("too many authentication attempts. Limit: " +
|
throw new IOException("too many authentication attempts. Limit: " +
|
||||||
retry_limit);
|
retry_limit);
|
||||||
} else {
|
} else {
|
||||||
|
@ -156,7 +156,8 @@
|
|||||||
* </li>
|
* </li>
|
||||||
* <li><p><b>{@systemProperty jdk.httpclient.auth.retrylimit}</b> (default: 3)<br>
|
* <li><p><b>{@systemProperty jdk.httpclient.auth.retrylimit}</b> (default: 3)<br>
|
||||||
* The number of attempts the Basic authentication filter will attempt to retry a failed
|
* The number of attempts the Basic authentication filter will attempt to retry a failed
|
||||||
* authentication.
|
* authentication. The number of authentication attempts is always one greater than the
|
||||||
|
* retry limit, as the initial request does not count toward the retries.
|
||||||
* </li>
|
* </li>
|
||||||
* <li><p><b>{@systemProperty jdk.httpclient.sendBufferSize}</b> (default: operating system
|
* <li><p><b>{@systemProperty jdk.httpclient.sendBufferSize}</b> (default: operating system
|
||||||
* default)<br>The HTTP client {@linkplain java.nio.channels.SocketChannel socket}
|
* default)<br>The HTTP client {@linkplain java.nio.channels.SocketChannel socket}
|
||||||
|
@ -129,11 +129,7 @@ class HttpClientAuthRetryLimitTest implements HttpServerAdapters {
|
|||||||
request, HttpResponse.BodyHandlers.discarding()));
|
request, HttpResponse.BodyHandlers.discarding()));
|
||||||
assertEquals("too many authentication attempts. Limit: " + RETRY_LIMIT, exception.getMessage());
|
assertEquals("too many authentication attempts. Limit: " + RETRY_LIMIT, exception.getMessage());
|
||||||
int totalRequestCount = requestCount.get();
|
int totalRequestCount = requestCount.get();
|
||||||
if (RETRY_LIMIT > 0){
|
assertEquals(totalRequestCount, Math.max(RETRY_LIMIT, 0) + 1);
|
||||||
assertEquals(RETRY_LIMIT, totalRequestCount);
|
|
||||||
} else {
|
|
||||||
assertEquals(0, totalRequestCount - 1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user