Skip to content

Commit

Permalink
Update code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuqi1129
yuqi1129 committed Dec 6, 2024
1 parent 70838ef commit 9f8d5ea
Show file tree
Hide file tree
Showing 22 changed files with 1,475 additions and 1,436 deletions.
112 changes: 93 additions & 19 deletions core/src/main/java/org/apache/gravitino/authorization/AccessControlManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.gravitino.Configs;
import org.apache.gravitino.EntityStore;
import org.apache.gravitino.MetadataObject;
import org.apache.gravitino.NameIdentifier;
import org.apache.gravitino.exceptions.GroupAlreadyExistsException;
import org.apache.gravitino.exceptions.IllegalRoleException;
import org.apache.gravitino.exceptions.NoSuchGroupException;
Expand All @@ -33,7 +34,10 @@
import org.apache.gravitino.exceptions.NoSuchUserException;
import org.apache.gravitino.exceptions.RoleAlreadyExistsException;
import org.apache.gravitino.exceptions.UserAlreadyExistsException;
import org.apache.gravitino.lock.LockType;
import org.apache.gravitino.lock.TreeLockUtils;
import org.apache.gravitino.storage.IdGenerator;
import org.apache.gravitino.utils.MetadataObjectUtil;

/**
* AccessControlManager is used for manage users, roles, grant information, this class is an
Expand All @@ -56,44 +60,68 @@ public AccessControlManager(EntityStore store, IdGenerator idGenerator, Config c
@Override
public User addUser(String metalake, String user)
throws UserAlreadyExistsException, NoSuchMetalakeException {
return userGroupManager.addUser(metalake, user);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofGroupNamespace(metalake).levels()),
LockType.WRITE,
() -> userGroupManager.addUser(metalake, user));
}

@Override
public boolean removeUser(String metalake, String user) throws NoSuchMetalakeException {
return userGroupManager.removeUser(metalake, user);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofGroupNamespace(metalake).levels()),
LockType.WRITE,
() -> userGroupManager.removeUser(metalake, user));
}

@Override
public User getUser(String metalake, String user)
throws NoSuchUserException, NoSuchMetalakeException {
return userGroupManager.getUser(metalake, user);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofGroup(metalake, user),
LockType.READ,
() -> userGroupManager.getUser(metalake, user));
}

@Override
public String[] listUserNames(String metalake) throws NoSuchMetalakeException {
return userGroupManager.listUserNames(metalake);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofUserNamespace(metalake).levels()),
LockType.READ,
() -> userGroupManager.listUserNames(metalake));
}

@Override
public User[] listUsers(String metalake) throws NoSuchMetalakeException {
return userGroupManager.listUsers(metalake);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofUserNamespace(metalake).levels()),
LockType.READ,
() -> userGroupManager.listUsers(metalake));
}

public Group addGroup(String metalake, String group)
throws GroupAlreadyExistsException, NoSuchMetalakeException {
return userGroupManager.addGroup(metalake, group);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofGroupNamespace(metalake).levels()),
LockType.WRITE,
() -> userGroupManager.addGroup(metalake, group));
}

@Override
public boolean removeGroup(String metalake, String group) throws NoSuchMetalakeException {
return userGroupManager.removeGroup(metalake, group);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofGroupNamespace(metalake).levels()),
LockType.WRITE,
() -> userGroupManager.removeGroup(metalake, group));
}

@Override
public Group getGroup(String metalake, String group)
throws NoSuchGroupException, NoSuchMetalakeException {
return userGroupManager.getGroup(metalake, group);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofGroup(metalake, group),
LockType.READ,
() -> userGroupManager.getGroup(metalake, group));
}

@Override
Expand All @@ -109,25 +137,53 @@ public String[] listGroupNames(String metalake) throws NoSuchMetalakeException {
@Override
public User grantRolesToUser(String metalake, List<String> roles, String user)
throws NoSuchUserException, IllegalRoleException, NoSuchMetalakeException {
return permissionManager.grantRolesToUser(metalake, roles, user);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofUser(metalake, user),
LockType.WRITE,
() ->
TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofRoleNamespace(metalake).levels()),
LockType.READ,
() -> permissionManager.grantRolesToUser(metalake, roles, user)));
}

@Override
public Group grantRolesToGroup(String metalake, List<String> roles, String group)
throws NoSuchGroupException, IllegalRoleException, NoSuchMetalakeException {
return permissionManager.grantRolesToGroup(metalake, roles, group);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofGroup(metalake, group),
LockType.WRITE,
() ->
TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofRoleNamespace(metalake).levels()),
LockType.READ,
() -> permissionManager.grantRolesToGroup(metalake, roles, group)));
}

@Override
public Group revokeRolesFromGroup(String metalake, List<String> roles, String group)
throws NoSuchGroupException, IllegalRoleException, NoSuchMetalakeException {
return permissionManager.revokeRolesFromGroup(metalake, roles, group);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofGroup(metalake, group),
LockType.WRITE,
() ->
TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofRoleNamespace(metalake).levels()),
LockType.READ,
() -> permissionManager.revokeRolesFromGroup(metalake, roles, group)));
}

@Override
public User revokeRolesFromUser(String metalake, List<String> roles, String user)
throws NoSuchUserException, IllegalRoleException, NoSuchMetalakeException {
return permissionManager.revokeRolesFromUser(metalake, roles, user);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofUser(metalake, user),
LockType.WRITE,
() ->
TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofRoleNamespace(metalake).levels()),
LockType.READ,
() -> permissionManager.revokeRolesFromUser(metalake, roles, user)));
}

@Override
Expand All @@ -142,42 +198,60 @@ public Role createRole(
Map<String, String> properties,
List<SecurableObject> securableObjects)
throws RoleAlreadyExistsException, NoSuchMetalakeException {
return roleManager.createRole(metalake, role, properties, securableObjects);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofRoleNamespace(metalake).levels()),
LockType.WRITE,
() -> roleManager.createRole(metalake, role, properties, securableObjects));
}

@Override
public Role getRole(String metalake, String role)
throws NoSuchRoleException, NoSuchMetalakeException {
return roleManager.getRole(metalake, role);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofRole(metalake, role),
LockType.READ,
() -> roleManager.getRole(metalake, role));
}

@Override
public boolean deleteRole(String metalake, String role) throws NoSuchMetalakeException {
return roleManager.deleteRole(metalake, role);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(AuthorizationUtils.ofRoleNamespace(metalake).levels()),
LockType.WRITE,
() -> roleManager.deleteRole(metalake, role));
}

@Override
public String[] listRoleNames(String metalake) throws NoSuchMetalakeException {
return roleManager.listRoleNames(metalake);
return TreeLockUtils.doWithTreeLock(
NameIdentifier.of(metalake), LockType.READ, () -> roleManager.listRoleNames(metalake));
}

@Override
public String[] listRoleNamesByObject(String metalake, MetadataObject object)
throws NoSuchMetalakeException, NoSuchMetadataObjectException {
return roleManager.listRoleNamesByObject(metalake, object);
NameIdentifier identifier = MetadataObjectUtil.toEntityIdent(metalake, object);
return TreeLockUtils.doWithTreeLock(
identifier, LockType.READ, () -> roleManager.listRoleNamesByObject(metalake, object));
}

@Override
public Role grantPrivilegeToRole(
String metalake, String role, MetadataObject object, List<Privilege> privileges)
throws NoSuchRoleException, NoSuchMetalakeException {
return permissionManager.grantPrivilegesToRole(metalake, role, object, privileges);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofRole(metalake, role),
LockType.WRITE,
() -> permissionManager.grantPrivilegesToRole(metalake, role, object, privileges));
}

@Override
public Role revokePrivilegesFromRole(
String metalake, String role, MetadataObject object, List<Privilege> privileges)
throws NoSuchRoleException, NoSuchMetalakeException {
return permissionManager.revokePrivilegesFromRole(metalake, role, object, privileges);
return TreeLockUtils.doWithTreeLock(
AuthorizationUtils.ofRole(metalake, role),
LockType.WRITE,
() -> permissionManager.revokePrivilegesFromRole(metalake, role, object, privileges));
}
}
Loading

0 comments on commit 9f8d5ea

Please sign in to comment.