Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-26 12:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

AMQ-7167 - ensure remote IP is visible in acceptor error messages from the transport connector - test and fix

Browse Source
This commit is contained in:
gtully 2019-03-13 10:21:19 +00:00
parent a000a73431
commit 2d394b383c
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
View File

@ -208,6 +208,7 @@ public class TransportConnector implements Connector, BrokerServiceAware {
getServer().setAcceptListener(new TransportAcceptListener() { getServer().setAcceptListener(new TransportAcceptListener() {
@Override @Override
public void onAccept(final Transport transport) { public void onAccept(final Transport transport) {
final String remoteHost = transport.getRemoteAddress();
try { try {
brokerService.getTaskRunnerFactory().execute(new Runnable() { brokerService.getTaskRunnerFactory().execute(new Runnable() {
@Override @Override
@ -220,14 +221,12 @@ public class TransportConnector implements Connector, BrokerServiceAware {
throw new BrokerStoppedException("Broker " + brokerService + " is being stopped"); throw new BrokerStoppedException("Broker " + brokerService + " is being stopped");
} }
} catch (Exception e) { } catch (Exception e) {
String remoteHost = transport.getRemoteAddress();
ServiceSupport.dispose(transport); ServiceSupport.dispose(transport);
onAcceptError(e, remoteHost); onAcceptError(e, remoteHost);
} }
} }
}); });
} catch (Exception e) { } catch (Exception e) {
String remoteHost = transport.getRemoteAddress();
ServiceSupport.dispose(transport); ServiceSupport.dispose(transport);
onAcceptError(e, remoteHost); onAcceptError(e, remoteHost);
} }
@ -240,9 +239,9 @@ public class TransportConnector implements Connector, BrokerServiceAware {
private void onAcceptError(Exception error, String remoteHost) { private void onAcceptError(Exception error, String remoteHost) {
if (brokerService != null && brokerService.isStopping()) { if (brokerService != null && brokerService.isStopping()) {
LOG.info("Could not accept connection during shutdown {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error); LOG.info("Could not accept connection during shutdown {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error.getLocalizedMessage());
} else { } else {
LOG.error("Could not accept connection {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error); LOG.error("Could not accept connection {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error.getLocalizedMessage());
LOG.debug("Reason: " + error, error); LOG.debug("Reason: " + error, error);
} }
} }

32
activemq-unit-tests/src/test/java/org/apache/activemq/transport/nio/NIOSSLBasicTest.java
View File

@ -29,12 +29,21 @@ import javax.net.ssl.SSLHandshakeException;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.util.DefaultTestAppender;
import org.apache.log4j.Level;
import org.apache.log4j.spi.LoggingEvent;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import static junit.framework.TestCase.assertTrue;
public class NIOSSLBasicTest { public class NIOSSLBasicTest {
public static final String KEYSTORE_TYPE = "jks"; public static final String KEYSTORE_TYPE = "jks";
@ -87,7 +96,7 @@ public class NIOSSLBasicTest {
@Test @Test
public void enabledCipherSuites() throws Exception { public void enabledCipherSuites() throws Exception {
BrokerService broker = createBroker("nio+ssl", getTransportType() + "://localhost:0?transport.needClientAuth=true&transport.verifyHostName=false&transport.enabledCipherSuites=TLS_RSA_WITH_AES_256_CBC_SHA256"); BrokerService broker = createBroker("nio+ssl", getTransportType() + "://localhost:0?transport.needClientAuth=true&transport.verifyHostName=false&transport.enabledCipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256");
basicSendReceive("ssl://localhost:" + broker.getConnectorByName("nio+ssl").getConnectUri().getPort() + "?socket.verifyHostName=false"); basicSendReceive("ssl://localhost:" + broker.getConnectorByName("nio+ssl").getConnectUri().getPort() + "?socket.verifyHostName=false");
stopBroker(broker); stopBroker(broker);
} }
@ -102,14 +111,35 @@ public class NIOSSLBasicTest {
//Client is missing verifyHostName=false so it should fail as cert doesn't have right host name //Client is missing verifyHostName=false so it should fail as cert doesn't have right host name
@Test(expected = Exception.class) @Test(expected = Exception.class)
public void verifyHostNameErrorClient() throws Exception { public void verifyHostNameErrorClient() throws Exception {
final CountDownLatch gotLogMessage = new CountDownLatch(1);
final AtomicBoolean gotRemoteAddressInLog = new AtomicBoolean();
final DefaultTestAppender appender = new DefaultTestAppender() {
@Override
public void doAppend(LoggingEvent event) {
if (event.getLevel().equals(Level.ERROR) && event.getRenderedMessage().contains("Could not accept connection")) {
gotLogMessage.countDown();
if (event.getRenderedMessage().contains("tcp")) {
// got remote address
gotRemoteAddressInLog.set(true);
}
}
}
};
org.apache.log4j.Logger rootLogger = org.apache.log4j.Logger.getRootLogger();
rootLogger.addAppender(appender);
BrokerService broker = null; BrokerService broker = null;
try { try {
broker = createBroker("nio+ssl", getTransportType() + "://localhost:61616?transport.needClientAuth=true"); broker = createBroker("nio+ssl", getTransportType() + "://localhost:61616?transport.needClientAuth=true");
basicSendReceive("ssl://localhost:" + broker.getConnectorByName("nio+ssl").getConnectUri().getPort()); basicSendReceive("ssl://localhost:" + broker.getConnectorByName("nio+ssl").getConnectUri().getPort());
} finally { } finally {
gotLogMessage.await(5, TimeUnit.SECONDS);
if (broker != null) { if (broker != null) {
stopBroker(broker); stopBroker(broker);
} }
rootLogger.removeAppender(appender);
assertTrue("Got remote address in log", gotRemoteAddressInLog.get());
} }
} }