You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/12/06 05:00:58 UTC

[1/6] incubator-trafficcontrol git commit: TR now logs original remote host IP when using X-MM-Client-IP. This closes TC-53

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/psql-rebase 33e55026b -> fc92ab9d4


TR now logs original remote host IP when using X-MM-Client-IP. This closes TC-53


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0aa4a73e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0aa4a73e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0aa4a73e

Branch: refs/heads/psql-rebase
Commit: 0aa4a73e69ef289b9e8ef6c89f98389ba179253e
Parents: 78b5c0c
Author: trevorackerman <tr...@gmail.com>
Authored: Mon Nov 28 15:07:44 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Mon Dec 5 13:46:15 2016 -0700

----------------------------------------------------------------------
 .../core/http/HTTPAccessEventBuilder.java          | 14 ++++++++++++--
 .../core/http/HTTPAccessEventBuilderTest.java      | 17 +++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0aa4a73e/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java
index ca2712e..96803c7 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilder.java
@@ -106,6 +106,7 @@ public class HTTPAccessEventBuilder {
         final String xMmClientIpHeader = httpServletRequest.getHeader(HTTPRequest.X_MM_CLIENT_IP);
         final String fakeIpParameter = httpServletRequest.getParameter(HTTPRequest.FAKE_IP);
 
+        final String remoteIp = chi;
         if (xMmClientIpHeader != null) {
             chi = xMmClientIpHeader;
         } else if (fakeIpParameter != null) {
@@ -115,8 +116,17 @@ public class HTTPAccessEventBuilder {
         final String rgb = formatObject(httpAccessRecord.getRegionalGeoResult());
 
         final StringBuilder stringBuilder = new StringBuilder(timeString)
-            .append(" qtype=HTTP chi=").append(chi)
-            .append(" url=\"").append(url)
+            .append(" qtype=HTTP chi=")
+            .append(chi)
+            .append(" rhi=");
+
+        if (!remoteIp.equals(chi)) {
+            stringBuilder.append(remoteIp);
+        } else {
+            stringBuilder.append('-');
+        }
+
+        stringBuilder.append(" url=\"").append(url)
             .append("\" cqhm=").append(cqhm)
             .append(" cqhv=").append(cqhv)
             .append(" rtype=").append(resultType)

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0aa4a73e/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java
index 4a4d9d2..80e119f 100644
--- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java
+++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/http/HTTPAccessEventBuilderTest.java
@@ -74,7 +74,7 @@ public class HTTPAccessEventBuilderTest {
 
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
 
-        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rh=\"-\""));
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 rhi=- url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rh=\"-\""));
     }
 
     @Test
@@ -91,7 +91,7 @@ public class HTTPAccessEventBuilderTest {
         HTTPAccessRecord httpAccessRecord = builder.resultType(ResultType.CZ).build();
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
 
-        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=CZ rloc=\"39.75,-104.99\" rdtl=- rerr=\"-\" rgb=\"-\" pssc=302 ttms=125.000 rurl=\"http://example.com/hereitis/index.html?foo=bar\" rh=\"-\""));
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 rhi=- url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=CZ rloc=\"39.75,-104.99\" rdtl=- rerr=\"-\" rgb=\"-\" pssc=302 ttms=125.000 rurl=\"http://example.com/hereitis/index.html?foo=bar\" rh=\"-\""));
     }
 
     @Test
@@ -111,7 +111,7 @@ public class HTTPAccessEventBuilderTest {
         HTTPAccessRecord httpAccessRecord = builder.build();
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
 
-        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=ERROR rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" pssc=302 ttms=0.124 rurl=\"http://example.com/hereitis/index.html?foo=bar\" rh=\"-\""));
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 rhi=- url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=ERROR rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" pssc=302 ttms=0.124 rurl=\"http://example.com/hereitis/index.html?foo=bar\" rh=\"-\""));
     }
 
 
