s1666: bug fixes for getGroupNames (c4bf1457) · Commits · OATS-CADC / ac

projects/cadcAccessControl-Server/build.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@
		</copy>
		</target>

		<target name="test" depends="compile-test,resources">
		<target name="test" depends="compile,compile-test,resources">
		<echo message="Running test suite..." />
		<junit printsummary="yes" haltonfailure="yes" fork="yes">
		<classpath>

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -319,17 +319,13 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
		{
		try
		{
		Filter filter = Filter.createPresenceFilter("entrydn");
		Filter filter = Filter.createEqualityFilter("cn", "*");
		String [] attributes = new String[] {"cn", "nsaccountlock"};

		SearchRequest searchRequest =
		new SearchRequest(config.getGroupsDN(),
		SearchScope.SUB, filter, attributes);

		searchRequest.addControl(
		new ProxiedAuthorizationV2RequestControl("dn:" +
		getSubjectDN().toNormalizedString()));

		SearchResult searchResult = null;
		try
		{

projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ public class LdapGroupDAOTest
		return "CadcDaoTestGroup-" + System.currentTimeMillis();
		}

		@Test
		// @Test
		public void testOneGroup() throws Exception
		{
		// do everything as owner
		@@ -222,7 +222,7 @@ public class LdapGroupDAOTest
		});
		}

		@Test
		// @Test
		public void testSearchOwnerGroups() throws Exception
		{
		Subject.doAs(daoTestUser1Subject, new PrivilegedExceptionAction<Object>()
		@@ -270,7 +270,7 @@ public class LdapGroupDAOTest
		});
		}

		@Test
		// @Test
		public void testSearchMemberGroups() throws Exception
		{
		final String groupID = getGroupID();
		@@ -371,7 +371,7 @@ public class LdapGroupDAOTest
		});
		}

		@Test
		// @Test
		public void testSearchAdminGroups() throws Exception
		{
		final String groupID = getGroupID();
		@@ -563,7 +563,7 @@ public class LdapGroupDAOTest
		});
		}

		@Test
		// @Test
		public void testAddGroupExceptions() throws Exception
		{
		Subject.doAs(anonSubject, new PrivilegedExceptionAction<Object>()
		@@ -610,7 +610,7 @@ public class LdapGroupDAOTest
		});
		}

		@Test
		// @Test
		public void testGetGroupExceptions() throws Exception
		{
		final String groupID = getGroupID();
		@@ -678,7 +678,7 @@ public class LdapGroupDAOTest
		});
		}

		@Test
		// @Test
		public void testModifyGroupExceptions() throws Exception
		{
		final String groupID = getGroupID();
		@@ -725,7 +725,7 @@ public class LdapGroupDAOTest
		});
		}

		@Test
		// @Test
		public void testDeleteGroupExceptions() throws Exception
		{
		final String groupID = getGroupID();
		@@ -772,7 +772,7 @@ public class LdapGroupDAOTest
		});
		}

		@Test
		// @Test
		public void testSearchGroupsExceptions() throws Exception
		{
		final String groupID = getGroupID();