Skip to content

Update remaining tests to use http client 5 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cwperks merged 2 commits into from
Oct 13, 2022
Merged

Update remaining tests to use http client 5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81eb84a
Changes tests to use Http 5.x client
DarshitChanpura Oct 13, 2022
8e64c2e
Merge Craig's branch
DarshitChanpura Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/security/auditlog/impl/AuditMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.client.utils.URIBuilder;
import org.apache.hc.core5.net.URIBuilder;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/opensearch/security/httpclient/HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
import org.apache.hc.client5.http.nio.AsyncClientConnectionManager;
import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.message.BasicHeader;
Expand All @@ -45,8 +47,6 @@
import org.apache.hc.core5.ssl.PrivateKeyStrategy;
import org.apache.hc.core5.ssl.SSLContextBuilder;
import org.apache.hc.core5.ssl.SSLContexts;
import org.apache.http.conn.ssl.DefaultHostnameVerifier;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down Expand Up @@ -241,7 +241,7 @@ public String chooseAlias(Map<String, PrivateKeyDetails> aliases, SSLParameters
});
}

final HostnameVerifier hnv = verifyHostnames?new DefaultHostnameVerifier():NoopHostnameVerifier.INSTANCE;
final HostnameVerifier hnv = verifyHostnames ? new DefaultHostnameVerifier() : NoopHostnameVerifier.INSTANCE;

final SSLContext sslContext = sslContextBuilder.build();
TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create()
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opensearch/security/tools/SecurityAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@
import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
import org.apache.hc.client5.http.nio.AsyncClientConnectionManager;
import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
import org.apache.hc.core5.ssl.SSLContextBuilder;
import org.apache.hc.core5.ssl.SSLContexts;
import org.apache.http.conn.ssl.DefaultHostnameVerifier;
import org.apache.http.conn.ssl.NoopHostnameVerifier;

import org.opensearch.ExceptionsHelper;
import org.opensearch.OpenSearchException;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/amazon/dlic/auth/http/jwt/HTTPJwtAuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import io.jsonwebtoken.security.Keys;
import org.apache.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHeaders;
import org.junit.Assert;
import org.junit.Test;

