Skip to content

consistent use of TYPE_PRINCIPAL_NAME type when validating principal names #3302

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
psasidhar merged 1 commit into from
Apr 13, 2026
Merged

consistent use of TYPE_PRINCIPAL_NAME type when validating principal names #3302

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 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 @@ -10339,7 +10339,7 @@ void logPrincipal(ResourceContext ctx) {

final String principalName = ((RsrcCtxWrapper) ctx).logPrincipal();
if (principalName != null) {
validate(principalName, TYPE_SERVICE_NAME, "logPrincipal");
validate(principalName, TYPE_PRINCIPAL_NAME, "logPrincipal");
}
}

Expand Down Expand Up @@ -11065,7 +11065,7 @@ public DomainRoleMembership getPendingDomainRoleMembersList(ResourceContext ctx,

String checkPrincipal = null;
if (!StringUtil.isEmpty(principal)) {
validate(principal, TYPE_ENTITY_NAME, caller);
validate(principal, TYPE_PRINCIPAL_NAME, caller);
checkPrincipal = normalizeDomainAliasUser(principal.toLowerCase());
} else if (StringUtil.isEmpty(checkDomainName)) {
checkPrincipal = ctxPrincipal.getFullName();
Expand Down Expand Up @@ -12503,7 +12503,7 @@ public DomainGroupMembership getPendingDomainGroupMembersList(ResourceContext ct

String checkPrincipal = null;
if (!StringUtil.isEmpty(principal)) {
validate(principal, TYPE_ENTITY_NAME, caller);
validate(principal, TYPE_PRINCIPAL_NAME, caller);
checkPrincipal = normalizeDomainAliasUser(principal.toLowerCase());
} else if (StringUtil.isEmpty(checkDomainName)) {
checkPrincipal = ctxPrincipal.getFullName();
Expand Down Expand Up @@ -13092,7 +13092,7 @@ public ReviewObjects getRolesForReview(ResourceContext ctx, String principal) {
principal = ((RsrcCtxWrapper) ctx).principal().getFullName();
}
validateRequest(ctx.request(), caller);
validate(principal, TYPE_RESOURCE_NAME, caller);
validate(principal, TYPE_PRINCIPAL_NAME, caller);

// for consistent handling of all requests, we're going to convert
// all incoming object values into lower case
Expand All @@ -13119,7 +13119,7 @@ public ReviewObjects getGroupsForReview(ResourceContext ctx, String principal) {
principal = ((RsrcCtxWrapper) ctx).principal().getFullName();
}
validateRequest(ctx.request(), caller);
validate(principal, TYPE_RESOURCE_NAME, caller);
validate(principal, TYPE_PRINCIPAL_NAME, caller);

// for consistent handling of all requests, we're going to convert
// all incoming object values into lower case
Expand Down Expand Up @@ -13165,7 +13165,7 @@ public void putPrincipalState(ResourceContext ctx, String principalName, String
}

validateRequest(ctx.request(), caller);
validate(principalName, TYPE_MEMBER_NAME, caller);
validate(principalName, TYPE_PRINCIPAL_NAME, caller);

if (StringUtil.isEmpty(auditRef)) {
throw ZMSUtils.requestError("Audit reference is required for this operation", caller);
Expand Down
4 changes: 2 additions & 2 deletions servers/zts/src/main/java/com/yahoo/athenz/zts/ZTSImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4207,7 +4207,7 @@ public RoleAccess getRolesRequireRoleCert(ResourceContext ctx, String principal)
if (StringUtil.isEmpty(principal)) {
principal = ((RsrcCtxWrapper) ctx).principal().getFullName();
}
validate(principal, TYPE_ENTITY_NAME, principalDomain, caller);
validate(principal, TYPE_PRINCIPAL_NAME, principalDomain, caller);

// for consistent handling of all requests, we're going to convert
// all incoming object values into lower case since ZTS Server
Expand Down Expand Up @@ -6799,7 +6799,7 @@ String logPrincipalAndGetDomain(ResourceContext ctx) {
final String principalName = ((RsrcCtxWrapper) ctx).logPrincipal();
final String principalDomain = ((RsrcCtxWrapper) ctx).getPrincipalDomain();
if (principalName != null) {
validate(principalName, TYPE_SERVICE_NAME, "logPrincipal", principalDomain);
validate(principalName, TYPE_PRINCIPAL_NAME, "logPrincipal", principalDomain);
}
return principalDomain;
}
Expand Down
Loading