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

Minor refactor of OpenWireProtocolManager 

In addDestination() put the security check right before
  actual queue creation. That'll also fix BasicSecurityTest
  regression.
This commit is contained in:
Howard Gao 2015-08-31 10:37:28 +08:00
parent 7f3c9dc1f0
commit 638674bce0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
View File

@ -572,16 +572,15 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>, No
ActiveMQDestination dest = info.getDestination(); ActiveMQDestination dest = info.getDestination();
if (dest.isQueue()) { if (dest.isQueue()) {
SimpleString qName = OpenWireUtil.toCoreAddress(dest); SimpleString qName = OpenWireUtil.toCoreAddress(dest);
if (connection.getState().getInfo() != null) {
CheckType checkType = dest.isTemporary() ? CheckType.CREATE_NON_DURABLE_QUEUE : CheckType.CREATE_DURABLE_QUEUE;
server.getSecurityStore().check(qName, checkType, connection);
server.checkQueueCreationLimit(connection.getUsername());
}
QueueBinding binding = (QueueBinding) server.getPostOffice().getBinding(qName); QueueBinding binding = (QueueBinding) server.getPostOffice().getBinding(qName);
if (binding == null) { if (binding == null) {
if (connection.getState().getInfo() != null) {
CheckType checkType = dest.isTemporary() ? CheckType.CREATE_NON_DURABLE_QUEUE : CheckType.CREATE_DURABLE_QUEUE;
server.getSecurityStore().check(qName, checkType, connection);
server.checkQueueCreationLimit(connection.getUsername());
}
ConnectionInfo connInfo = connection.getState().getInfo(); ConnectionInfo connInfo = connection.getState().getInfo();
this.server.createQueue(qName, qName, null, connInfo == null ? null : SimpleString.toSimpleString(connInfo.getUserName()), false, dest.isTemporary()); this.server.createQueue(qName, qName, null, connInfo == null ? null : SimpleString.toSimpleString(connInfo.getUserName()), false, dest.isTemporary());
} }