@@ -133,7 +133,7 @@ public class HTTPAccessEventBuilderTest {
         HTTPAccessRecord httpAccessRecord = builder.build();
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
 
-        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=ERROR rloc=\"-\" rdtl=- rerr=\"RuntimeException: you're doing it wrong\" rgb=\"-\" pssc=302 ttms=0.456 rurl=\"http://example.com/hereitis/index.html?foo=bar\" rh=\"-\""));
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 rhi=- url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=ERROR rloc=\"-\" rdtl=- rerr=\"RuntimeException: you're doing it wrong\" rgb=\"-\" pssc=302 ttms=0.456 rurl=\"http://example.com/hereitis/index.html?foo=bar\" rh=\"-\""));
     }
     
     @Test
@@ -152,7 +152,7 @@ public class HTTPAccessEventBuilderTest {
         HTTPAccessRecord httpAccessRecord = builder.build();
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
 
-        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=MISS rloc=\"-\" rdtl=DS_NO_BYPASS rerr=\"-\" rgb=\"-\" pssc=503 ttms=0.789 rurl=\"-\" rh=\"-\""));
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.7.6 rhi=- url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=MISS rloc=\"-\" rdtl=DS_NO_BYPASS rerr=\"-\" rgb=\"-\" pssc=503 ttms=0.789 rurl=\"-\" rh=\"-\""));
     }
 
     @Test
@@ -183,11 +183,12 @@ public class HTTPAccessEventBuilderTest {
     @Test
     public void itUsesXMmClientIpHeaderForChi() throws Exception {
         when(request.getHeader(HTTPRequest.X_MM_CLIENT_IP)).thenReturn("192.168.100.100");
+        when(request.getRemoteAddr()).thenReturn("12.34.56.78");
 
         HTTPAccessRecord httpAccessRecord = new HTTPAccessRecord.Builder(new Date(144140678000L), request).build();
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
 
-        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.100.100 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rh=\"-\""));
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.100.100 rhi=12.34.56.78 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rh=\"-\""));
     }
 
     @Test
@@ -197,7 +198,7 @@ public class HTTPAccessEventBuilderTest {
         HTTPAccessRecord httpAccessRecord = new HTTPAccessRecord.Builder(new Date(144140678000L), request).build();
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
 
-        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.123.123 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rh=\"-\""));
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.123.123 rhi=192.168.7.6 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rh=\"-\""));
     }
 
     @Test
@@ -208,6 +209,6 @@ public class HTTPAccessEventBuilderTest {
         HTTPAccessRecord httpAccessRecord = new HTTPAccessRecord.Builder(new Date(144140678000L), request).build();
         String httpAccessEvent = HTTPAccessEventBuilder.create(httpAccessRecord);
 
-        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.100.100 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rh=\"-\""));
+        assertThat(httpAccessEvent, equalTo("144140678.000 qtype=HTTP chi=192.168.100.100 rhi=192.168.7.6 url=\"http://example.com/index.html?foo=bar\" cqhm=GET cqhv=HTTP/1.1 rtype=- rloc=\"-\" rdtl=- rerr=\"-\" rgb=\"-\" rurl=\"-\" rh=\"-\""));
     }
 }


[5/6] incubator-trafficcontrol git commit: This closes #112

Posted by da...@apache.org.
This closes #112


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b0c0592a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b0c0592a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b0c0592a

Branch: refs/heads/psql-rebase
Commit: b0c0592a1a57ba2537ffc86d1a2a60264a99d807
Parents: 165a2a6
Author: Dave Neuman <ne...@apache.org>
Authored: Mon Dec 5 14:39:14 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Mon Dec 5 14:39:14 2016 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------



[6/6] incubator-trafficcontrol git commit: Merge branch 'master' of github.com:apache/incubator-trafficcontrol into psql-rebase

Posted by da...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafficcontrol into psql-rebase


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fc92ab9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fc92ab9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fc92ab9d

