Github user linwen commented on a diff in the pull request:
https://github.com/apache/incubator-hawq/pull/1081#discussion_r95714559
--- Diff: src/backend/parser/parse_relation.c ---
@@ -2734,70 +2734,99 @@ ExecCheckRTPerms(List *rangeTable)
void
ExecCheckRTPermsWithRanger(List *rangeTable)
{
- List *ranger_check_args = NIL;
- ListCell *l;
- foreach(l, rangeTable)
- {
-
- AclMode requiredPerms;
- Oid relOid;
- Oid userid;
- RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
-
- if (rte->rtekind != RTE_RELATION)
- continue;
- requiredPerms = rte->requiredPerms;
- if (requiredPerms == 0)
- continue;
-
- relOid = rte->relid;
- userid = rte->checkAsUser ? rte->checkAsUser : GetUserId();
-
- RangerPrivilegeArgs *ranger_check_arg = (RangerPrivilegeArgs *)
palloc(sizeof(RangerPrivilegeArgs));
- ranger_check_arg->objkind = ACL_KIND_CLASS;
- ranger_check_arg->object_oid = relOid;
- ranger_check_arg->roleid = userid;
- ranger_check_arg->mask = requiredPerms;
- ranger_check_arg->how = ACLMASK_ALL;
- ranger_check_args = lappend(ranger_check_args, ranger_check_arg);
-
- } // foreach
-
- if (ranger_check_args == NIL)
- return;
-
- // ranger ACL check with package Oids
- List *aclresults = NIL;
- aclresults = pg_rangercheck_batch(ranger_check_args);
- if (aclresults == NIL)
- {
- elog(ERROR, "ACL check failed\n");
- return;
- }
-
- // check result
- ListCell *result;
- foreach(result, aclresults)
- {
- RangerPrivilegeResults *result_ptr = (RangerPrivilegeResults *)
lfirst(result);
- if(result_ptr->result != RANGERCHECK_OK)
- {
- Oid relOid = result_ptr->relOid;
- const char *rel_name = get_rel_name_partition(relOid);
- aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_CLASS, rel_name);
- }
- }
-
- if (ranger_check_args)
- {
- list_free_deep(ranger_check_args);
- ranger_check_args = NIL;
- }
- if (aclresults)
- {
- list_free_deep(aclresults);
- aclresults = NIL;
- }
+ List *ranger_check_args = NIL;
+ ListCell *l;
+ foreach(l, rangeTable)
+ {
+
+ AclMode requiredPerms;
+ Oid relOid;
+ Oid userid;
+ RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
+
+ if (rte->rtekind != RTE_RELATION)
+ continue;
+ requiredPerms = rte->requiredPerms;
+ if (requiredPerms == 0)
+ continue;
+
+ relOid = rte->relid;
+ userid = rte->checkAsUser ? rte->checkAsUser : GetUserId();
+
+ RangerPrivilegeArgs *ranger_check_arg = (RangerPrivilegeArgs *)
palloc(sizeof(RangerPrivilegeArgs));
+ ranger_check_arg->objkind = ACL_KIND_CLASS;
+ ranger_check_arg->object_oid = relOid;
+ ranger_check_arg->roleid = userid;
+ ranger_check_arg->mask = requiredPerms;
+ ranger_check_arg->how = ACLMASK_ALL;
+ ranger_check_args = lappend(ranger_check_args,
ranger_check_arg);
+
+ } // foreach
+
+ if (ranger_check_args == NIL)
+ return;
+
+ // ranger ACL check with package Oids
--- End diff --
this comment should use /**/ instead of //
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
