You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/06/20 14:48:06 UTC
[1/2] activemq-artemis git commit: This closes #588
Repository: activemq-artemis
Updated Branches:
refs/heads/master 04885bbaf -> f10338a9b
This closes #588
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f10338a9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f10338a9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f10338a9
Branch: refs/heads/master
Commit: f10338a9b262ac4e8aa6e5cadcaf869fdccf2a12
Parents: 04885bb e02ec69
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Jun 20 15:47:37 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Mon Jun 20 15:47:37 2016 +0100
----------------------------------------------------------------------
.../artemis/core/remoting/impl/netty/NettyAcceptor.java | 2 +-
.../artemis/core/server/ActiveMQServerLogger.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-563 update POODLE message
Posted by ma...@apache.org.
ARTEMIS-563 update POODLE message
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e02ec690
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e02ec690
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e02ec690
Branch: refs/heads/master
Commit: e02ec69021f24220c0b91b8324382c9630415276
Parents: 04885bb
Author: jbertram <jb...@apache.org>
Authored: Fri Jun 17 16:20:57 2016 -0500
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Mon Jun 20 15:47:37 2016 +0100
----------------------------------------------------------------------
.../artemis/core/remoting/impl/netty/NettyAcceptor.java | 2 +-
.../artemis/core/server/ActiveMQServerLogger.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e02ec690/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
----------------------------------------------------------------------
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 48922aa..efb459e 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<String> 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);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e02ec690/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
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 3428a2f..70fb0e1 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)
@@ -1113,12 +1119,6 @@ public interface ActiveMQServerLogger extends BasicLogger {
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}.",
format = Message.Format.MESSAGE_FORMAT)