Branch: refs/heads/psql-rebase
Commit: fc92ab9d4a723164cc73e220ddf4d1037161e20e
Parents: 33e5502 b0c0592
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Dec 5 22:00:40 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Dec 5 22:00:40 2016 -0700

----------------------------------------------------------------------
 .../protocol/LanguidNioProtocol.java            | 118 +++++++++++++++++++
 .../traffic_router/protocol/LanguidPoller.java  |  22 ++--
 .../protocol/LanguidProtocol.java               |   2 +-
 .../protocol/RouterNioEndpoint.java             |  67 +++++++++++
 .../protocol/RouterProtocolHandler.java         |  29 +++++
 .../protocol/RouterSslImplementation.java       |   7 +-
 .../secure/CertificateRegistry.java             |  14 +--
 .../traffic_router/secure/KeyManager.java       |  31 ++++-
 .../protocol/RouterSslImplementationTest.java   |   4 +-
 .../core/http/HTTPAccessEventBuilder.java       |  14 ++-
 .../core/src/main/opt/tomcat/conf/server.xml    |   6 +-
 .../core/http/HTTPAccessEventBuilderTest.java   |  17 +--
 12 files changed, 286 insertions(+), 45 deletions(-)
----------------------------------------------------------------------



[3/6] incubator-trafficcontrol git commit: TR - avoid unnecessary synchronization for https cert registry

Posted by da...@apache.org.
TR - avoid unnecessary synchronization for https cert registry

(cherry picked from commit 8d1732dc14ec98d075bdecc3866298def8dd0ef4)


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/165a2a6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/165a2a6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/165a2a6e

Branch: refs/heads/psql-rebase
Commit: 165a2a6e422080808eb9fcdef8edb42f67020d8d
Parents: b2154dc
Author: Trevor Ackerman <tr...@gmail.com>
Authored: Tue Nov 22 10:31:53 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Mon Dec 5 14:35:54 2016 -0700

----------------------------------------------------------------------
 .../traffic_router/secure/CertificateRegistry.java    | 14 ++++----------
 .../traffic_router/secure/KeyManager.java             | 10 ++++++----
 2 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/165a2a6e/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
