Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-790: Protocol interceptors not called when executing CONNECT methods 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@685136 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2008-08-12 12:53:49 +00:00
parent 1f7f493c18
commit d2b34bce20
6 changed files with 72 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RELEASE_NOTES.txt
View File

@ -1,7 +1,11 @@
Changes since 4.0 Alpha 4
-------------------
* [HTTPCLIENT-668] Do not use static loggers
* [HTTPCLIENT-790] Protocol interceptors are now correctly invoked when
executing CONNECT methods.
Contributed by Oleg Kalnichevski <olegk at apache.org>
* [HTTPCLIENT-668] Do not use static loggers.
Contributed by Oleg Kalnichevski <olegk at apache.org>
* [HTTPCLIENT-781] Respect Keep-Alive header's timeout value.

5
module-client/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
View File

@ -84,6 +84,11 @@ public class RequestAddCookies implements HttpRequestInterceptor {
throw new IllegalArgumentException("HTTP context may not be null");
}
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT")) {
return;
}
// Obtain cookie store
CookieStore cookieStore = (CookieStore) context.getAttribute(
ClientContext.COOKIE_STORE);

6
module-client/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
View File

@ -61,6 +61,12 @@ public class RequestDefaultHeaders implements HttpRequestInterceptor {
if (request == null) {
throw new IllegalArgumentException("HTTP request may not be null");
}
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT")) {
return;
}
// Add default headers
Collection<?> defHeaders = (Collection<?>) request.getParams().getParameter(
ClientPNames.DEFAULT_HEADERS);

5
module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java
View File

@ -69,6 +69,11 @@ public class RequestTargetAuthentication implements HttpRequestInterceptor {
throw new IllegalArgumentException("HTTP context may not be null");
}
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT")) {
return;
}
if (request.containsHeader(AUTH.WWW_AUTH_RESP)) {
return;
}

31
module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
View File

@ -31,7 +31,12 @@
package org.apache.http.impl.client;
import java.io.IOException;
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
import org.apache.http.HttpVersion;
import org.apache.http.auth.AuthSchemeRegistry;
import org.apache.http.client.AuthenticationHandler;
@ -266,9 +271,9 @@ public class DefaultHttpClient extends AbstractHttpClient {
httpproc.addInterceptor(new RequestDefaultHeaders());
// Required protocol interceptors
httpproc.addInterceptor(new RequestContent());
httpproc.addInterceptor(new RequestTargetHost());
httpproc.addInterceptor(new IgnoreConnectMethod(new RequestTargetHost()));
// Recommended protocol interceptors
httpproc.addInterceptor(new RequestConnControl());
httpproc.addInterceptor(new IgnoreConnectMethod(new RequestConnControl()));
httpproc.addInterceptor(new RequestUserAgent());
httpproc.addInterceptor(new RequestExpectContinue());
// HTTP state management interceptors
@ -329,4 +334,26 @@ public class DefaultHttpClient extends AbstractHttpClient {
return new DefaultUserTokenHandler();
}
// FIXME: remove this class when protocol interceptors in HttpCore
// are updated to ignore CONNECT methods
static class IgnoreConnectMethod implements HttpRequestInterceptor {
private final HttpRequestInterceptor interceptor;
public IgnoreConnectMethod(final HttpRequestInterceptor interceptor) {
super();
this.interceptor = interceptor;
}
public void process(
final HttpRequest request,
final HttpContext context) throws HttpException, IOException {
String method = request.getRequestLine().getMethod();
if (!method.equalsIgnoreCase("CONNECT")) {
this.interceptor.process(request, context);
}
}
}
} // class DefaultHttpClient

47
module-client/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
View File

@ -88,7 +88,6 @@ import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestExecutor;
@ -385,13 +384,12 @@ public class DefaultRequestDirector implements RequestDirector {
targetAuthState);
context.setAttribute(ClientContext.PROXY_AUTH_STATE,
proxyAuthState);
// Run request protocol interceptors
requestExec.preProcess(wrapper, httpProcessor, context);
context.setAttribute(ExecutionContext.HTTP_REQUEST,
wrapper);
// Run request protocol interceptors
requestExec.preProcess(wrapper, httpProcessor, context);
boolean retrying = true;
while (retrying) {
// Increment total exec count (with redirects)
@ -680,29 +678,28 @@ public class DefaultRequestDirector implements RequestDirector {
}
HttpRequest connect = createConnectRequest(route, context);
connect.setParams(this.params);
String agent = HttpProtocolParams.getUserAgent(params);
if (agent != null) {
connect.addHeader(HTTP.USER_AGENT, agent);
}
connect.addHeader(HTTP.TARGET_HOST, target.toHostString());
// Populate the execution context
context.setAttribute(ExecutionContext.HTTP_TARGET_HOST,
target);
context.setAttribute(ExecutionContext.HTTP_PROXY_HOST,
proxy);
context.setAttribute(ExecutionContext.HTTP_CONNECTION,
managedConn);
context.setAttribute(ClientContext.TARGET_AUTH_STATE,
targetAuthState);
context.setAttribute(ClientContext.PROXY_AUTH_STATE,
proxyAuthState);
context.setAttribute(ExecutionContext.HTTP_REQUEST,
connect);
AuthScheme authScheme = this.proxyAuthState.getAuthScheme();
AuthScope authScope = this.proxyAuthState.getAuthScope();
Credentials creds = this.proxyAuthState.getCredentials();
if (creds != null) {
if (authScope != null || !authScheme.isConnectionBased()) {
try {
connect.addHeader(authScheme.authenticate(creds, connect));
} catch (AuthenticationException ex) {
if (this.log.isErrorEnabled()) {
this.log.error("Proxy authentication error: " + ex.getMessage());
}
}
}
}
this.requestExec.preProcess(connect, this.httpProcessor, context);
response = requestExec.execute(connect, this.managedConn, context);
response = this.requestExec.execute(connect, this.managedConn, context);
response.setParams(this.params);
this.requestExec.postProcess(response, this.httpProcessor, context);
int status = response.getStatusLine().getStatusCode();
if (status < 200) {