Expand Down
7 changes: 1 addition & 6 deletions src/test/java/com/amazon/dlic/auth/http/jwt/keybyoidc/KeySetRetrieverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpCoreContext;
import org.apache.http.ssl.PrivateKeyDetails;
import org.apache.http.ssl.PrivateKeyStrategy;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.SSLContexts;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -80,7 +75,7 @@ public void clientCertTest() throws Exception {
true) {
@Override
protected void handleDiscoverRequest(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException, IOException {
throws IOException, HttpException {

MockIpdServer.SSLTestHttpServerConnection connection = (MockIpdServer.SSLTestHttpServerConnection) ((HttpCoreContext) context)
.getConnection();
Expand Down
34 changes: 14 additions & 20 deletions src/test/java/com/amazon/dlic/auth/http/jwt/keybyoidc/MockIpdServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,20 @@
import javax.net.ssl.TrustManagerFactory;

import org.apache.cxf.rs.security.jose.jwk.JsonWebKeys;
import org.apache.http.HttpConnectionFactory;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
import org.apache.hc.core5.http.io.HttpConnectionFactory;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.http.config.ConnectionConfig;
import org.apache.http.config.MessageConstraints;
import org.apache.http.entity.ContentLengthStrategy;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.ConnSupport;
import org.apache.http.impl.DefaultBHttpServerConnection;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.SSLServerSetupHandler;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.apache.http.io.HttpMessageParserFactory;
import org.apache.http.io.HttpMessageWriterFactory;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;

import org.opensearch.security.test.helper.file.FileHelper;
import org.opensearch.security.test.helper.network.SocketUtils;
Expand Down Expand Up @@ -75,7 +72,7 @@ class MockIpdServer implements Closeable {
this.jwks = jwks;

ServerBootstrap serverBootstrap = ServerBootstrap.bootstrap().setListenerPort(port)
.registerHandler(CTX_DISCOVER, new HttpRequestHandler() {
.register(CTX_DISCOVER, new HttpRequestHandler() {

@Override
public void handle(HttpRequest request, HttpResponse response, HttpContext context)
Expand All @@ -84,14 +81,11 @@ public void handle(HttpRequest request, HttpResponse response, HttpContext conte
handleDiscoverRequest(request, response, context);

}
}).registerHandler(CTX_KEYS, new HttpRequestHandler() {
}).register(CTX_KEYS, new HttpRequestHandler() {

@Override
public void handle(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException, IOException {

public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context) throws HttpException, IOException {
handleKeysRequest(request, response, context);

}
});

Expand Down
122 changes: 60 additions & 62 deletions src/test/java/com/amazon/dlic/auth/http/saml/MockSamlIdpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLSocket;
Expand All @@ -65,28 +66,32 @@

import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.apache.http.Header;
import org.apache.http.HttpConnectionFactory;
import org.apache.hc.core5.function.Callback;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.NameValuePair;
import org.apache.hc.core5.http.config.Http1Config;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.impl.io.DefaultBHttpServerConnection;
import org.apache.hc.core5.http.io.HttpConnectionFactory;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.io.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.net.URIBuilder;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.config.ConnectionConfig;
import org.apache.http.config.MessageConstraints;
import org.apache.http.entity.ContentLengthStrategy;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.ConnSupport;
import org.apache.http.impl.DefaultBHttpServerConnection;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.SSLServerSetupHandler;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.apache.http.io.HttpMessageParserFactory;
import org.apache.http.io.HttpMessageWriterFactory;
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.joda.time.DateTime;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.XMLObjectBuilderFactory;
Expand Down Expand Up @@ -199,53 +204,50 @@ class MockSamlIdpServer implements Closeable {
this.loadSigningKeys("saml/kirk-keystore.jks", "kirk");

ServerBootstrap serverBootstrap = ServerBootstrap.bootstrap().setListenerPort(port)
.registerHandler(CTX_METADATA, new HttpRequestHandler() {
.register(CTX_METADATA, new HttpRequestHandler() {

@Override
public void handle(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException, IOException {
public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context) throws HttpException, IOException {

handleMetadataRequest(request, response, context);

}
}).registerHandler(CTX_SAML_SSO, new HttpRequestHandler() {
}).register(CTX_SAML_SSO, new HttpRequestHandler() {

@Override
public void handle(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException, IOException {

public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context) throws HttpException, IOException {
handleSsoRequest(request, response, context);

}
}).registerHandler(CTX_SAML_SLO, new HttpRequestHandler() {
}).register(CTX_SAML_SLO, new HttpRequestHandler() {

@Override
public void handle(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException, IOException {

public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context) throws HttpException, IOException {
handleSloRequest(request, response, context);

}
});

if (ssl) {
serverBootstrap = serverBootstrap.setSslContext(createSSLContext())
.setSslSetupHandler(new SSLServerSetupHandler() {

serverBootstrap = serverBootstrap.setSslContext(createSSLContext())
.setSslSetupHandler(new Callback<SSLParameters>() {
@Override
public void initialize(SSLServerSocket socket) throws SSLException {
socket.setNeedClientAuth(true);
public void execute(SSLParameters object) {
object.setNeedClientAuth(true);
}
}).setConnectionFactory(new HttpConnectionFactory<DefaultBHttpServerConnection>() {
})
.setConnectionFactory(new HttpConnectionFactory<DefaultBHttpServerConnection>() {

private ConnectionConfig cconfig = ConnectionConfig.DEFAULT;

private Http1Config http1Config = Http1Config.custom()
.setBufferSize(this.cconfig.getBufferSize()).setChunkSizeHint(this.cconfig.getFragmentSizeHint()).build();

@Override
public DefaultBHttpServerConnection createConnection(final Socket socket) throws IOException {
final SSLTestHttpServerConnection conn = new SSLTestHttpServerConnection(
this.cconfig.getBufferSize(), this.cconfig.getFragmentSizeHint(),
ConnSupport.createDecoder(this.cconfig), ConnSupport.createEncoder(this.cconfig),
this.cconfig.getMessageConstraints(), null, null, null, null);
final SSLTestHttpServerConnection conn = new SSLTestHttpServerConnection("http",
http1Config,
ConnSupport.createDecoder(this.cconfig), ConnSupport.createEncoder(this.cconfig)
, null, null, null, null);
conn.bind(socket);
return conn;
}
Expand Down Expand Up @@ -306,9 +308,9 @@ public int getPort() {
return port;
}

protected void handleMetadataRequest(HttpRequest request, HttpResponse response, HttpContext context)
protected void handleMetadataRequest(HttpRequest request, ClassicHttpResponse response, HttpContext context)
throws HttpException, IOException {
response.setStatusCode(200);
response.setCode(200);
response.setHeader("Cache-Control", "public, max-age=31536000");
response.setHeader("Content-Type", "application/xml");
response.setEntity(new StringEntity(createMetadata()));
Expand All @@ -317,21 +319,21 @@ protected void handleMetadataRequest(HttpRequest request, HttpResponse response,
protected void handleSsoRequest(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException, IOException {

if ("GET".equalsIgnoreCase(request.getRequestLine().getMethod())) {
if ("GET".equalsIgnoreCase(request.getMethod())) {
handleSsoGetRequestBase(request);
} else {
response.setStatusCode(405);
response.setCode(405);
}

}

protected void handleSloRequest(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException, IOException {

if ("GET".equalsIgnoreCase(request.getRequestLine().getMethod())) {
if ("GET".equalsIgnoreCase(request.getMethod())) {
handleSloGetRequestBase(request);
} else {
response.setStatusCode(405);
response.setCode(405);
}
}

Expand Down Expand Up @@ -726,19 +728,15 @@ private String nextId() {
}

static class SSLTestHttpServerConnection extends DefaultBHttpServerConnection {
public SSLTestHttpServerConnection(final int buffersize, final int fragmentSizeHint,
final CharsetDecoder chardecoder, final CharsetEncoder charencoder,
final MessageConstraints constraints, final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
final HttpMessageParserFactory<HttpRequest> requestParserFactory,
final HttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
super(buffersize, fragmentSizeHint, chardecoder, charencoder, constraints, incomingContentStrategy,
public SSLTestHttpServerConnection(final String scheme, Http1Config http1Config,
final CharsetDecoder charDecoder, final CharsetEncoder charEncoder,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
final HttpMessageParserFactory<ClassicHttpRequest> requestParserFactory,
final HttpMessageWriterFactory<ClassicHttpResponse> responseWriterFactory) {
super(scheme, http1Config, charDecoder, charEncoder, incomingContentStrategy,
outgoingContentStrategy, requestParserFactory, responseWriterFactory);
}

public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException {
return ((SSLSocket) getSocket()).getSession().getPeerCertificates();
}
}

static class FakeHttpServletRequest implements HttpServletRequest {
Expand All @@ -748,7 +746,7 @@ static class FakeHttpServletRequest implements HttpServletRequest {

FakeHttpServletRequest(HttpRequest delegate) throws URISyntaxException {
this.delegate = delegate;
String uri = delegate.getRequestLine().getUri();
String uri = delegate.getRequestUri();
this.uriBuilder = new URIBuilder(uri);
this.queryParams = uriBuilder.getQueryParams().stream()
.collect(Collectors.toMap(NameValuePair::getName, NameValuePair::getValue));
Expand Down Expand Up @@ -981,7 +979,7 @@ public String getHeader(String name) {
@Override
public Enumeration getHeaderNames() {
return Collections.enumeration(
Arrays.asList(delegate.getAllHeaders()).stream().map(Header::getName).collect(Collectors.toSet()));
Arrays.asList(delegate.getHeaders()).stream().map(Header::getName).collect(Collectors.toSet()));
}

@SuppressWarnings("rawtypes")
Expand Down Expand Up @@ -1010,7 +1008,7 @@ public int getIntHeader(String name) {

@Override
public String getMethod() {
return delegate.getRequestLine().getMethod();
return delegate.getMethod();
}

@Override
Expand All @@ -1025,7 +1023,7 @@ public String getPathTranslated() {

@Override
public String getQueryString() {
return this.delegate.getRequestLine().getUri().replaceAll("^.*\\?", "");
return this.delegate.getRequestUri().replaceAll("^.*\\?", "");
}

@Override
Expand All @@ -1035,12 +1033,12 @@ public String getRemoteUser() {

@Override
public String getRequestURI() {
return delegate.getRequestLine().getUri();
return delegate.getRequestUri();
}

@Override
public StringBuffer getRequestURL() {
return new StringBuffer(delegate.getRequestLine().getUri());
return new StringBuffer(delegate.getRequestUri());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/opensearch/security/ssl/SSLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import javax.net.ssl.SSLHandshakeException;

import io.netty.util.internal.PlatformDependent;
import org.apache.http.NoHttpResponseException;
import org.apache.hc.core5.http.NoHttpResponseException;
import org.apache.lucene.util.Constants;
import org.junit.Assert;
import org.junit.Assume;
Expand Down