Skip to content

hostnameVerifier #358

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
merged 1 commit into from
Sep 3, 2020
Merged

hostnameVerifier #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions src/main/java/com/arangodb/ArangoDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.arangodb.velocystream.Request;
import com.arangodb.velocystream.Response;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import java.io.InputStream;
import java.lang.annotation.Annotation;
Expand Down Expand Up @@ -175,6 +176,17 @@ public Builder sslContext(final SSLContext sslContext) {
return this;
}

/**
* Sets the {@link javax.net.ssl.HostnameVerifier} to be used when using ssl with http protocol.
*
* @param hostnameVerifier HostnameVerifier to be used
* @return {@link ArangoDB.Builder}
*/
public Builder hostnameVerifier(final HostnameVerifier hostnameVerifier) {
setHostnameVerifier(hostnameVerifier);
return this;
}

/**
* Sets the chunk size when {@link Protocol#VST} is used.
*
Expand Down Expand Up @@ -571,8 +583,8 @@ public synchronized ArangoDB build() {

final ConnectionFactory connectionFactory = (protocol == null || Protocol.VST == protocol)
? new VstConnectionFactorySync(host, timeout, connectionTtl, useSsl, sslContext)
: new HttpConnectionFactory(timeout, user, password, useSsl, sslContext, custom, protocol,
connectionTtl, httpCookieSpec);
: new HttpConnectionFactory(timeout, user, password, useSsl, sslContext, hostnameVerifier, custom,
protocol, connectionTtl, httpCookieSpec);

final Collection<Host> hostList = createHostList(max, connectionFactory);
final HostResolver hostResolver = createHostResolver(hostList, max, connectionFactory);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/arangodb/internal/InternalArangoDBBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -74,6 +75,7 @@ public abstract class InternalArangoDBBuilder {
protected Boolean useSsl;
protected String httpCookieSpec;
protected SSLContext sslContext;
protected HostnameVerifier hostnameVerifier;
protected Integer chunksize;
protected Integer maxConnections;
protected Long connectionTtl;
Expand Down Expand Up @@ -160,6 +162,10 @@ protected void setSslContext(final SSLContext sslContext) {
this.sslContext = sslContext;
}

protected void setHostnameVerifier(final HostnameVerifier hostnameVerifier) {
this.hostnameVerifier = hostnameVerifier;
}

protected void setChunksize(final Integer chunksize) {
this.chunksize = chunksize;
}
Expand Down
20 changes: 13 additions & 7 deletions src/main/java/com/arangodb/internal/http/HttpConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.util.ArrayList;
Expand Down Expand Up @@ -87,6 +88,7 @@ public static class Builder {
private HostDescription host;
private Long ttl;
private SSLContext sslContext;
private HostnameVerifier hostnameVerifier;
private Integer timeout;

public Builder user(final String user) {
Expand Down Expand Up @@ -134,13 +136,18 @@ public Builder sslContext(final SSLContext sslContext) {
return this;
}

public Builder hostnameVerifier(final HostnameVerifier hostnameVerifier) {
this.hostnameVerifier = hostnameVerifier;
return this;
}

public Builder timeout(final Integer timeout) {
this.timeout = timeout;
return this;
}

public HttpConnection build() {
return new HttpConnection(host, timeout, user, password, useSsl, sslContext, util, contentType, ttl, httpCookieSpec);
return new HttpConnection(host, timeout, user, password, useSsl, sslContext, hostnameVerifier, util, contentType, ttl, httpCookieSpec);
}
}

Expand All @@ -154,7 +161,7 @@ public HttpConnection build() {
private final HostDescription host;

private HttpConnection(final HostDescription host, final Integer timeout, final String user, final String password,
final Boolean useSsl, final SSLContext sslContext, final ArangoSerialization util, final Protocol contentType,
final Boolean useSsl, final SSLContext sslContext, final HostnameVerifier hostnameVerifier, final ArangoSerialization util, final Protocol contentType,
final Long ttl, final String httpCookieSpec) {
super();
this.host = host;
Expand All @@ -166,11 +173,10 @@ private HttpConnection(final HostDescription host, final Integer timeout, final
final RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder
.create();
if (Boolean.TRUE == useSsl) {
if (sslContext != null) {
registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
} else {
registryBuilder.register("https", new SSLConnectionSocketFactory(SSLContexts.createSystemDefault()));
}
registryBuilder.register("https", new SSLConnectionSocketFactory(
sslContext != null ? sslContext : SSLContexts.createSystemDefault(),
hostnameVerifier != null ? hostnameVerifier : SSLConnectionSocketFactory.getDefaultHostnameVerifier()
));
} else {
registryBuilder.register("http", new PlainConnectionSocketFactory());
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/arangodb/internal/http/HttpConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.arangodb.internal.net.HostDescription;
import com.arangodb.util.ArangoSerialization;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;

/**
Expand All @@ -36,11 +37,12 @@ public class HttpConnectionFactory implements ConnectionFactory {
private final HttpConnection.Builder builder;

public HttpConnectionFactory(final Integer timeout, final String user, final String password, final Boolean useSsl,
final SSLContext sslContext, final ArangoSerialization util, final Protocol protocol,
final SSLContext sslContext, final HostnameVerifier hostnameVerifier, final ArangoSerialization util, final Protocol protocol,
final Long connectionTtl, String httpCookieSpec) {
super();
builder = new HttpConnection.Builder().timeout(timeout).user(user).password(password).useSsl(useSsl)
.sslContext(sslContext).serializationUtil(util).contentType(protocol).ttl(connectionTtl).httpCookieSpec(httpCookieSpec);
.sslContext(sslContext).hostnameVerifier(hostnameVerifier).serializationUtil(util).contentType(protocol)
.ttl(connectionTtl).httpCookieSpec(httpCookieSpec);

}

Expand Down
42 changes: 31 additions & 11 deletions src/test/java/com/arangodb/example/ssl/SslExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.arangodb.ArangoDB;
import com.arangodb.Protocol;
import com.arangodb.entity.ArangoDBVersion;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.junit.Ignore;
import org.junit.Test;

Expand Down Expand Up @@ -55,6 +56,35 @@ public class SslExample {
@Test
@Ignore
public void connect() throws Exception {
final ArangoDB arangoDB = new ArangoDB.Builder()
.host("localhost", 8529)
.password("test")
.useSsl(true)
.sslContext(createSslContext())
.useProtocol(Protocol.HTTP_JSON)
.build();
final ArangoDBVersion version = arangoDB.getVersion();
assertThat(version, is(notNullValue()));
System.out.println(version.getVersion());
}

@Test
@Ignore
public void noopHostnameVerifier() throws Exception {
final ArangoDB arangoDB = new ArangoDB.Builder()
.host("127.0.0.1", 8529)
.password("test")
.useSsl(true)
.sslContext(createSslContext())
.hostnameVerifier(NoopHostnameVerifier.INSTANCE)
.useProtocol(Protocol.HTTP_JSON)
.build();
final ArangoDBVersion version = arangoDB.getVersion();
assertThat(version, is(notNullValue()));
System.out.println(version.getVersion());
}

private SSLContext createSslContext() throws Exception {
final KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
ks.load(this.getClass().getResourceAsStream(SSL_TRUSTSTORE), SSL_TRUSTSTORE_PASSWORD.toCharArray());

Expand All @@ -67,17 +97,7 @@ public void connect() throws Exception {
final SSLContext sc = SSLContext.getInstance("TLS");
sc.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);


final ArangoDB arangoDB = new ArangoDB.Builder()
.host("127.0.0.1", 8529)
.password("test")
.useSsl(true)
.sslContext(sc)
.useProtocol(Protocol.HTTP_JSON)
.build();
final ArangoDBVersion version = arangoDB.getVersion();
assertThat(version, is(notNullValue()));
System.out.println(version.getVersion());
return sc;
}

}