You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by rm...@apache.org on 2015/02/21 02:49:49 UTC
[1/2] incubator-ranger git commit: Revert "BUG-32018 : Issue in Hive
policy creation in ranger for UDF resource if we specify {{*}} ( access for
all UDF)"
Repository: incubator-ranger
Updated Branches:
refs/heads/ranger-0.4 f79476bde -> c5c4d335e
Revert "BUG-32018 : Issue in Hive policy creation in ranger for UDF resource if we specify {{*}} ( access for all UDF)"
This reverts commit f79476bde51cb9679c442cf80dcbe8b5ccb48c7b.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/88dead26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/88dead26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/88dead26
Branch: refs/heads/ranger-0.4
Commit: 88dead26deb617c211d3b0faaa34de2ae46240ac
Parents: f79476b
Author: rmani <rm...@hortonworks.com>
Authored: Fri Feb 20 17:48:05 2015 -0800
Committer: rmani <rm...@hortonworks.com>
Committed: Fri Feb 20 17:48:05 2015 -0800
----------------------------------------------------------------------
.../src/main/java/com/xasecure/biz/AssetMgr.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/88dead26/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java b/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java
index 708d447..521cea7 100644
--- a/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java
+++ b/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java
@@ -284,9 +284,6 @@ public class AssetMgr extends AssetMgrBase {
}
}
- // set the resourceType based on the resource as there is issue with resourceType coming from UI
- // when resource is UDF
- vXResource.setResourceType(xPolicyService.getResourceType(vXResource));
vXResource = xResourceService.createResource(vXResource);
@@ -311,7 +308,7 @@ public class AssetMgr extends AssetMgrBase {
@Override
public VXResource updateXResource(VXResource vXResource) {
-
+
UserSessionBase currentUserSession = ContextUtil
.getCurrentUserSession();
if (currentUserSession == null) {
@@ -456,12 +453,7 @@ public class AssetMgr extends AssetMgrBase {
List<XXTrxLog> trxLogList = xResourceService.getTransactionLog(
vXResource, xResouce, "update");
- // set the resourceType based on the resource as there is issue with resourceType coming from UI
- // when resource is UDF
- vXResource.setResourceType(xPolicyService.getResourceType(vXResource));
-
VXResource resource = super.updateXResource(vXResource);
-
List<VXPermMap> newPermMapList = vXResource.getPermMapList();
searchCriteria = new SearchCriteria();
[2/2] incubator-ranger git commit: Revert "BUG-31949: In hive plugin
TABLE policy restriction for all tables {{*}} fails when UDF policy for all
functions {{*}} is maintained for a database"
Posted by rm...@apache.org.
Revert "BUG-31949: In hive plugin TABLE policy restriction for all tables {{*}} fails when UDF policy for all functions {{*}} is maintained for a database"
This reverts commit 9c0c5d953d4821c5311c2d6389c8c3f3f98e8927.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c5c4d335
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c5c4d335
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c5c4d335
Branch: refs/heads/ranger-0.4
Commit: c5c4d335ee68e5b563eb385e3f9664640073c810
Parents: 88dead2
Author: rmani <rm...@hortonworks.com>
Authored: Fri Feb 20 17:48:12 2015 -0800
Committer: rmani <rm...@hortonworks.com>
Committed: Fri Feb 20 17:48:12 2015 -0800
----------------------------------------------------------------------
.../src/main/java/com/xasecure/pdp/hive/HiveAuthDB.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c5c4d335/agents-impl/src/main/java/com/xasecure/pdp/hive/HiveAuthDB.java
----------------------------------------------------------------------
diff --git a/agents-impl/src/main/java/com/xasecure/pdp/hive/HiveAuthDB.java b/agents-impl/src/main/java/com/xasecure/pdp/hive/HiveAuthDB.java
index 5550183..e64c3e9 100644
--- a/agents-impl/src/main/java/com/xasecure/pdp/hive/HiveAuthDB.java
+++ b/agents-impl/src/main/java/com/xasecure/pdp/hive/HiveAuthDB.java
@@ -218,10 +218,6 @@ public class HiveAuthDB {
boolean ret = false;
for (HiveAuthRule rule : allRuleList) {
- if(rule.isUdf()) {
- continue;
- }
-
ret = rule.isMatched(database, ugi.getShortUserName(), ugi.getGroupNames(), accessType);
if(ret) {
@@ -240,10 +236,6 @@ public class HiveAuthDB {
boolean ret = false;
for (HiveAuthRule rule : tblRuleList) {
- if(rule.isUdf()) {
- continue;
- }
-
ret = rule.isMatched(database, tableOrView, ugi.getShortUserName(), ugi.getGroupNames(), accessType);
if(ret) {