Skip to content

Commit

Permalink
[apache#5364] feat(auth-ranger): Throw AuthorizationPluginException i…
Browse files Browse the repository at this point in the history 
…n authorization plugin (apache#5386)

### What changes were proposed in this pull request?

Currently, the Authorization plugin throws RuntimePluginException, We
needs change it to AuthorizationPluginExceptionto

### Why are the changes needed?

Fix: apache#5364

### Does this PR introduce _any_ user-facing change?

N/A

### How was this patch tested?

Added ITs.

Co-authored-by: Xun <xun@datastrato.com>
  • Loading branch information
@github-actions @xunliu @danhuawang
2 people authored and danhuawang committed Nov 4, 2024
1 parent 8594b3e commit 9bd24be
Show file tree
Hide file tree
Showing 7 changed files with 131 additions and 76 deletions.
12 changes: 8 additions & 4 deletions api/src/main/java/org/apache/gravitino/exceptions/AuthorizationPluginException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.google.errorprone.annotations.FormatString;

/** An exception thrown when an authorization plugin operation failed. */
public class AuthorizationPluginException extends IllegalArgumentException {
public class AuthorizationPluginException extends GravitinoRuntimeException {

/**
* Constructs a new exception with the specified detail message.
Expand All @@ -36,11 +36,15 @@ public AuthorizationPluginException(@FormatString String message, Object... args
}

/**
* Constructs a new exception with the specified cause.
* Constructs a new exception with the specified detail message and cause.
*
* @param cause the cause.
* @param message the detail message.
* @param args the arguments to the message.
*/
public AuthorizationPluginException(Throwable cause) {
super(cause);
@FormatMethod
public AuthorizationPluginException(
Throwable cause, @FormatString String message, Object... args) {
super(cause, message, args);
}
}
49 changes: 29 additions & 20 deletions ...er/src/main/java/org/apache/gravitino/authorization/ranger/RangerAuthorizationPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ protected RangerAuthorizationPlugin(Map<String, String> config) {
* 2. Save role name in the Policy items. <br>
*/
@Override
public Boolean onRoleCreated(Role role) throws RuntimeException {
public Boolean onRoleCreated(Role role) throws AuthorizationPluginException {
if (!validAuthorizationOperation(role.securableObjects())) {
return false;
}
Expand All @@ -127,7 +127,7 @@ public Boolean onRoleCreated(Role role) throws RuntimeException {
}

@Override
public Boolean onRoleAcquired(Role role) throws RuntimeException {
public Boolean onRoleAcquired(Role role) throws AuthorizationPluginException {
if (!validAuthorizationOperation(role.securableObjects())) {
return false;
}
Expand All @@ -136,7 +136,7 @@ public Boolean onRoleAcquired(Role role) throws RuntimeException {

/** Remove the role name from the Ranger policy item, and delete this Role in the Ranger. <br> */
@Override
public Boolean onRoleDeleted(Role role) throws RuntimeException {
public Boolean onRoleDeleted(Role role) throws AuthorizationPluginException {
if (!validAuthorizationOperation(role.securableObjects())) {
return false;
}
Expand All @@ -157,7 +157,8 @@ public Boolean onRoleDeleted(Role role) throws RuntimeException {
}

@Override
public Boolean onRoleUpdated(Role role, RoleChange... changes) throws RuntimeException {
public Boolean onRoleUpdated(Role role, RoleChange... changes)
throws AuthorizationPluginException {
for (RoleChange change : changes) {
if (change instanceof RoleChange.AddSecurableObject) {
SecurableObject securableObject =
Expand All @@ -171,7 +172,7 @@ public Boolean onRoleUpdated(Role role, RoleChange... changes) throws RuntimeExc
.forEach(
rangerSecurableObject -> {
if (!doAddSecurableObject(role.name(), rangerSecurableObject)) {
throw new RuntimeException(
throw new AuthorizationPluginException(
"Failed to add the securable object to the Ranger policy!");
}
});
Expand All @@ -187,7 +188,7 @@ public Boolean onRoleUpdated(Role role, RoleChange... changes) throws RuntimeExc
.forEach(
rangerSecurableObject -> {
if (!doRemoveSecurableObject(role.name(), rangerSecurableObject)) {
throw new RuntimeException(
throw new AuthorizationPluginException(
"Failed to add the securable object to the Ranger policy!");
}
});
Expand Down Expand Up @@ -276,7 +277,7 @@ public Boolean onMetadataUpdated(MetadataObjectChange... changes) throws Runtime
*/
@Override
public Boolean onOwnerSet(MetadataObject metadataObject, Owner preOwner, Owner newOwner)
throws RuntimeException {
throws AuthorizationPluginException {
Preconditions.checkArgument(newOwner != null, "The newOwner must be not null");

// Add the user or group to the Ranger
Expand Down Expand Up @@ -365,7 +366,8 @@ public Boolean onOwnerSet(MetadataObject metadataObject, Owner preOwner, Owner n
rangerClient.updatePolicy(policy.getId(), policy);
}
} catch (RangerServiceException e) {
throw new RuntimeException(e);
throw new AuthorizationPluginException(
e, "Failed to add the owner to the Ranger!");
}
});
break;
Expand All @@ -385,7 +387,8 @@ public Boolean onOwnerSet(MetadataObject metadataObject, Owner preOwner, Owner n
rangerClient.updatePolicy(policy.getId(), policy);
}
} catch (RangerServiceException e) {
throw new RuntimeException(e);
throw new AuthorizationPluginException(
e, "Failed to add the owner to the Ranger!");
}
});
break;
Expand All @@ -408,7 +411,8 @@ public Boolean onOwnerSet(MetadataObject metadataObject, Owner preOwner, Owner n
* @param user The user to grant the roles.
*/
@Override
public Boolean onGrantedRolesToUser(List<Role> roles, User user) throws RuntimeException {
public Boolean onGrantedRolesToUser(List<Role> roles, User user)
throws AuthorizationPluginException {
if (roles.stream().anyMatch(role -> !validAuthorizationOperation(role.securableObjects()))) {
return false;
}
Expand Down Expand Up @@ -443,7 +447,8 @@ public Boolean onGrantedRolesToUser(List<Role> roles, User user) throws RuntimeE
* @param user The user to revoke the roles.
*/
@Override
public Boolean onRevokedRolesFromUser(List<Role> roles, User user) throws RuntimeException {
public Boolean onRevokedRolesFromUser(List<Role> roles, User user)
throws AuthorizationPluginException {
if (roles.stream().anyMatch(role -> !validAuthorizationOperation(role.securableObjects()))) {
return false;
}
Expand Down Expand Up @@ -477,7 +482,8 @@ public Boolean onRevokedRolesFromUser(List<Role> roles, User user) throws Runtim
* @param group The group to grant the roles.
*/
@Override
public Boolean onGrantedRolesToGroup(List<Role> roles, Group group) throws RuntimeException {
public Boolean onGrantedRolesToGroup(List<Role> roles, Group group)
throws AuthorizationPluginException {
if (roles.stream().anyMatch(role -> !validAuthorizationOperation(role.securableObjects()))) {
return false;
}
Expand Down Expand Up @@ -510,7 +516,8 @@ public Boolean onGrantedRolesToGroup(List<Role> roles, Group group) throws Runti
* @param group The group to revoke the roles.
*/
@Override
public Boolean onRevokedRolesFromGroup(List<Role> roles, Group group) throws RuntimeException {
public Boolean onRevokedRolesFromGroup(List<Role> roles, Group group)
throws AuthorizationPluginException {
if (roles.stream().anyMatch(role -> !validAuthorizationOperation(role.securableObjects()))) {
return false;
}
Expand All @@ -533,7 +540,7 @@ public Boolean onRevokedRolesFromGroup(List<Role> roles, Group group) throws Run
}

@Override
public Boolean onUserAdded(User user) throws RuntimeException {
public Boolean onUserAdded(User user) throws AuthorizationPluginException {
VXUserList list = rangerClient.searchUser(ImmutableMap.of("name", user.name()));
if (list.getListSize() > 0) {
LOG.warn("The user({}) already exists in the Ranger!", user.name());
Expand All @@ -545,7 +552,7 @@ public Boolean onUserAdded(User user) throws RuntimeException {
}

@Override
public Boolean onUserRemoved(User user) throws RuntimeException {
public Boolean onUserRemoved(User user) throws AuthorizationPluginException {
VXUserList list = rangerClient.searchUser(ImmutableMap.of("name", user.name()));
if (list.getListSize() == 0) {
LOG.warn("The user({}) doesn't exist in the Ranger!", user);
Expand All @@ -556,7 +563,7 @@ public Boolean onUserRemoved(User user) throws RuntimeException {
}

@Override
public Boolean onUserAcquired(User user) throws RuntimeException {
public Boolean onUserAcquired(User user) throws AuthorizationPluginException {
VXUserList list = rangerClient.searchUser(ImmutableMap.of("name", user.name()));
if (list.getListSize() == 0) {
LOG.warn("The user({}) doesn't exist in the Ranger!", user);
Expand All @@ -566,13 +573,13 @@ public Boolean onUserAcquired(User user) throws RuntimeException {
}

@Override
public Boolean onGroupAdded(Group group) throws RuntimeException {
public Boolean onGroupAdded(Group group) throws AuthorizationPluginException {
return rangerClient.createGroup(
VXGroup.builder().withName(group.name()).withDescription(group.name()).build());
}

@Override
public Boolean onGroupRemoved(Group group) throws RuntimeException {
public Boolean onGroupRemoved(Group group) throws AuthorizationPluginException {
VXGroupList list = rangerClient.searchGroup(ImmutableMap.of("name", group.name()));
if (list.getListSize() == 0) {
LOG.warn("The group({}) doesn't exist in the Ranger!", group);
Expand Down Expand Up @@ -650,7 +657,8 @@ private boolean doAddSecurableObject(String roleName, RangerSecurableObject secu
rangerClient.updatePolicy(policy.getId(), policy);
}
} catch (RangerServiceException e) {
throw new RuntimeException(e);
throw new AuthorizationPluginException(
e, "Failed to add the securable object to the Ranger!");
}

return true;
Expand Down Expand Up @@ -720,7 +728,8 @@ private boolean doRemoveSecurableObject(
}
} catch (RangerServiceException e) {
LOG.error("Failed to remove the policy item from the Ranger policy {}!", policy);
throw new RuntimeException(e);
throw new AuthorizationPluginException(
e, "Failed to remove the securable object from Ranger!");
}
return true;
}
Expand Down
10 changes: 6 additions & 4 deletions ...rization-ranger/src/main/java/org/apache/gravitino/authorization/ranger/RangerHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void addPolicyItem(RangerPolicy policy, String roleName, RangerSecurableObject s
}

/**
* Find the managed policies for the ranger securable object.
* Find the managed policy for the ranger metadata names.
*
* @param metadataNames The metadata object names to find the managed policy.
* @return The managed policy for the metadata object.
Expand All @@ -182,7 +182,7 @@ public List<RangerPolicy> wildcardSearchPolies(List<String> metadataNames)
List<RangerPolicy> policies = rangerClient.findPolicies(searchFilters);
return policies;
} catch (RangerServiceException e) {
throw new AuthorizationPluginException(e);
throw new AuthorizationPluginException(e, "Failed to find the policies in the Ranger");
}
}

Expand Down Expand Up @@ -246,7 +246,8 @@ protected boolean checkRangerRole(String roleName) throws AuthorizationPluginExc
try {
rangerClient.getRole(roleName, rangerAdminName, rangerServiceName);
} catch (RangerServiceException e) {
throw new AuthorizationPluginException(e);
throw new AuthorizationPluginException(
e, "Failed to check the role(%s) in the Ranger", roleName);
}
return true;
}
Expand Down Expand Up @@ -302,7 +303,8 @@ protected RangerRole createRangerRoleIfNotExists(String roleName, boolean isOwne
rangerClient.createRole(rangerServiceName, rangerRole);
}
} catch (RangerServiceException e) {
throw new RuntimeException(e);
throw new AuthorizationPluginException(
e, "Failed to create the role(%s) in the Ranger", roleName);
}
return rangerRole;
}
Expand Down
54 changes: 43 additions & 11 deletions ...rc/test/java/org/apache/gravitino/authorization/ranger/integration/test/RangerHiveIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.apache.gravitino.authorization.ranger.integration.test.RangerITEnv.rangerClient;
import static org.apache.gravitino.authorization.ranger.integration.test.RangerITEnv.verifyRoleInRanger;

import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
Expand Down Expand Up @@ -49,6 +50,7 @@
import org.apache.gravitino.authorization.ranger.RangerPrivileges;
import org.apache.gravitino.authorization.ranger.RangerSecurableObject;
import org.apache.gravitino.authorization.ranger.reference.RangerDefines;
import org.apache.gravitino.exceptions.AuthorizationPluginException;
import org.apache.gravitino.integration.test.util.GravitinoITUtils;
import org.apache.gravitino.meta.AuditInfo;
import org.apache.gravitino.meta.GroupEntity;
Expand Down Expand Up @@ -325,16 +327,20 @@ public void testFindManagedPolicy() {
String dbName = currentFunName();
createHivePolicy(
Lists.newArrayList(String.format("%s*", dbName), "*"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
createHivePolicy(
Lists.newArrayList(String.format("%s*", dbName), "tab*"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
createHivePolicy(
Lists.newArrayList(String.format("%s3", dbName), "*"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
createHivePolicy(
Lists.newArrayList(String.format("%s3", dbName), "tab*"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
// findManagedPolicy function use precise search, so return null
RangerSecurableObject rangerSecurableObject =
rangerAuthHivePlugin.generateRangerSecurableObject(
Expand All @@ -348,12 +354,33 @@ public void testFindManagedPolicy() {
// Add a policy for `db3.tab1`
createHivePolicy(
Lists.newArrayList(String.format("%s3", dbName), "tab1"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
// findManagedPolicy function use precise search, so return not null
Assertions.assertNotNull(rangerHelper.findManagedPolicy(rangerSecurableObject));
}

static void createHivePolicy(List<String> metaObjects, String roleName) {
@Test
public void testManagedByGravitinoLabel() {
RoleEntity role = mock3TableRole(currentFunName());
role.securableObjects().stream()
.forEach(
securableObject -> {
Joiner DOT_JOINER = Joiner.on('.');
List<String> names =
Lists.newArrayList(
SecurableObjects.DOT_SPLITTER.splitToList(securableObject.fullName()));
names.remove(0); // remove catalog node
// Manual create the Ranger Policy
createHivePolicy(Lists.newArrayList(names), DOT_JOINER.join(names), false);
});
// Use role to create Ranger Policy
Assertions.assertThrows(
AuthorizationPluginException.class, () -> rangerAuthHivePlugin.onRoleCreated(role));
}

static void createHivePolicy(
List<String> metaObjects, String roleName, boolean labelManagedByGravitino) {
Assertions.assertTrue(metaObjects.size() < 4);
Map<String, RangerPolicy.RangerPolicyResource> policyResourceMap = new HashMap<>();
for (int i = 0; i < metaObjects.size(); i++) {
Expand All @@ -377,7 +404,8 @@ static void createHivePolicy(List<String> metaObjects, String roleName) {
RangerITEnv.RANGER_HIVE_REPO_NAME,
roleName,
policyResourceMap,
Collections.singletonList(policyItem));
Collections.singletonList(policyItem),
labelManagedByGravitino);
}

static boolean deleteHivePolicy(RangerSecurableObject rangerSecurableObject) {
Expand Down Expand Up @@ -780,16 +808,20 @@ void metadataObjectChangeRemoveMetalakeOrCatalog(String funcName, MetadataObject
throws RangerServiceException {
createHivePolicy(
Lists.newArrayList(String.format("%s*", funcName), "*"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
createHivePolicy(
Lists.newArrayList(String.format("%s*", funcName), "tab*"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
createHivePolicy(
Lists.newArrayList(String.format("%s3", funcName), "*"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
createHivePolicy(
Lists.newArrayList(String.format("%s3", funcName), "tab*"),
GravitinoITUtils.genRandomName(currentFunName()));
GravitinoITUtils.genRandomName(currentFunName()),
true);
Assertions.assertEquals(
4, rangerClient.getPoliciesInService(RangerITEnv.RANGER_HIVE_REPO_NAME).size());

Expand Down
Loading

0 comments on commit 9bd24be

Please sign in to comment.