Skip to content

Refactor: Optimize validation order in validateRoleStructure() #3166

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

Merged
havetisyan merged 1 commit into from
Jan 3, 2026
Merged

Refactor: Optimize validation order in validateRoleStructure() #3166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions servers/zms/src/main/java/com/yahoo/athenz/zms/ZMSImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4584,11 +4584,6 @@ void validateRoleStructure(final Role role, final String domainName, final Strin

if (!StringUtil.isEmpty(role.getTrust())) {

AthenzDomain athenzDomain = getAthenzDomain(role.getTrust(), true);
if (athenzDomain == null) {
throw ZMSUtils.requestError("Delegated role assigned to non existing domain", caller);
}

if (!ZMSUtils.isCollectionEmpty(role.getRoleMembers())) {
throw ZMSUtils.requestError("validateRoleMembers: Role cannot have both roleMembers and delegated domain set", caller);
}
Expand All @@ -4600,6 +4595,10 @@ void validateRoleStructure(final Role role, final String domainName, final Strin
if (domainName.equals(role.getTrust())) {
throw ZMSUtils.requestError("validateRoleMembers: Role cannot be delegated to itself", caller);
}

if (getAthenzDomain(role.getTrust(), true) == null) {
throw ZMSUtils.requestError("Delegated role assigned to non existing domain", caller);
}
}
}

Expand Down
Loading