Skip to content

Commit

Permalink
Merge branch 'master' into issue-2525
Browse files Browse the repository at this point in the history 
* master:
  added examples for organization api
  added hostedzone param
  removed unnec log
  testuite refactored to allow parallel execution
  fixes #2502
  • Loading branch information
Maria Farooq committed Sep 28, 2017
2 parents 268e8b6 + 5d9f58e commit b731306
Show file tree
Hide file tree
Showing 62 changed files with 4,118 additions and 2,650 deletions.
6 changes: 6 additions & 0 deletions ...omm/restcomm.application/src/main/java/org/restcomm/connect/application/Bootstrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
import akka.actor.Props;
import akka.actor.UntypedActor;
import akka.actor.UntypedActorFactory;
import org.apache.http.impl.client.CloseableHttpClient;
import org.restcomm.connect.commons.common.http.CustomHttpClientBuilder;
import scala.concurrent.ExecutionContext;

/**
Expand All @@ -72,6 +74,7 @@ public Bootstrapper() {

@Override
public void destroy() {
CustomHttpClientBuilder.stopDefaultClient();
system.shutdown();
system.awaitTermination();
}
Expand Down Expand Up @@ -363,6 +366,9 @@ public void servletInitialized(SipServletContextEvent event) {
logger.error("Monitoring Service is null");
}

CloseableHttpClient buildDefaultClient = CustomHttpClientBuilder.buildDefaultClient(RestcommConfiguration.getInstance().getMain());
context.setAttribute(CustomHttpClientBuilder.class.getName(), buildDefaultClient);

//Initialize Extensions
Configuration extensionConfiguration = null;
try {
Expand Down
7 changes: 1 addition & 6 deletions ...omm/restcomm.commons/src/main/java/org/restcomm/connect/commons/cache/FileDownloader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.utils.HttpClientUtils;
import org.restcomm.connect.commons.common.http.CustomHttpClientBuilder;
import org.restcomm.connect.commons.configuration.RestcommConfiguration;

Expand All @@ -30,7 +29,7 @@ public URI download(URI requestUri, File pathToSave) throws IOException, URISynt
try {
if (requestUri.getScheme().equalsIgnoreCase("https")) {
//Handle the HTTPS URIs
client = CustomHttpClientBuilder.build(RestcommConfiguration.getInstance().getMain());
client = CustomHttpClientBuilder.buildDefaultClient(RestcommConfiguration.getInstance().getMain());
/*URI result = new URIBuilder()
.setScheme(requestUri.getScheme())
.setHost(requestUri.getHost())
Expand Down Expand Up @@ -76,10 +75,6 @@ public URI download(URI requestUri, File pathToSave) throws IOException, URISynt
((CloseableHttpResponse) httpResponse).close();
httpResponse = null;
}
if (client != null) {
HttpClientUtils.closeQuietly(client);
client = null;
}
}

return pathToSave.toURI();
Expand Down
166 changes: 108 additions & 58 deletions ...mmons/src/main/java/org/restcomm/connect/commons/common/http/CustomHttpClientBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,35 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

package org.restcomm.connect.commons.common.http;

import org.apache.http.client.HttpClient;
import java.net.InetSocketAddress;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContextBuilder;
import org.restcomm.connect.commons.HttpConnector;
import org.restcomm.connect.commons.HttpConnectorList;
import org.restcomm.connect.commons.configuration.sets.MainConfigurationSet;
import org.restcomm.connect.commons.util.UriUtils;

import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.http.HttpHost;
import org.apache.http.client.utils.HttpClientUtils;
import org.apache.http.config.Registry;
import org.apache.http.config.RegistryBuilder;
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.DefaultHostnameVerifier;
import org.apache.http.conn.util.PublicSuffixMatcher;
import org.apache.http.conn.util.PublicSuffixMatcherLoader;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.ssl.SSLContexts;

/**
*
Expand All @@ -46,44 +55,90 @@
public class CustomHttpClientBuilder {

private CustomHttpClientBuilder() {
// TODO Auto-generated constructor stub
}

private static CloseableHttpClient defaultClient = null;

public static synchronized void stopDefaultClient() {
if (defaultClient != null) {
HttpClientUtils.closeQuietly(defaultClient);
defaultClient = null;
}
}

public static synchronized CloseableHttpClient buildDefaultClient(MainConfigurationSet config) {
if (defaultClient == null) {
defaultClient = build(config);
}
return defaultClient;
}

public static HttpClient build(MainConfigurationSet config) {
public static CloseableHttpClient build(MainConfigurationSet config) {
int timeoutConnection = config.getResponseTimeout();
return build(config, timeoutConnection);
}

public static HttpClient build(MainConfigurationSet config, int timeout) {
SslMode mode = config.getSslMode();
public static CloseableHttpClient build(MainConfigurationSet config, int timeout) {
HttpClientBuilder builder = HttpClients.custom();

RequestConfig requestConfig = RequestConfig.custom()
.setConnectTimeout(timeout)
.setConnectionRequestTimeout(timeout)
.setConnectionRequestTimeout(config.getDefaultHttpConnectionRequestTimeout())
.setSocketTimeout(timeout)
.setCookieSpec(CookieSpecs.STANDARD).build();
if ( mode == SslMode.strict ) {
SSLConnectionSocketFactory sslsf = null;
try {
builder.setDefaultRequestConfig(requestConfig);

SslMode mode = config.getSslMode();
SSLConnectionSocketFactory sslsf = null;
if (mode == SslMode.strict) {
sslsf = buildStrictFactory();
} else {
sslsf = buildAllowallFactory();
}
builder.setSSLSocketFactory(sslsf);

builder.setMaxConnPerRoute(config.getDefaultHttpMaxConnsPerRoute());
builder.setMaxConnTotal(config.getDefaultHttpMaxConns());
builder.setConnectionTimeToLive(config.getDefaultHttpTTL(), TimeUnit.MILLISECONDS);
if (config.getDefaultHttpRoutes() != null
&& config.getDefaultHttpRoutes().size() > 0) {
if (sslsf == null) {
//strict mode with no system https properties
//taken from apache buider code
PublicSuffixMatcher publicSuffixMatcherCopy = PublicSuffixMatcherLoader.getDefault();
DefaultHostnameVerifier hostnameVerifierCopy = new DefaultHostnameVerifier(publicSuffixMatcherCopy);
sslsf = new SSLConnectionSocketFactory(
SSLContextBuilder.create().build(),
getSSLPrototocolsFromSystemProperties(),
null,
// new String[]{"TLS_RSA_WITH_3DES_EDE_CBC_SHA", "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA256", "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA256", "TLS_RSA_WITH_AES_256_CBC_SHA"},
SSLConnectionSocketFactory.getDefaultHostnameVerifier());
} catch (KeyManagementException | NoSuchAlgorithmException e) {
throw new RuntimeException("Error creating HttpClient", e);
SSLContexts.createDefault(),
hostnameVerifierCopy);
}
return HttpClients.custom().setDefaultRequestConfig(requestConfig).setSSLSocketFactory(sslsf).build();
} else {
return buildAllowallClient(requestConfig);
Registry<ConnectionSocketFactory> reg = RegistryBuilder.<ConnectionSocketFactory>create()
.register("http", PlainConnectionSocketFactory.getSocketFactory())
.register("https", sslsf)
.build();
final PoolingHttpClientConnectionManager poolingmgr = new PoolingHttpClientConnectionManager(
reg,
null,
null,
null,
config.getDefaultHttpTTL(),
TimeUnit.MILLISECONDS);
//ensure conn configuration is set again for new conn manager
poolingmgr.setMaxTotal(config.getDefaultHttpMaxConns());
poolingmgr.setDefaultMaxPerRoute(config.getDefaultHttpMaxConnsPerRoute());
for (InetSocketAddress addr : config.getDefaultHttpRoutes().keySet()) {
HttpRoute r = new HttpRoute(new HttpHost(addr.getHostName(), addr.getPort()));
poolingmgr.setMaxPerRoute(r, config.getDefaultHttpRoutes().get(addr));
}
builder.setConnectionManager(poolingmgr);
}
return builder.build();
}

private static String[] getSSLPrototocolsFromSystemProperties() {
String protocols = System.getProperty("jdk.tls.client.protocols");
if (protocols == null)
if (protocols == null) {
protocols = System.getProperty("https.protocols");
}

if (protocols != null) {
String[] protocolsArray = protocols.split(",");
Expand All @@ -92,39 +147,34 @@ private static String[] getSSLPrototocolsFromSystemProperties() {
return null;
}

private static HttpClient buildAllowallClient(RequestConfig requestConfig) {
HttpConnectorList httpConnectorList = UriUtils.getHttpConnectorList();
HttpClient httpClient = null;
//Enable SSL only if we have HTTPS connector
List<HttpConnector> connectors = httpConnectorList.getConnectors();
Iterator<HttpConnector> iterator = connectors.iterator();
while (iterator.hasNext()) {
HttpConnector connector = iterator.next();
if (connector.isSecure()) {
SSLConnectionSocketFactory sslsf;
try {
SSLContextBuilder builder = new SSLContextBuilder();
builder.loadTrustMaterial(null, new TrustSelfSignedStrategy());
// sslsf = new SSLConnectionSocketFactory(builder.build());

sslsf = new SSLConnectionSocketFactory(
builder.build(),
getSSLPrototocolsFromSystemProperties(),
null,
SSLConnectionSocketFactory.getDefaultHostnameVerifier());


httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).setSSLSocketFactory(sslsf).build();
} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
throw new RuntimeException("Error creating HttpClient", e);
}
break;
}
}
if (httpClient == null) {
httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build();
private static SSLConnectionSocketFactory buildStrictFactory() {
try {
SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
SSLContextBuilder.create().build(),
getSSLPrototocolsFromSystemProperties(),
null,
// new String[]{"TLS_RSA_WITH_3DES_EDE_CBC_SHA", "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA256", "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA256", "TLS_RSA_WITH_AES_256_CBC_SHA"},
SSLConnectionSocketFactory.getDefaultHostnameVerifier());
return sslsf;
} catch (KeyManagementException | NoSuchAlgorithmException e) {
throw new RuntimeException("Error creating HttpClient", e);
}
}

private static SSLConnectionSocketFactory buildAllowallFactory() {
try {
SSLContextBuilder builder = new SSLContextBuilder();
builder.loadTrustMaterial(null, new TrustSelfSignedStrategy());

return httpClient;
SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
builder.build(),
getSSLPrototocolsFromSystemProperties(),
null,
SSLConnectionSocketFactory.getDefaultHostnameVerifier());

return sslsf;
} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
throw new RuntimeException("Error creating HttpClient", e);
}
}
}
12 changes: 12 additions & 0 deletions ...s/src/main/java/org/restcomm/connect/commons/configuration/sets/MainConfigurationSet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

package org.restcomm.connect.commons.configuration.sets;

import java.net.InetSocketAddress;
import java.util.Map;
import org.restcomm.connect.commons.common.http.SslMode;

/**
Expand All @@ -30,6 +32,16 @@ public interface MainConfigurationSet {

int getResponseTimeout();

Integer getDefaultHttpConnectionRequestTimeout();

Integer getDefaultHttpMaxConns();

Integer getDefaultHttpMaxConnsPerRoute();

Integer getDefaultHttpTTL();

Map<InetSocketAddress,Integer> getDefaultHttpRoutes();

boolean isUseHostnameToResolveRelativeUrls();

String getHostname();
Expand Down

0 comments on commit b731306

Please sign in to comment.