RANGER-4771: Remove the calls to ensureAdminAccess() in grantAccess()…

[Sanket-Shelar]

… and revokeAccess()

What changes were proposed in this pull request?

Added parameter in ensureAdminAccess() method to pass grantor in case userName is null.

How was this patch tested?

Build passed and checked if grant and revoke are working.

[mneethiraj]

When grantor is provided, that value should be used as userName, instead of bizUtil.getCurrentUserLoginId(). Also, shouldn't isAdmin and isKeyAdmin also be derived from grantor?

final String  userName;
final boolean isAdmin;
final boolean isKeyAdmin;

if (StringUtils.isEmpty(grantor)) { // use currently logged-in user
  userName   = bizUtil.getCurrentUserLoginId();
  isAdmin    = bizUtil.isAdmin();
  isKeyAdmin = bizUtil.isKeyAdmin();
} else {
  // find role of the given grantor; logic from SessionMgr.setUserRoles(userSession)
  Collection<String> userRoles = userMgr.getRolesByLoginId(grantor); // add @Autowired UserMgr userMgr;

  userName   = grantor;
  isAdmin    = userRoles.contains(RangerConstants.ROLE_SYS_ADMIN);
  isKeyAdmin = userRoles.contains(RangerConstants.ROLE_KEY_ADMIN);
}

[mneethiraj]

To avoid updates to existing use of ensureAdminAccess(policy), I suggest adding following method:

void ensureAdminAccess(RangerPolicy policy) {
  ensureAdminAccess(policy, null);
}

[kishorgollapalliwar]

Looks good to me.

[Sanket-Shelar]

Merged in master - c731ac3