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

https://issues.apache.org/jira/browse/AMQ-5096 

Return proper error code for unathorized access.
This commit is contained in:
Timothy Bish 2014-03-12 16:12:22 -04:00
parent 9c24716044
commit 1671523076
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
View File

@ -743,7 +743,11 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
if (response.isException()) { if (response.isException()) {
receiver.setTarget(null); receiver.setTarget(null);
Throwable exception = ((ExceptionResponse) response).getException(); Throwable exception = ((ExceptionResponse) response).getException();
receiver.setCondition(new ErrorCondition(AmqpError.INTERNAL_ERROR, exception.getMessage())); if (exception instanceof SecurityException) {
receiver.setCondition(new ErrorCondition(AmqpError.UNAUTHORIZED_ACCESS, exception.getMessage()));
} else {
receiver.setCondition(new ErrorCondition(AmqpError.INTERNAL_ERROR, exception.getMessage()));
}
receiver.close(); receiver.close();
} else { } else {
receiver.open(); receiver.open();
@ -1151,7 +1155,11 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
if (response.isException()) { if (response.isException()) {
sender.setSource(null); sender.setSource(null);
Throwable exception = ((ExceptionResponse) response).getException(); Throwable exception = ((ExceptionResponse) response).getException();
sender.setCondition(new ErrorCondition(AmqpError.INTERNAL_ERROR, exception.getMessage())); if (exception instanceof SecurityException) {
sender.setCondition(new ErrorCondition(AmqpError.UNAUTHORIZED_ACCESS, exception.getMessage()));
} else {
sender.setCondition(new ErrorCondition(AmqpError.INTERNAL_ERROR, exception.getMessage()));
}
} }
sender.open(); sender.open();
pumpProtonToSocket(); pumpProtonToSocket();
@ -1203,11 +1211,13 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
if (response.isException()) { if (response.isException()) {
sender.setSource(null); sender.setSource(null);
Throwable exception = ((ExceptionResponse) response).getException(); Throwable exception = ((ExceptionResponse) response).getException();
Symbol condition = AmqpError.INTERNAL_ERROR; if (exception instanceof SecurityException) {
if (exception instanceof InvalidSelectorException) { sender.setCondition(new ErrorCondition(AmqpError.UNAUTHORIZED_ACCESS, exception.getMessage()));
condition = AmqpError.INVALID_FIELD; } else if (exception instanceof InvalidSelectorException) {
sender.setCondition(new ErrorCondition(AmqpError.INVALID_FIELD, exception.getMessage()));
} else {
sender.setCondition(new ErrorCondition(AmqpError.INTERNAL_ERROR, exception.getMessage()));
} }
sender.setCondition(new ErrorCondition(condition, exception.getMessage()));
subscriptionsByConsumerId.remove(id); subscriptionsByConsumerId.remove(id);
sender.close(); sender.close();
} else { } else {