index c3c7470..298d28a 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/CertificateRegistry.java
@@ -26,7 +26,7 @@ public class CertificateRegistry {
 	protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(CertificateRegistry.class);
 
 	private CertificateDataConverter certificateDataConverter = new CertificateDataConverter();
-	private Map<String, HandshakeData>	handshakeDataMap = new HashMap<>();
+	volatile private Map<String, HandshakeData>	handshakeDataMap = new HashMap<>();
 
 	// Recommended Singleton Pattern implementation
 	// https://community.oracle.com/docs/DOC-918906
@@ -38,15 +38,11 @@ public class CertificateRegistry {
 	}
 
 	public List<String> getAliases() {
-		synchronized (handshakeDataMap) {
-			return new ArrayList<>(handshakeDataMap.keySet());
-		}
+		return new ArrayList<>(handshakeDataMap.keySet());
 	}
 
 	public HandshakeData getHandshakeData(final String alias) {
-		synchronized (handshakeDataMap) {
-			return handshakeDataMap.get(alias);
-		}
+		return handshakeDataMap.get(alias);
 	}
 
 	@SuppressWarnings("PMD.AccessorClassGeneration")
@@ -63,9 +59,7 @@ public class CertificateRegistry {
 			map.put(alias, handshakeData);
 		}
 
-		synchronized (handshakeDataMap) {
-			handshakeDataMap = map;
-		}
+		handshakeDataMap = map;
 	}
 
 	public CertificateDataConverter getCertificateDataConverter() {

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/165a2a6e/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
index b199a6d..5d3d1bf 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
@@ -102,8 +102,9 @@ public class KeyManager extends X509ExtendedKeyManager implements X509KeyManager
 
 	@Override
 	public X509Certificate[] getCertificateChain(final String alias) {
-		if (certificateRegistry.getAliases().contains(alias)) {
-			return certificateRegistry.getHandshakeData(alias).getCertificateChain();
+		final HandshakeData handshakeData = certificateRegistry.getHandshakeData(alias);
+		if (handshakeData != null) {
+			return handshakeData.getCertificateChain();
 		}
 
 		log.error("No certificate chain for alias " + alias);
@@ -112,8 +113,9 @@ public class KeyManager extends X509ExtendedKeyManager implements X509KeyManager
 
 	@Override
 	public PrivateKey getPrivateKey(final String alias) {
-		if (certificateRegistry.getAliases().contains(alias)) {
-			return certificateRegistry.getHandshakeData(alias).getPrivateKey();
+		final HandshakeData handshakeData = certificateRegistry.getHandshakeData(alias);
+		if (handshakeData != null) {
+			return handshakeData.getPrivateKey();
 		}
 
 		log.error("No private key for alias " + alias);


[2/6] incubator-trafficcontrol git commit: This closes #105

Posted by da...@apache.org.
This closes #105


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7afccdb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7afccdb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7afccdb6

Branch: refs/heads/psql-rebase
Commit: 7afccdb657a16b8d1b9d2cb0dc04b2c2d9eecfcd
Parents: 0aa4a73
Author: Dave Neuman <ne...@apache.org>
Authored: Mon Dec 5 13:46:37 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Mon Dec 5 13:46:37 2016 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------



[4/6] incubator-trafficcontrol git commit: TR - add ability to use NIO for custom tomcat connector

Posted by da...@apache.org.
TR - add ability to use NIO for custom tomcat connector

(cherry picked from commit d069d9dd8ee814cf9c559e2ff78e0312b52a17ca)


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b2154dcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b2154dcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b2154dcc

Branch: refs/heads/psql-rebase
Commit: b2154dcc2b3c7e0462ce7032cfe9866a0350b8e3
Parents: 7afccdb
Author: trevorackerman <tr...@gmail.com>
Authored: Tue Nov 22 11:32:42 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Mon Dec 5 14:35:54 2016 -0700

----------------------------------------------------------------------
 .../protocol/LanguidNioProtocol.java            | 118 +++++++++++++++++++
 .../traffic_router/protocol/LanguidPoller.java  |  22 ++--
 .../protocol/LanguidProtocol.java               |   2 +-
 .../protocol/RouterNioEndpoint.java             |  67 +++++++++++
 .../protocol/RouterProtocolHandler.java         |  29 +++++
 .../protocol/RouterSslImplementation.java       |   7 +-
 .../traffic_router/secure/KeyManager.java       |  21 +++-
 .../protocol/RouterSslImplementationTest.java   |   4 +-
 .../core/src/main/opt/tomcat/conf/server.xml    |   6 +-
 9 files changed, 255 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidNioProtocol.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidNioProtocol.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidNioProtocol.java
new file mode 100644
index 0000000..f81e96c
--- /dev/null
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidNioProtocol.java
@@ -0,0 +1,118 @@
+package com.comcast.cdn.traffic_control.traffic_router.protocol;
+
+import org.apache.coyote.http11.Http11NioProtocol;
+import org.apache.tomcat.util.net.SSLImplementation;
+import org.apache.tomcat.util.net.jsse.JSSEImplementation;
+
+public class LanguidNioProtocol extends Http11NioProtocol implements RouterProtocolHandler {
+	protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(LanguidNioProtocol.class);
+	private boolean ready = false;
+	private boolean initialized = false;
+	private String mbeanPath;
+	private String readyAttribute;
+	private String portAttribute;
+	private String sslClassName = JSSEImplementation.class.getCanonicalName();
+
+	public LanguidNioProtocol() {
+		log.warn("Serving wildcard certs for multiple domains");
+		ep = new RouterNioEndpoint();
+		setSSLImplementation(RouterSslImplementation.class.getCanonicalName());
+	}
+
+	public boolean setSSLImplementation(final String sslClassName) {
+		try {
+			Class.forName(sslClassName);
+			this.sslClassName = sslClassName;
+			return true;
+		} catch (ClassNotFoundException e) {
+			log.error("Failed to set SSL implementation to " + sslClassName + " class was not found, defaulting to JSSE");
+			this.sslClassName = JSSEImplementation.class.getCanonicalName();
+		}
+
+		return false;
+	}
+
+	@Override
+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")
+	public void init() throws Exception {
+		if (!isReady()) {
+			log.info("Init called; creating thread to monitor the state of Traffic Router");
+			new LanguidPoller(this).start();
+			return;
+		}
+
+		log.info("Traffic Router is ready; calling super.init()");
+		super.init();
+
+		sslImplementation = (JSSEImplementation) SSLImplementation.getInstance(sslClassName);
+		setInitialized(true);
+	}
+
+	@Override
+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")
+	public void start() throws Exception {
+		log.info("Start called; waiting for initialization to occur");
+
+		while (!isInitialized()) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				log.info("interrupted waiting for initialization");
+			}
+		}
+
+		log.info("Initialization complete; calling super.start()");
+
+		super.start();
+	}
+
+	@Override
+	public boolean isReady() {
+		return ready;
+	}
+
+	@Override
+	public void setReady(final boolean isReady) {
+		this.ready = isReady;
+	}
+
+	@Override
+	public boolean isInitialized() {
+		return initialized;
+	}
+
+	@Override
+	public void setInitialized(final boolean isInitialized) {
+		this.initialized = isInitialized;
+	}
+
+	@Override
+	public String getMbeanPath() {
+		return mbeanPath;
+	}
+
+	@Override
+	public void setMbeanPath(final String mbeanPath) {
+		this.mbeanPath = mbeanPath;
+	}
+
+	@Override
+	public String getReadyAttribute() {
+		return readyAttribute;
+	}
+
+	@Override
+	public void setReadyAttribute(final String readyAttribute) {
+		this.readyAttribute = readyAttribute;
+	}
+
+	@Override
+	public String getPortAttribute() {
+		return portAttribute;
+	}
+
+	@Override
+	public void setPortAttribute(final String portAttribute) {
+		this.portAttribute = portAttribute;
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
index cf07128..c6f9a5d 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidPoller.java
@@ -22,15 +22,15 @@ import javax.management.ObjectName;
 
 public class LanguidPoller extends Thread {
 	protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(LanguidPoller.class);
-	final private LanguidProtocol languidProtocol;
+	final private RouterProtocolHandler protocolHandler;
 
-	public LanguidPoller(final LanguidProtocol languidProtocol) {
-		this.languidProtocol = languidProtocol;
+	public LanguidPoller(final RouterProtocolHandler protocolHandler) {
+		this.protocolHandler = protocolHandler;
 	}
 
 	@Override
 	public void run() {
-		log.info("Waiting for state from mbean path " + languidProtocol.getMbeanPath());
+		log.info("Waiting for state from mbean path " + protocolHandler.getMbeanPath());
 
 		boolean firstTime = true;
 		while (true) {
@@ -38,9 +38,9 @@ public class LanguidPoller extends Thread {
 				final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
 				// See src/main/opt/conf/server.xml
 				// This is calling traffic-router:name=languidState
-				final ObjectName languidState = new ObjectName(languidProtocol.getMbeanPath());
-				final Object readyValue = mbs.getAttribute(languidState, languidProtocol.getReadyAttribute());
-				final Object portValue = mbs.getAttribute(languidState, languidProtocol.getPortAttribute());
+				final ObjectName languidState = new ObjectName(protocolHandler.getMbeanPath());
+				final Object readyValue = mbs.getAttribute(languidState, protocolHandler.getReadyAttribute());
+				final Object portValue = mbs.getAttribute(languidState, protocolHandler.getPortAttribute());
 				final boolean ready = Boolean.parseBoolean(readyValue.toString());
 				final int port = Integer.parseInt(portValue.toString());
 
@@ -50,12 +50,12 @@ public class LanguidPoller extends Thread {
 				
 				if (ready) {
 					if (port > 0) {
-						languidProtocol.setPort(port);
+						protocolHandler.setPort(port);
 					}
 
-					log.info("Traffic Router published the ready state; calling init() on our reference to Connector with a listen port of " + languidProtocol.getPort());
-					languidProtocol.setReady(true);
-					languidProtocol.init();
+					log.info("Traffic Router published the ready state; calling init() on our reference to Connector with a listen port of " + protocolHandler.getPort());
+					protocolHandler.setReady(true);
+					protocolHandler.init();
 					break;
 				}
 			} catch (Exception ex) {

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
index cb624b2..a6ef342 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/LanguidProtocol.java
@@ -17,7 +17,7 @@ package com.comcast.cdn.traffic_control.traffic_router.protocol;
 
 import org.apache.coyote.http11.Http11Protocol;
 
-public class LanguidProtocol extends Http11Protocol {
+public class LanguidProtocol extends Http11Protocol implements RouterProtocolHandler {
 	protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(LanguidProtocol.class);
 	private boolean ready = false;
 	private boolean initialized = false;

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterNioEndpoint.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterNioEndpoint.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterNioEndpoint.java
new file mode 100644
index 0000000..a93128b
--- /dev/null
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterNioEndpoint.java
@@ -0,0 +1,67 @@
+package com.comcast.cdn.traffic_control.traffic_router.protocol;
+
+import com.comcast.cdn.traffic_control.traffic_router.secure.KeyManager;
+import org.apache.tomcat.util.net.NioEndpoint;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSessionContext;
+import javax.net.ssl.TrustManager;
+import java.net.InetSocketAddress;
+import java.nio.channels.ServerSocketChannel;
+import java.util.concurrent.CountDownLatch;
+
+public class RouterNioEndpoint extends NioEndpoint {
+
+	// The same code as its parent class except for SSL
+	@SuppressWarnings({"PMD.SignatureDeclareThrowsException", "PMD.NPathComplexity"})
+	public void init() throws Exception {
+
+		if (initialized) {
+			return;
+		}
+
+		serverSock = ServerSocketChannel.open();
+		serverSock.socket().setPerformancePreferences(socketProperties.getPerformanceConnectionTime(),
+			socketProperties.getPerformanceLatency(),
+			socketProperties.getPerformanceBandwidth());
+
+		final InetSocketAddress addr = (address != null ? new InetSocketAddress(address, port) : new InetSocketAddress(port));
+
+		serverSock.socket().bind(addr, backlog);
+		serverSock.configureBlocking(true); //mimic APR behavior
+		serverSock.socket().setSoTimeout(getSocketProperties().getSoTimeout());
+
+		// Initialize thread count defaults for acceptor, poller
+		if (acceptorThreadCount == 0) {
+			// FIXME: Doesn't seem to work that well with multiple accept threads
+			acceptorThreadCount = 1;
+		}
+
+		if (pollerThreadCount <= 0) {
+			//minimum one poller thread
+			pollerThreadCount = 1;
+		}
+
+		stopLatch = new CountDownLatch(pollerThreadCount);
+
+		// Initialize SSL if needed
+		if (isSSLEnabled()) {
+			sslContext = SSLContext.getInstance(getSslProtocol());
+			sslContext.init(wrap(new javax.net.ssl.KeyManager[]{new KeyManager()}), new TrustManager[]{}, null);
+
+			final SSLSessionContext sessionContext = sslContext.getServerSessionContext();
+
+			if (sessionContext != null) {
+				sessionContext.setSessionCacheSize(sessionCacheSize);
+				sessionContext.setSessionTimeout(sessionTimeout);
+			}
+		}
+
+		if (oomParachute > 0) {
+			reclaimParachute(true);
+		}
+
+		selectorPool.open();
+		initialized = true;
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterProtocolHandler.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterProtocolHandler.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterProtocolHandler.java
new file mode 100644
index 0000000..73f70d4
--- /dev/null
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterProtocolHandler.java
@@ -0,0 +1,29 @@
+package com.comcast.cdn.traffic_control.traffic_router.protocol;
+
+import org.apache.coyote.ProtocolHandler;
+
+public interface RouterProtocolHandler extends ProtocolHandler {
+	boolean isReady();
+
+	void setReady(final boolean isReady);
+
+	boolean isInitialized();
+
+	void setInitialized(final boolean isInitialized);
+
+	String getMbeanPath();
+
+	void setMbeanPath(final String mbeanPath);
+
+	String getReadyAttribute();
+
+	void setReadyAttribute(final String readyAttribute);
+
+	String getPortAttribute();
+
+	void setPortAttribute(final String portAttribute);
+
+	int getPort();
+
+	void setPort(int port);
+}

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
index a5a17c7..f8f9bb9 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/protocol/RouterSslImplementation.java
@@ -15,16 +15,19 @@
 
 package com.comcast.cdn.traffic_control.traffic_router.protocol;
 
-import org.apache.tomcat.util.net.SSLImplementation;
 import org.apache.tomcat.util.net.SSLSupport;
 import org.apache.tomcat.util.net.ServerSocketFactory;
+import org.apache.tomcat.util.net.jsse.JSSEImplementation;
 
 import javax.net.ssl.SSLSession;
 import java.net.Socket;
 
-public class RouterSslImplementation extends SSLImplementation {
+public class RouterSslImplementation extends JSSEImplementation {
 	RouterJsseFactory factory = new RouterJsseFactory();
 
+	public RouterSslImplementation() throws ClassNotFoundException {
+	}
+
 	@Override
 	public String getImplementationName() {
 		return getClass().getSimpleName();

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
index 2eeb222..b199a6d 100644
--- a/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
+++ b/traffic_router/connector/src/main/java/com/comcast/cdn/traffic_control/traffic_router/secure/KeyManager.java
@@ -17,7 +17,9 @@ package com.comcast.cdn.traffic_control.traffic_router.secure;
 
 import javax.net.ssl.ExtendedSSLSession;
 import javax.net.ssl.SNIServerName;
+import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLSocket;
+import javax.net.ssl.X509ExtendedKeyManager;
 import javax.net.ssl.X509KeyManager;
 import java.net.Socket;
 import java.security.Principal;
@@ -29,7 +31,7 @@ import java.util.Optional;
 // Uses the in memory CertificateRegistry to provide dynamic key and certificate management for the router
 // The provided default implementation does not allow for the key store to change state
 // once the JVM loads the default classes.
-public class KeyManager implements X509KeyManager {
+public class KeyManager extends X509ExtendedKeyManager implements X509KeyManager {
 	private final static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(KeyManager.class);
 	private final CertificateRegistry certificateRegistry = CertificateRegistry.getInstance();
 
@@ -52,6 +54,16 @@ public class KeyManager implements X509KeyManager {
 	}
 
 	@Override
+	public String chooseEngineServerAlias(final String keyType, final Principal[] issuers, final SSLEngine engine) {
+		if (keyType == null) {
+			return null;
+		}
+
+		final ExtendedSSLSession sslSession = (ExtendedSSLSession) engine.getHandshakeSession();
+		return chooseServerAlias(sslSession);
+	}
+
+	@Override
 	public String chooseServerAlias(final String keyType, final Principal[] principals, final Socket socket) {
 		if (keyType == null) {
 			return null;
@@ -59,6 +71,10 @@ public class KeyManager implements X509KeyManager {
 
 		final SSLSocket sslSocket = (SSLSocket) socket;
 		final ExtendedSSLSession sslSession = (ExtendedSSLSession) sslSocket.getHandshakeSession();
+		return chooseServerAlias(sslSession);
+	}
+
+	private String chooseServerAlias(final ExtendedSSLSession sslSession) {
 		final List<SNIServerName> requestedNames = sslSession.getRequestedServerNames();
 
 		final StringBuilder stringBuilder = new StringBuilder();
@@ -79,7 +95,7 @@ public class KeyManager implements X509KeyManager {
 		if (stringBuilder.length() > 0) {
 			log.warn("No certificate registry aliases matching " + stringBuilder.toString());
 		} else {
-			log.warn("Client " + sslSocket.getRemoteSocketAddress() + " did not send any Server Name Indicators");
+			log.warn("Client " + sslSession.getPeerHost() + " did not send any Server Name Indicators");
 		}
 		return null;
 	}
@@ -103,4 +119,5 @@ public class KeyManager implements X509KeyManager {
 		log.error("No private key for alias " + alias);
 		return null;
 	}
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
----------------------------------------------------------------------
diff --git a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
index 438096a..c794da3 100644
--- a/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
+++ b/traffic_router/connector/src/test/java/protocol/RouterSslImplementationTest.java
@@ -31,12 +31,12 @@ import static org.hamcrest.Matchers.instanceOf;
 @PrepareForTest({RouterSslImplementation.class, JSSEFactory.class})
 public class RouterSslImplementationTest {
 	@Test
-	public void itReturnsItsName() {
+	public void itReturnsItsName() throws Exception {
 		assertThat(new RouterSslImplementation().getImplementationName(), equalTo("RouterSslImplementation"));
 	}
 
 	@Test
-	public void itReturnsRouterSslServerSocketFactory() {
+	public void itReturnsRouterSslServerSocketFactory() throws Exception {
 		assertThat(new RouterSslImplementation().getServerSocketFactory(), instanceOf(RouterSslServerSocketFactory.class));
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2154dcc/traffic_router/core/src/main/opt/tomcat/conf/server.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/opt/tomcat/conf/server.xml b/traffic_router/core/src/main/opt/tomcat/conf/server.xml
index fe24a96..e7b6e26 100644
--- a/traffic_router/core/src/main/opt/tomcat/conf/server.xml
+++ b/traffic_router/core/src/main/opt/tomcat/conf/server.xml
@@ -32,13 +32,13 @@
 		at /docs/config/service.html -->
 
 	<Service name="traffic_router_core">
-		<Connector port="80" protocol="com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidProtocol" maxThreads="10000"
+		<Connector port="80" protocol="com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol" maxThreads="10000"
 				   connectionTimeout="20000" mbeanPath="traffic-router:name=languidState" readyAttribute="Ready" portAttribute="Port"/>
-		<Connector port="443" protocol="com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidProtocol" maxThreads="10000"
+		<Connector port="443" protocol="com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol" maxThreads="10000"
 				   scheme="https" secure="true" SSLEnabled="true"
 				   clientAuth="false" sslProtocol="TLS"
 				   connectionTimeout="20000" mbeanPath="traffic-router:name=languidState" readyAttribute="Ready" portAttribute="SecurePort"/>
-		<Connector port="3333" protocol="com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidProtocol" maxThreads="10000"
+		<Connector port="3333" protocol="com.comcast.cdn.traffic_control.traffic_router.protocol.LanguidNioProtocol" maxThreads="10000"
 				   connectionTimeout="20000" mbeanPath="traffic-router:name=languidState" readyAttribute="Ready" portAttribute="ApiPort"/>
 		<Engine name="traffic_router_core" defaultHost="localhost">
 			<Host name="localhost" appBase="/opt/traffic_router/webapps/core/">