Skip to content

ARTEMIS-6010 - RBAC authorization speedup #6370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GChuf wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −23
Open

ARTEMIS-6010 - RBAC authorization speedup #6370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
514b3cb
ARTEMIS-6010 - remove if authorized check for trace log
GChuf Apr 16, 2026
905731b
ARTEMIS-6010 - Improve roles checking in authorize call
GChuf Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ...main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQBasicSecurityManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,8 @@ public boolean authorize(final Subject subject,
final CheckType checkType,
final String address) {
boolean authorized = SecurityManagerUtil.authorize(subject, roles, checkType, RolePrincipal.class);
if (authorized) {
logger.trace("user is authorized");
} else {
logger.trace("user is NOT authorized");
Comment on lines -111 to -114
Copy link
Copy Markdown
Contributor

@jbertram jbertram Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would probably be best to move this block into SecurityManagerUtil.authorize itself rather than repeating it in two places.

}

logger.trace("user is authorized: {}", authorized);
Copy link
Copy Markdown
Contributor

@jbertram jbertram Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion this makes the logging a bit less clear, easier to misread in a hurry.


return authorized;
}
Expand Down
6 changes: 1 addition & 5 deletions .../main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQJAASSecurityManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,7 @@ public boolean authorize(final Subject subject,
final String address) {
boolean authorized = SecurityManagerUtil.authorize(subject, roles, checkType, rolePrincipalClass);

if (authorized) {
logger.trace("user is authorized");
} else {
logger.trace("user is NOT authorized");
}
logger.trace("user is authorized: {}", authorized);

return authorized;
}
Expand Down
20 changes: 7 additions & 13 deletions artemis-server/src/main/java/org/apache/activemq/artemis/utils/SecurityManagerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.lang.reflect.Method;
import java.security.Principal;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.apache.activemq.artemis.core.security.CheckType;
Expand Down Expand Up @@ -114,31 +113,26 @@ public int hashCode() {
* This method tries to match the RolePrincipals in the Subject with the provided Set of Roles and CheckType
*/
public static boolean authorize(final Subject subject, final Set<Role> roles, final CheckType checkType, final Class rolePrincipalClass) {
boolean authorized = false;

if (subject != null) {
Set<RolePrincipal> rolesWithPermission = getPrincipalsInRole(checkType, roles, rolePrincipalClass);

// Check the caller's roles
Set<Principal> rolesForSubject = new HashSet<>();
Set<Principal> rolesForSubject;
try {
rolesForSubject.addAll(subject.getPrincipals(rolePrincipalClass));
rolesForSubject = subject.getPrincipals(rolePrincipalClass);
} catch (Exception e) {
ActiveMQServerLogger.LOGGER.failedToFindRolesForTheSubject(e);
return false;
}
if (!rolesForSubject.isEmpty() && !rolesWithPermission.isEmpty()) {
Iterator<Principal> rolesForSubjectIter = rolesForSubject.iterator();
while (!authorized && rolesForSubjectIter.hasNext()) {
Iterator<RolePrincipal> rolesWithPermissionIter = rolesWithPermission.iterator();
Principal subjectRole = rolesForSubjectIter.next();
while (!authorized && rolesWithPermissionIter.hasNext()) {
Principal roleWithPermission = rolesWithPermissionIter.next();
authorized = subjectRole.equals(roleWithPermission);
for (Principal subjectRole : rolesForSubject) {
if (rolesWithPermission.contains(subjectRole)) {
return true;
}
}
}
}

return authorized;
return false;
}
}