You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2018/08/30 15:00:53 UTC
directory-fortress-core git commit: FC-239 - Add ReviewMgr tests to
verify role constraints.
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 0b251f06e -> 5b99d7422
FC-239 - Add ReviewMgr tests to verify role constraints.
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/5b99d742
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/5b99d742
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/5b99d742
Branch: refs/heads/master
Commit: 5b99d7422c74de9e7387b46aac6f8f45f848e7b8
Parents: 0b251f0
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Aug 29 06:08:42 2018 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Aug 29 06:08:42 2018 -0500
----------------------------------------------------------------------
.../fortress/core/impl/ReviewMgrImpl.java | 4 +-
.../fortress/core/impl/AdminMgrImplTest.java | 8 +-
.../fortress/core/impl/FortressJUnitTest.java | 3 +-
.../fortress/core/impl/ReviewMgrImplTest.java | 78 +++++++++++++++++---
4 files changed, 75 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b99d742/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
index 0454e4a..8b26aaa 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
@@ -390,13 +390,13 @@ public class ReviewMgrImpl extends Manageable implements ReviewMgr, Serializable
*/
@Override
@AdminPermissionOperation
- public List<UserRole> assignedUsers(Role role, RCType rcType, String paSetName)
+ public List<UserRole> assignedUsers(Role role, RCType rcType, String keyName)
throws SecurityException
{
String methodName = "assignedUsers";
assertContext(CLS_NM, methodName, role, GlobalErrIds.ROLE_NULL);
checkAccess(CLS_NM, methodName);
- return userP.getAssignedUsers(role, rcType, paSetName);
+ return userP.getAssignedUsers(role, rcType, keyName);
}
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b99d742/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java
index e166f0f..4848aef 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AdminMgrImplTest.java
@@ -1776,7 +1776,7 @@ public class AdminMgrImplTest extends TestCase
}
- public static void assignUserRoleConstraints( String msg, String[][] urArray )
+ private void assignUserRoleConstraints( String msg, String[][] urArray )
{
LogUtil.logIt( msg );
try
@@ -1807,7 +1807,7 @@ public class AdminMgrImplTest extends TestCase
}
- public static void deassignUserRoleConstraints( String msg, String[][] urArray )
+ private void deassignUserRoleConstraints( String msg, String[][] urArray )
{
LogUtil.logIt( msg );
try
@@ -1839,7 +1839,7 @@ public class AdminMgrImplTest extends TestCase
enableRoleConstraint( "ENABLE ABAC RBAC", RoleTestData.ROLE_CONSTRAINTS_TR18_ROLES );
}
- public static void enableRoleConstraint( String msg, String[][] urArray )
+ private void enableRoleConstraint( String msg, String[][] urArray )
{
LogUtil.logIt( msg );
try
@@ -1873,7 +1873,7 @@ public class AdminMgrImplTest extends TestCase
disableRoleConstraint( "DIABLE ABAC RBAC", RoleTestData.ROLE_CONSTRAINTS_TR18_ROLES );
}
- public static void disableRoleConstraint( String msg, String[][] urArray )
+ private void disableRoleConstraint( String msg, String[][] urArray )
{
LogUtil.logIt( msg );
try
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b99d742/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java b/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
index 13c98c2..c09e41a 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
@@ -266,10 +266,9 @@ public class FortressJUnitTest extends TestCase
suite.addTest( new ReviewMgrImplTest( "testUserPermissions" ) );
suite.addTest( new ReviewMgrImplTest( "testFindSsdSets" ) );
suite.addTest( new ReviewMgrImplTest( "testFindDsdSets" ) );
-
+ suite.addTest( new ReviewMgrImplTest( "testAssignedUserRoleConstraints" ) );
suite.addTest( new ReviewMgrImplTest( "testReadPermissionAttributeSets" ) );
suite.addTest( new ReviewMgrImplTest( "testReadPASetFromPermission" ) );
-
suite.addTest( new ReviewMgrImplTest( "testReadUserRoleConstraint" ) );
suite.addTest( new ReviewMgrImplTest( "testFindRoleConstraints" ) );
suite.addTest( new ReviewMgrImplTest( "testDeassignRoleWithRoleConstraint" ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b99d742/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
index f0d0f0e..1410723 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
@@ -94,8 +94,9 @@ public class ReviewMgrImplTest extends TestCase
suite.addTest( new ReviewMgrImplTest( "testFindDsdSets" ) );
*/
- suite.addTest( new ReviewMgrImplTest( "testReadUserRoleConstraint" ) );
- suite.addTest( new ReviewMgrImplTest( "testFindRoleConstraints" ) );
+ //suite.addTest( new ReviewMgrImplTest( "testReadUserRoleConstraint" ) );
+ //suite.addTest( new ReviewMgrImplTest( "testFindRoleConstraints" ) );
+ suite.addTest( new ReviewMgrImplTest( "testAssignedUserRoleConstraints" ) );
return suite;
}
@@ -1615,12 +1616,13 @@ public class ReviewMgrImplTest extends TestCase
public void testReadUserRoleConstraint()
{
- readUserRoleConstraint( "RD-URC TU1 TR1", UserTestData.USERS_TU1[0], RoleTestData.ROLES_TR1[1], URATestData.getRC(URATestData.URC_T1) );
+ readUserRoleConstraint( "RD-URC TU1 TR1", UserTestData.USERS_TU1[0], RoleTestData.ROLES_TR1[1], URATestData
+ .getRC( URATestData.URC_T1 ) );
}
public static void readUserRoleConstraint( String msg, String[] usr, String[] rle, RoleConstraint rc )
{
- LogUtil.logIt(msg);
+ LogUtil.logIt( msg );
try
{
ReviewMgr reviewMgr = getManagedReviewMgr();
@@ -1663,30 +1665,86 @@ public class ReviewMgrImplTest extends TestCase
fail( ex.getMessage() );
}
}
-
+
+ public void testAssignedUserRoleConstraints()
+ {
+ assignUserRoleConstraints( "ASSGN-USER-ROLE-CONSTRAINTS TR18 ABAC", RoleTestData.ROLE_CONSTRAINTS_TR18_ABAC );
+ assignUserRoleConstraintsKey( "ASSGN-USER-ROLE-CONSTRAINTS WKEY TR18 ABAC", RoleTestData.ROLE_CONSTRAINTS_TR18_ABAC );
+ }
+
+ private void assignUserRoleConstraints( String msg, String[][] urArray )
+ {
+ LogUtil.logIt( msg );
+ try
+ {
+ ReviewMgr reviewMgr = ReviewMgrImplTest.getManagedReviewMgr();
+ for ( String[] urConstraint : urArray )
+ {
+ UserRole uRole = RoleTestData.getUserRoleConstraintAbac( urConstraint );
+ RoleConstraint constraint = uRole.getConstraints().get( 0 );
+ List<User> users = reviewMgr.assignedUsers( new Role( uRole.getName() ), constraint );
+ assertTrue( users.size() > 0 );
+ }
+ }
+ catch ( SecurityException ex )
+ {
+ LOG.error(
+ "assignUserRoleConstraints caught SecurityException rc=" + ex.getErrorId() + ", msg="
+ + ex.getMessage(), ex );
+ fail( ex.getMessage() );
+ }
+ }
+
+
+ private void assignUserRoleConstraintsKey( String msg, String[][] urArray )
+ {
+ LogUtil.logIt( msg );
+ try
+ {
+ ReviewMgr reviewMgr = ReviewMgrImplTest.getManagedReviewMgr();
+ for ( String[] urConstraint : urArray )
+ {
+ UserRole uRole = RoleTestData.getUserRoleConstraintAbac( urConstraint );
+ RoleConstraint constraint = uRole.getConstraints().get( 0 );
+ List<UserRole> uRoles = reviewMgr.assignedUsers( new Role( uRole.getName() ), RoleConstraint.RCType.USER, constraint.getKey());
+ assertTrue( "curly, moe, larry", uRoles.size() == 3 );
+ }
+ }
+ catch ( SecurityException ex )
+ {
+ LOG.error(
+ "assignUserRoleConstraintsKey caught SecurityException rc=" + ex.getErrorId() + ", msg="
+ + ex.getMessage(), ex );
+ fail( ex.getMessage() );
+ }
+ }
+
+
public void testFindRoleConstraints()
{
findRoleConstraints( "SRCH-RCS TU1 TR1", UserTestData.USERS_TU1[0][0], PermTestData.getOp("TOB1_1", PermTestData.OPS_TOP1_UPD[0]), URATestData.getRC(URATestData.URC_T1).getType() );
- findUserRoleWithConstraints( "SRCH-RCS TU1 TR1", UserTestData.USERS_TU1[0][0], RoleTestData.ROLES_TR1[1][0], URATestData.getRC(URATestData.URC_T1).getType(), URATestData.getRC(URATestData.URC_T1).getKey() );
+ findUserRoleWithConstraints( "SRCH-RCS TR1", RoleTestData.ROLES_TR1[1][0], URATestData.getRC( URATestData.URC_T1 ).getType(), URATestData.getRC( URATestData.URC_T1 ).getKey() );
+ findUserRoleWithConstraints( "SRCH-RCS TR18 ABAC", RoleTestData.ROLES_ABAC_WASHERS[0][0], RoleConstraint.RCType.USER, RoleTestData.ROLE_CONSTRAINTS_TR18_ABAC[0][2] );
+ findUserRoleWithConstraints( "SRCH-RCS TR18 ABAC", RoleTestData.ROLES_ABAC_TELLERS[0][0], RoleConstraint.RCType.USER, RoleTestData.ROLE_CONSTRAINTS_TR18_ABAC[0][2] );
}
- public static void findUserRoleWithConstraints( String msg, String usr, String role, RoleConstraint.RCType rcType, String paSetName )
+ public static void findUserRoleWithConstraints( String msg, String role, RoleConstraint.RCType rcType, String keyName )
{
LogUtil.logIt(msg);
try
{
ReviewMgr reviewMgr = getManagedReviewMgr();
- List<UserRole> urs = reviewMgr.assignedUsers( new Role(role), rcType, paSetName);
+ List<UserRole> urs = reviewMgr.assignedUsers( new Role(role), rcType, keyName);
assertNotNull( "findUserRoleWithConstraints no results", urs );
assertTrue(urs.size() > 0);
assertTrue(urs.get(0).getRoleConstraints().size() > 0);
- LOG.debug( "findUserRoleWithConstraints paSetName [" + paSetName + "] successful" );
+ LOG.debug( "findUserRoleWithConstraints paSetName [" + keyName + "] successful" );
}
catch ( SecurityException ex )
{
- LOG.error( "findUserRoleWithConstraints paSetName [" + paSetName
+ LOG.error( "findUserRoleWithConstraints paSetName [" + keyName
+ "] caught SecurityException rc=" + ex.getErrorId() + ", msg=" + ex.getMessage(), ex );
fail( ex.getMessage() );
}