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

Improved proxy request message generation

This commit is contained in:
Oleg Kalnichevski 2021-03-08 22:27:43 +01:00
parent 3de88293fe
commit 8b29c0680b
4 changed files with 12 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java
View File

@ -27,8 +27,6 @@
package org.apache.hc.client5.http.impl.async;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicBoolean;
@ -62,8 +60,8 @@ import org.apache.hc.core5.http.nio.AsyncDataConsumer;
import org.apache.hc.core5.http.nio.AsyncEntityProducer;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.support.BasicRequestBuilder;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.net.URIBuilder;
import org.apache.hc.core5.util.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -119,17 +117,12 @@ public final class AsyncProtocolExec implements AsyncExecChainHandler {
final HttpRequest request;
if (proxy != null && !route.isTunnelled()) {
try {
URI uri = userRequest.getUri();
if (!uri.isAbsolute()) {
uri = new URIBuilder(uri)
.setHttpHost(target)
.build();
}
request = HttpProxyRequest.rewrite(userRequest, uri);
} catch (final URISyntaxException ex) {
throw new ProtocolException("Invalid request URI: " + userRequest.getRequestUri(), ex);
final BasicRequestBuilder requestBuilder = BasicRequestBuilder.copy(userRequest);
if (requestBuilder.getAuthority() == null) {
requestBuilder.setAuthority(new URIAuthority(target));
}
requestBuilder.setAbsoluteRequestUri(true);
request = requestBuilder.build();
} else {
request = userRequest;
}

58
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpProxyRequest.java
View File

@ -1,58 +0,0 @@
/*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.hc.client5.http.impl.async;
import java.net.URI;
import java.util.Iterator;
import org.apache.hc.client5.http.impl.ProtocolSupport;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.message.BasicHttpRequest;
class HttpProxyRequest extends BasicHttpRequest {
static HttpProxyRequest rewrite(final HttpRequest original, final URI requestUri) {
final HttpProxyRequest copy = new HttpProxyRequest(original.getMethod(), requestUri);
copy.setVersion(original.getVersion());
for (final Iterator<Header> it = original.headerIterator(); it.hasNext(); ) {
copy.addHeader(it.next());
}
return copy;
}
private HttpProxyRequest(final String method, final URI requestUri) {
super(method, requestUri);
}
@Override
public String getRequestUri() {
return ProtocolSupport.getRequestUri(this);
}
}

59
httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ClassicHttpProxyRequest.java
View File

@ -1,59 +0,0 @@
/*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.hc.client5.http.impl.classic;
import java.net.URI;
import java.util.Iterator;
import org.apache.hc.client5.http.impl.ProtocolSupport;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
class ClassicHttpProxyRequest extends BasicClassicHttpRequest {
static ClassicHttpProxyRequest rewrite(final ClassicHttpRequest original, final URI requestUri) {
final ClassicHttpProxyRequest copy = new ClassicHttpProxyRequest(original.getMethod(), requestUri);
copy.setVersion(original.getVersion());
for (final Iterator<Header> it = original.headerIterator(); it.hasNext(); ) {
copy.addHeader(it.next());
}
copy.setEntity(original.getEntity());
return copy;
}
private ClassicHttpProxyRequest(final String method, final URI requestUri) {
super(method, requestUri);
}
@Override
public String getRequestUri() {
return ProtocolSupport.getRequestUri(this);
}
}

19
httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java
View File

@ -28,8 +28,6 @@
package org.apache.hc.client5.http.impl.classic;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Iterator;
import org.apache.hc.client5.http.AuthenticationStrategy;
@ -59,10 +57,10 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.net.URIBuilder;
import org.apache.hc.core5.util.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -124,17 +122,12 @@ public final class ProtocolExec implements ExecChainHandler {
try {
final ClassicHttpRequest request;
if (proxy != null && !route.isTunnelled()) {
try {
URI uri = userRequest.getUri();
if (!uri.isAbsolute()) {
uri = new URIBuilder(uri)
.setHttpHost(target)
.build();
}
request = ClassicHttpProxyRequest.rewrite(userRequest, uri);
} catch (final URISyntaxException ex) {
throw new ProtocolException("Invalid request URI: " + userRequest.getRequestUri(), ex);
final ClassicRequestBuilder requestBuilder = ClassicRequestBuilder.copy(userRequest);
if (requestBuilder.getAuthority() == null) {
requestBuilder.setAuthority(new URIAuthority(target));
}
requestBuilder.setAbsoluteRequestUri(true);
request = requestBuilder.build();
} else {
request = userRequest;
}