ARTEMIS-563 update POODLE message

This commit is contained in:
jbertram 2016-06-17 16:20:57 -05:00 committed by Martyn Taylor
parent 04885bbafd
commit e02ec69021
2 changed files with 7 additions and 7 deletions

View File

@ -426,7 +426,7 @@ public class NettyAcceptor extends AbstractAcceptor {
Set<String> set = new HashSet<>(); Set<String> set = new HashSet<>();
for (String s : protocols) { for (String s : protocols) {
if (s.equalsIgnoreCase("SSLv3") || s.equals("SSLv2Hello")) { if (s.equalsIgnoreCase("SSLv3") || s.equals("SSLv2Hello")) {
ActiveMQServerLogger.LOGGER.disallowedProtocol(s); ActiveMQServerLogger.LOGGER.disallowedProtocol(s, name);
continue; continue;
} }
set.add(s); set.add(s);

View File

@ -309,6 +309,12 @@ public interface ActiveMQServerLogger extends BasicLogger {
@Message(id = 221052, value = "trying to deploy topic {0}", format = Message.Format.MESSAGE_FORMAT) @Message(id = 221052, value = "trying to deploy topic {0}", format = Message.Format.MESSAGE_FORMAT)
void deployTopic(SimpleString topicName); 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) @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", @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) format = Message.Format.MESSAGE_FORMAT)
@ -1112,12 +1118,6 @@ public interface ActiveMQServerLogger extends BasicLogger {
format = Message.Format.MESSAGE_FORMAT) format = Message.Format.MESSAGE_FORMAT)
void activateSharedStoreSlaveFailed(@Cause Throwable e); 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) @LogMessage(level = Logger.Level.WARN)
@Message(id = 222191, @Message(id = 222191,
value = "Could not find any configured role for user {0}.", value = "Could not find any configured role for user {0}.",