You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2015/06/23 10:51:27 UTC

[1/3] incubator-ranger git commit: RANGER-563: permissions are duplicated in some policyItems after upgrade

Repository: incubator-ranger
Updated Branches:
  refs/heads/tag-policy 3afb0d69e -> 3a0982b51


RANGER-563: permissions are duplicated in some policyItems after upgrade

Signed-off-by: sneethiraj <sn...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/ec701f27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/ec701f27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/ec701f27

Branch: refs/heads/tag-policy
Commit: ec701f279847550229b2f44509b68edb8f995713
Parents: e2a5900
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Sat Jun 20 23:18:38 2015 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Mon Jun 22 09:42:18 2015 -0700

----------------------------------------------------------------------
 .../ranger/patch/PatchMigration_J10002.java     | 22 +++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/ec701f27/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java
index 44306d8..621159d 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java
@@ -471,10 +471,10 @@ public class PatchMigration_J10002 extends BaseLoader {
 				if(StringUtils.equalsIgnoreCase(accessType, "Admin")) {
 					policyItem.setDelegateAdmin(Boolean.TRUE);
 					if ( svcDef.getId() == EmbeddedServiceDefsUtil.instance().getHBaseServiceDefId()) {
-						accessList.add(new RangerPolicyItemAccess(accessType));
+						addAccessType(accessType, accessList);
 					}
 				} else {
-					accessList.add(new RangerPolicyItemAccess(accessType));
+					addAccessType(accessType, accessList);
 				}
 
 				ipAddress = permMap.getIpAddress();
@@ -509,7 +509,23 @@ public class PatchMigration_J10002 extends BaseLoader {
 
 		return policyItems;
 	}
-	
+
+	private void addAccessType(String accessType, List<RangerPolicyItemAccess> accessList) {
+		boolean alreadyExists = false;
+
+		for(RangerPolicyItemAccess access : accessList) {
+			if(StringUtils.equalsIgnoreCase(accessType, access.getType())) {
+				alreadyExists = true;
+
+				break;
+			}
+		}
+
+		if(!alreadyExists) {
+			accessList.add(new RangerPolicyItemAccess(accessType));
+		}
+	}
+
 	private void updateSequences() {
 		daoMgr.getXXServiceDef().updateSequence();
 		daoMgr.getXXService().updateSequence();


[2/3] incubator-ranger git commit: RANGER-274: Fixed failing unit test after merge from master

Posted by ma...@apache.org.
RANGER-274: Fixed failing unit test after merge from master

Signed-off-by: Madhan Neethiraj <ma...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/b85b3637
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/b85b3637
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/b85b3637

Branch: refs/heads/tag-policy
Commit: b85b36378a734a09bcc40570dba6186fa63ff2eb
Parents: ec701f2
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Mon Jun 22 14:28:50 2015 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Jun 22 19:35:06 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/ranger/biz/ServiceDBStore.java   |  9 +++++++--
 .../org/apache/ranger/biz/TestServiceDBStore.java    | 15 ++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b85b3637/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 326cae0..6813915 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -1068,6 +1068,11 @@ public class ServiceDBStore implements ServiceStore {
 			xConfMap = xConfMapDao.create(xConfMap);
 		}
 		RangerService createdService = svcService.getPopulatedViewObject(xCreatedService);
+
+		if (createdService == null) {
+			throw restErrorUtil.createRESTException("Could not create service - Internal error ", MessageEnums.ERROR_CREATING_OBJECT);
+		}
+
 		dataHistService.createObjectDataHistory(createdService, RangerDataHistService.ACTION_CREATE);
 
 		List<XXTrxLog> trxLogList = svcService.getTransactionLog(createdService,
@@ -1684,7 +1689,7 @@ public class ServiceDBStore implements ServiceStore {
 		return ret;
 	}
 
-	private void createDefaultPolicies(XXService createdService, VXUser vXUser) throws Exception {
+	void createDefaultPolicies(XXService createdService, VXUser vXUser) throws Exception {
 		// we need to create one policy for each resource hierarchy
 		RangerServiceDef serviceDef = getServiceDef(createdService.getType());
 		RangerServiceDefHelper serviceDefHelper = new RangerServiceDefHelper(serviceDef);
@@ -1692,7 +1697,7 @@ public class ServiceDBStore implements ServiceStore {
 		for (List<RangerResourceDef> aHierarchy : serviceDefHelper.getResourceHierarchies()) {
 			createDefaultPolicy(createdService, vXUser, aHierarchy, i);
 			i++;
-		}
+		};
 	}
 
 	private void createDefaultPolicy(XXService createdService, VXUser vXUser, List<RangerResourceDef> resourceHierarchy, int num) throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b85b3637/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
index e13b862..b2fdad6 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
@@ -1167,10 +1167,6 @@ public class TestServiceDBStore {
 		XXServiceConfigDefDao xServiceConfigDefDao = Mockito
 				.mock(XXServiceConfigDefDao.class);
 		XXService xService = Mockito.mock(XXService.class);
-		XXService xService2 = new XXService();
-		xService2.setId(1L);
-		xService2.setName("Test");
-		xService2.setType(1L);
 		XXUser xUser = Mockito.mock(XXUser.class);
 
 		RangerService rangerService = rangerService();
@@ -1210,9 +1206,6 @@ public class TestServiceDBStore {
 		Mockito.when(svcService.getPopulatedViewObject(xService)).thenReturn(
 				rangerService);
 
-		Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao);
-		Mockito.when(xServiceDao.getById(Mockito.anyLong())).thenReturn(xService2);		
-
 		Mockito.when(
 				rangerAuditFields.populateAuditFields(
 						Mockito.isA(XXServiceConfigMap.class),
@@ -1221,8 +1214,12 @@ public class TestServiceDBStore {
 		RangerServiceDef ran = new RangerServiceDef();
 		ran.setName("Test");
 		Mockito.when(serviceDefService.read(1L)).thenReturn(ran);
-		
-		serviceDBStore.createService(rangerService);
+
+		ServiceDBStore spy = Mockito.spy(serviceDBStore);
+
+		Mockito.doNothing().when(spy).createDefaultPolicies(xService, vXUser);
+
+		spy.createService(rangerService);
 		
 		Mockito.verify(daoManager, Mockito.atLeast(1)).getXXService();
 		Mockito.verify(daoManager).getXXServiceConfigMap();


[3/3] incubator-ranger git commit: Merge branch 'master' into tag-policy

Posted by ma...@apache.org.
Merge branch 'master' into tag-policy


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3a0982b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3a0982b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3a0982b5

Branch: refs/heads/tag-policy
Commit: 3a0982b5133ab9d786956d15e07d65f2af6401b9
Parents: 3afb0d6 b85b363
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Tue Jun 23 01:40:34 2015 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Tue Jun 23 01:40:34 2015 -0700

----------------------------------------------------------------------
 .../org/apache/ranger/biz/ServiceDBStore.java   |  9 ++++++--
 .../ranger/patch/PatchMigration_J10002.java     | 22 +++++++++++++++++---
 .../apache/ranger/biz/TestServiceDBStore.java   | 15 ++++++-------
 3 files changed, 32 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3a0982b5/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3a0982b5/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
----------------------------------------------------------------------