Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-522 fix AMQP ANON advert

This commit is contained in:
jbertram 2016-05-17 08:46:36 -05:00 committed by Clebert Suconic
parent bbe365eb69
commit b9b4107020
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
View File

@ -56,7 +56,25 @@ public class ActiveMQProtonConnectionCallback implements AMQPConnectionCallback
@Override
public ServerSASL[] getSASLMechnisms() {
return new ServerSASL[]{new AnonymousServerSASL(), new ActiveMQPlainSASL(manager.getServer().getSecurityStore(), manager.getServer().getSecurityManager())};
boolean supportsAnonymous = false;
try {
manager.getServer().getSecurityStore().authenticate(null, null, null);
supportsAnonymous = true;
}
catch (Exception e) {
// authentication failed so no anonymous support
}
ServerSASL[] result;
if (supportsAnonymous) {
result = new ServerSASL[]{new AnonymousServerSASL(), new ActiveMQPlainSASL(manager.getServer().getSecurityStore())};
}
else {
result = new ServerSASL[]{new ActiveMQPlainSASL(manager.getServer().getSecurityStore())};
}
return result;
}
@Override

14
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/sasl/ActiveMQPlainSASL.java
View File

@ -17,24 +17,26 @@
package org.apache.activemq.artemis.core.protocol.proton.sasl;
import org.apache.activemq.artemis.core.security.SecurityStore;
import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import org.proton.plug.sasl.ServerSASLPlain;
public class ActiveMQPlainSASL extends ServerSASLPlain {
private final ActiveMQSecurityManager securityManager;
private final SecurityStore securityStore;
public ActiveMQPlainSASL(SecurityStore securityStore, ActiveMQSecurityManager securityManager) {
this.securityManager = securityManager;
public ActiveMQPlainSASL(SecurityStore securityStore) {
this.securityStore = securityStore;
}
@Override
protected boolean authenticate(String user, String password) {
if (securityStore.isSecurityEnabled()) {
return securityManager.validateUser(user, password);
try {
securityStore.authenticate(user, password, null);
return true;
}
catch (Exception e) {
return false;
}
}
else {
return true;