From e02ec69021f24220c0b91b8324382c9630415276 Mon Sep 17 00:00:00 2001 From: jbertram Date: Fri, 17 Jun 2016 16:20:57 -0500 Subject: [PATCH] ARTEMIS-563 update POODLE message --- .../core/remoting/impl/netty/NettyAcceptor.java | 2 +- .../artemis/core/server/ActiveMQServerLogger.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java index 48922aa7b0..efb459e30d 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java @@ -426,7 +426,7 @@ public class NettyAcceptor extends AbstractAcceptor { Set set = new HashSet<>(); for (String s : protocols) { if (s.equalsIgnoreCase("SSLv3") || s.equals("SSLv2Hello")) { - ActiveMQServerLogger.LOGGER.disallowedProtocol(s); + ActiveMQServerLogger.LOGGER.disallowedProtocol(s, name); continue; } set.add(s); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java index 3428a2fd06..70fb0e1bc1 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java @@ -309,6 +309,12 @@ public interface ActiveMQServerLogger extends BasicLogger { @Message(id = 221052, value = "trying to deploy topic {0}", format = Message.Format.MESSAGE_FORMAT) void deployTopic(SimpleString topicName); + @LogMessage(level = Logger.Level.INFO) + @Message(id = 221053, + value = "Disallowing use of vulnerable protocol ''{0}'' on acceptor ''{1}''. See http://www.oracle.com/technetwork/topics/security/poodlecve-2014-3566-2339408.html for more details.", + format = Message.Format.MESSAGE_FORMAT) + void disallowedProtocol(String protocol, String acceptorName); + @LogMessage(level = Logger.Level.WARN) @Message(id = 222000, value = "ActiveMQServer is being finalized and has not been stopped. Please remember to stop the server before letting it go out of scope", format = Message.Format.MESSAGE_FORMAT) @@ -1112,12 +1118,6 @@ public interface ActiveMQServerLogger extends BasicLogger { format = Message.Format.MESSAGE_FORMAT) void activateSharedStoreSlaveFailed(@Cause Throwable e); - @LogMessage(level = Logger.Level.WARN) - @Message(id = 222190, - value = "Disallowing use of vulnerable protocol: {0}. See http://www.oracle.com/technetwork/topics/security/poodlecve-2014-3566-2339408.html for more details.", - format = Message.Format.MESSAGE_FORMAT) - void disallowedProtocol(String protocol); - @LogMessage(level = Logger.Level.WARN) @Message(id = 222191, value = "Could not find any configured role for user {0}.",