Skip to content

Add custom sslcontext support in fili #943

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

Open
Chandrasekar-Rajasekar wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add custom sslcontext support in fili #943

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b541b69
Add custom sslcontext support in fili
Jul 25, 2019
49a27b3
Added test and changelog
Aug 7, 2019
29d8273
Merge branch 'master' into add_ssl_support
michael-mclawhorn Aug 16, 2019
48e9dec
Merge branch 'master' into add_ssl_support
michael-mclawhorn Sep 24, 2019
1d94d1f
Merge branch 'master' into add_ssl_support
michael-mclawhorn Mar 16, 2020
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
14 changes: 13 additions & 1 deletion fili-core/src/main/java/com/yahoo/bard/webservice/application/AbstractBinderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
import com.codahale.metrics.health.HealthCheckRegistry;
import com.fasterxml.jackson.databind.ObjectMapper;

import io.netty.handler.ssl.SslContext;
import org.glassfish.hk2.api.TypeLiteral;
import org.glassfish.hk2.utilities.Binder;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
Expand Down Expand Up @@ -1208,6 +1209,14 @@ protected Class<? extends PhysicalTableResolver> getPhysicalTableResolver() {
return new HashMap<>(0);
}

/**
* Get a custom configured ssl context.
* @return SSL context
Copy link
Copy Markdown
Contributor

@michael-mclawhorn michael-mclawhorn Aug 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add to comment:

If null, the system default SSL Context will be applied

*/
protected SslContext getSSLContext() {
return null;
}

/**
* Create a DruidWebService.
* <p>
Expand All @@ -1220,16 +1229,19 @@ protected Class<? extends PhysicalTableResolver> getPhysicalTableResolver() {
*/
protected DruidWebService buildDruidWebService(DruidServiceConfig druidServiceConfig, ObjectMapper mapper) {
Supplier<Map<String, String>> supplier = buildDruidWebServiceHeaderSupplier();
SslContext sslContext = getSSLContext();

return DRUID_UNCOVERED_INTERVAL_LIMIT > 0
? new AsyncDruidWebServiceImpl(
druidServiceConfig,
mapper,
supplier,
sslContext,
new HeaderNestingJsonBuilderStrategy(
AsyncDruidWebServiceImpl.DEFAULT_JSON_NODE_BUILDER_STRATEGY
)
)
: new AsyncDruidWebServiceImpl(druidServiceConfig, mapper, supplier);
: new AsyncDruidWebServiceImpl(druidServiceConfig, mapper, supplier, sslContext);
}

/**
Expand Down
71 changes: 64 additions & 7 deletions ...e/src/main/java/com/yahoo/bard/webservice/druid/client/impl/AsyncDruidWebServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;

import io.netty.handler.ssl.SslContext;
import org.asynchttpclient.AsyncCompletionHandler;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.AsyncHttpClientConfig;
Expand Down Expand Up @@ -109,7 +110,7 @@ public AsyncDruidWebServiceImpl(
) {
this(
serviceConfig,
initializeWebClient(serviceConfig.getTimeout()),
initializeWebClient(serviceConfig.getTimeout(), null),
mapper,
HashMap::new,
DEFAULT_JSON_NODE_BUILDER_STRATEGY
Expand Down Expand Up @@ -150,7 +151,32 @@ public AsyncDruidWebServiceImpl(
) {
this(
serviceConfig,
initializeWebClient(serviceConfig.getTimeout()),
initializeWebClient(serviceConfig.getTimeout(), null),
mapper,
headersToAppend,
DEFAULT_JSON_NODE_BUILDER_STRATEGY
);
}

/**
* Friendly non-DI constructor useful for manual tests.
* <p>
* This constructor uses default JSON builder, which only uses response body to build the JSON response.
*
* @param serviceConfig Configuration for the Druid Service
* @param mapper A shared jackson object mapper resource
* @param headersToAppend Supplier for map of headers for Druid requests
* @param sslContext Custom Configured SslContext (null if default SSL context has to be used)
*/
public AsyncDruidWebServiceImpl(
DruidServiceConfig serviceConfig,
ObjectMapper mapper,
Supplier<Map<String, String>> headersToAppend,
SslContext sslContext
) {
this(
serviceConfig,
initializeWebClient(serviceConfig.getTimeout(), sslContext),
mapper,
headersToAppend,
DEFAULT_JSON_NODE_BUILDER_STRATEGY
Expand All @@ -173,7 +199,33 @@ public AsyncDruidWebServiceImpl(
) {
this(
serviceConfig,
initializeWebClient(serviceConfig.getTimeout()),
initializeWebClient(serviceConfig.getTimeout(), null),
mapper,
headersToAppend,
jsonNodeBuilderStrategy
);
}


/**
* Friendly non-DI constructor useful for manual tests.
*
* @param serviceConfig Configuration for the Druid Service
* @param mapper A shared jackson object mapper resource
* @param headersToAppend Supplier for map of headers for Druid requests
* @param jsonNodeBuilderStrategy A function to build JSON nodes from the response
* @param sslContext Custom Configured SslContext (null if default SSL context has to be used)
*/
public AsyncDruidWebServiceImpl(
DruidServiceConfig serviceConfig,
ObjectMapper mapper,
Supplier<Map<String, String>> headersToAppend,
SslContext sslContext,
Function<Response, JsonNode> jsonNodeBuilderStrategy
) {
this(
serviceConfig,
initializeWebClient(serviceConfig.getTimeout(), sslContext),
mapper,
headersToAppend,
jsonNodeBuilderStrategy
Expand Down Expand Up @@ -237,10 +289,11 @@ public AsyncDruidWebServiceImpl(
* Initialize the client config.
*
* @param requestTimeout Timeout to use for the client configuration.
* @param sslContext Custom Configured SslContext. (null if default ssl context has to be used)
*
* @return the set up client
*/
private static AsyncHttpClient initializeWebClient(int requestTimeout) {
private static AsyncHttpClient initializeWebClient(int requestTimeout, SslContext sslContext) {

LOG.debug("Druid request timeout: {}ms", requestTimeout);
List<String> cipherSuites = SYSTEM_CONFIG.getListProperty(SSL_ENABLED_CIPHER_KEY, null);
Expand All @@ -249,15 +302,19 @@ private static AsyncHttpClient initializeWebClient(int requestTimeout) {
: cipherSuites.toArray(new String[cipherSuites.size()]);

// Build the configuration
AsyncHttpClientConfig config = new DefaultAsyncHttpClientConfig.Builder()
DefaultAsyncHttpClientConfig.Builder asyncHttpClientConfigBuilder = new DefaultAsyncHttpClientConfig.Builder()
.setReadTimeout(requestTimeout)
.setRequestTimeout(requestTimeout)
.setConnectTimeout(requestTimeout)
.setConnectionTtl(requestTimeout)
.setPooledConnectionIdleTimeout(requestTimeout)
.setEnabledCipherSuites(enabledCipherSuites)
.setFollowRedirect(true)
.build();
.setFollowRedirect(true);

if (sslContext != null) {
asyncHttpClientConfigBuilder.setSslContext(sslContext);
}
AsyncHttpClientConfig config = asyncHttpClientConfigBuilder.build();

return new DefaultAsyncHttpClient(config);
}
Expand Down