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

ARTEMIS-3462 Improve MBean Guard exception messages

This commit is contained in:
Domenico Francesco Bruscino 2021-09-07 14:07:19 +02:00 committed by Bruscino Domenico Francesco
parent 27c1df6687
commit 9d04c9d51d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java
View File

@ -77,10 +77,14 @@ public class ArtemisMBeanServerGuard implements InvocationHandler {
prefix = attr.isIs() ? "is" : "get";
}
}
if (prefix == null) {
//ActiveMQServerLogger.LOGGER.debug("Attribute " + attributeName + " can not be found for MBean " + objectName.toString());
} else {
handleInvoke(objectName, prefix + attributeName);
if (prefix != null) {
try {
handleInvoke(objectName, prefix + attributeName);
} catch (SecurityException e) {
// The security exception message is shown in the attributes tab of the console.
throw new SecurityException("User not authorized to access attribute: " + attributeName, e);
}
}
}
@ -121,7 +125,7 @@ public class ArtemisMBeanServerGuard implements InvocationHandler {
try {
objectName = ObjectName.getInstance(object);
} catch (MalformedObjectNameException e) {
ActiveMQServerLogger.LOGGER.debug("can't check invoke rights as object name invalid: " + objectName);
ActiveMQServerLogger.LOGGER.debug("can't check invoke rights as object name invalid: " + object);
return false;
}
if (canBypassRBAC(objectName)) {
@ -149,7 +153,7 @@ public class ArtemisMBeanServerGuard implements InvocationHandler {
if (AuditLogger.isResourceLoggingEnabled()) {
AuditLogger.objectInvokedFailure(objectName, operationName);
}
throw new SecurityException("Insufficient roles/credentials for operation");
throw new SecurityException("User not authorized to access operation: " + operationName);
}
List<String> getRequiredRoles(ObjectName objectName, String methodName) {