Skip to content

consider force suffix while doing resource ownership check during del… #2922

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
Apr 4, 2025
Merged

consider force suffix while doing resource ownership check during del… #2922

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
6 changes: 5 additions & 1 deletion ...va/server_common/src/main/java/com/yahoo/athenz/common/server/util/ResourceOwnership.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ public static void verifyGroupMembersDeleteResourceOwnership(Group group, final
verifyDeleteResourceOwnership(resourceOwner, resourceOwnership.getMembersOwner(), caller);
}

public static void verifyDeleteResourceOwnership(final String resourceOwner, final String objectOwner,
public static void verifyDeleteResourceOwnership(String resourceOwner, final String objectOwner,
final String caller) throws ServerResourceException {

// first check if we're explicitly asked to ignore the check
Expand All @@ -839,6 +839,10 @@ public static void verifyDeleteResourceOwnership(final String resourceOwner, fin
return;
}

// if the current resource owner includes the force suffix then we need to drop it and
// then do the match
resourceOwner = getResourceOwnershipWithoutForceSuffix(resourceOwner, !StringUtil.isEmpty(resourceOwner));

// at this point we have an object owner so the value must match
// otherwise we'll throw a conflict error exception

Expand Down
34 changes: 34 additions & 0 deletions ...erver_common/src/test/java/com/yahoo/athenz/common/server/util/ResourceOwnershipTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,18 +274,52 @@ public void testVerifyDeleteResourceObjectOwnership() throws ServerResourceExcep
ResourceOwnership.verifyRoleDeleteResourceOwnership(new Role(), "resourceOwner", "unit-test");
ResourceOwnership.verifyRoleDeleteResourceOwnership(new Role()
.setResourceOwnership(new ResourceRoleOwnership()), "resourceOwner", "unit-test");
ResourceOwnership.verifyRoleDeleteResourceOwnership(new Role()
.setResourceOwnership(new ResourceRoleOwnership().setObjectOwner("A")), "A:force", "unit-test");
try {
ResourceOwnership.verifyRoleDeleteResourceOwnership(new Role()
.setResourceOwnership(new ResourceRoleOwnership().setObjectOwner("A")), "B:force", "unit-test");
fail();
}catch (ServerResourceException ignored) {

}

ResourceOwnership.verifyPolicyDeleteResourceOwnership(new Policy(), "resourceOwner", "unit-test");
ResourceOwnership.verifyPolicyDeleteResourceOwnership(new Policy()
.setResourceOwnership(new ResourcePolicyOwnership()), "resourceOwner", "unit-test");
ResourceOwnership.verifyPolicyDeleteResourceOwnership(new Policy()
.setResourceOwnership(new ResourcePolicyOwnership().setObjectOwner("A")), "A:force", "unit-test");
try {
ResourceOwnership.verifyPolicyDeleteResourceOwnership(new Policy()
.setResourceOwnership(new ResourcePolicyOwnership().setObjectOwner("A")), "B:force", "unit-test");
fail();
} catch (ServerResourceException ignored) {
}


ResourceOwnership.verifyGroupDeleteResourceOwnership(new Group(), "resourceOwner", "unit-test");
ResourceOwnership.verifyGroupDeleteResourceOwnership(new Group()
.setResourceOwnership(new ResourceGroupOwnership()), "resourceOwner", "unit-test");
ResourceOwnership.verifyGroupDeleteResourceOwnership(new Group()
.setResourceOwnership(new ResourceGroupOwnership().setObjectOwner("A")), "A:force", "unit-test");
try {
ResourceOwnership.verifyGroupDeleteResourceOwnership(new Group()
.setResourceOwnership(new ResourceGroupOwnership().setObjectOwner("A")), "B:force", "unit-test");
fail();
} catch (ServerResourceException ignored) {
}

ResourceOwnership.verifyServiceDeleteResourceOwnership(new ServiceIdentity(), "resourceOwner", "unit-test");
ResourceOwnership.verifyServiceDeleteResourceOwnership(new ServiceIdentity()
.setResourceOwnership(new ResourceServiceIdentityOwnership()), "resourceOwner", "unit-test");
ResourceOwnership.verifyServiceDeleteResourceOwnership(new ServiceIdentity()
.setResourceOwnership(new ResourceServiceIdentityOwnership().setObjectOwner("A")), "A:force", "unit-test");
try {
ResourceOwnership.verifyServiceDeleteResourceOwnership(new ServiceIdentity()
.setResourceOwnership(new ResourceServiceIdentityOwnership().setObjectOwner("A")), "B:force", "unit-test");
fail();
} catch (ServerResourceException ignored) {
}
}

@Test
Expand Down