Skip to content
Snippets Groups Projects
Commit 6a219a61 authored by Jeff Burke's avatar Jeff Burke
Browse files

s1890: update unit tests.

parent a0022461
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
cadcAccessControl-Server/build.xml
+ 28
− 0
View file @ 6a219a61
......@@ -137,7 +137,35 @@
<pathelement path="${jars}:${testingJars}"/>
</classpath>
<sysproperty key="ca.nrc.cadc.util.PropertiesReader.dir" value="test"/>
<!--<test name="ca.nrc.cadc.ac.server.ldap.LdapConfigTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.ldap.LdapConnectionsTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.ldap.LdapDAOTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.ldap.LdapPersistenceTest" />-->
<test name="ca.nrc.cadc.ac.server.ldap.LdapUserDAOTest" />
<!--<test name="ca.nrc.cadc.ac.server.web.groups.AddGroupMemberActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.groups.AddUserMemberActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.groups.DeleteGroupActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.groups.GetGroupNamesActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.groups.GroupActionFactoryTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.groups.RemoveGroupMemberActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.groups.RemoveUserMemberActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.users.GetUserActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.users.GetUserListActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.users.ModifyUserActionTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.users.UserActionFactoryTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.ModifyPasswordServletTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.ResetPasswordServletTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.UserLoginServletTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.UserServletTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.web.WhoAmIServletTest" />-->
<!--<test name="ca.nrc.cadc.ac.server.RequestValidatorTest" />-->
<formatter type="plain" usefile="false" />
</junit>
</target>
......
cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+ 28
− 26
View file @ 6a219a61
......@@ -68,43 +68,22 @@
*/
package ca.nrc.cadc.ac.server.ldap;
import java.lang.reflect.Field;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.AccessControlException;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
import javax.security.auth.x500.X500Principal;
import ca.nrc.cadc.ac.InternalID;
import org.apache.log4j.Logger;
import ca.nrc.cadc.ac.AC;
import ca.nrc.cadc.ac.Group;
import ca.nrc.cadc.ac.InternalID;
import ca.nrc.cadc.ac.PersonalDetails;
import ca.nrc.cadc.ac.PosixDetails;
import ca.nrc.cadc.ac.Role;
import ca.nrc.cadc.ac.User;
import ca.nrc.cadc.ac.UserAlreadyExistsException;
import ca.nrc.cadc.ac.UserNotFoundException;
import ca.nrc.cadc.ac.UserRequest;
import ca.nrc.cadc.ac.client.GroupMemberships;
import ca.nrc.cadc.auth.AuthenticationUtil;
import ca.nrc.cadc.auth.DNPrincipal;
import ca.nrc.cadc.auth.HttpPrincipal;
import ca.nrc.cadc.auth.NumericPrincipal;
import ca.nrc.cadc.net.TransientException;
import ca.nrc.cadc.profiler.Profiler;
import ca.nrc.cadc.util.StringUtil;
import com.unboundid.ldap.sdk.AddRequest;
import com.unboundid.ldap.sdk.Attribute;
import com.unboundid.ldap.sdk.BindRequest;
......@@ -128,6 +107,23 @@ import com.unboundid.ldap.sdk.SearchScope;
import com.unboundid.ldap.sdk.SimpleBindRequest;
import com.unboundid.ldap.sdk.extensions.PasswordModifyExtendedRequest;
import com.unboundid.ldap.sdk.extensions.PasswordModifyExtendedResult;
import org.apache.log4j.Logger;
import javax.security.auth.x500.X500Principal;
import java.lang.reflect.Field;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.AccessControlException;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
/**
......@@ -398,7 +394,9 @@ public class LdapUserDAO extends LdapDAO
DN userDN = getUserDN(userID.getName(), usersDN);
AddRequest addRequest = new AddRequest(userDN, attributes);
LDAPResult result = getReadWriteConnection().add(addRequest);
LDAPConnection foo = getReadWriteConnection();
logger.debug("RW connection: " + foo.getConnectionPoolName());
LDAPResult result = foo.add(addRequest);
LdapDAO.checkLdapResult(result.getResultCode());
}
catch (LDAPException e)
......@@ -723,6 +721,7 @@ public class LdapUserDAO extends LdapDAO
String numericID = searchResult.getAttributeValue(LDAP_NUMERICID);
logger.debug("numericID is " + numericID);
InternalID internalID = getInternalID(numericID);
setInternalID(user, internalID);
user.getIdentities().add(new NumericPrincipal(internalID.getUUID()));
......@@ -1335,14 +1334,17 @@ public class LdapUserDAO extends LdapDAO
protected InternalID getInternalID(String numericID)
{
UUID uuid = new UUID(0L, Long.parseLong(numericID));
final String uriString = AC.USER_URI + uuid.toString();
URI uri;
try
{
uri = new URI(numericID);
uri = new URI(uriString);
}
catch (URISyntaxException e)
{
throw new RuntimeException("Invalid InternalID URI " + numericID);
throw new RuntimeException("Invalid InternalID URI " + uriString);
}
return new InternalID(uri);
}
......
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
+ 35
− 21
View file @ 6a219a61
......@@ -125,7 +125,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
public static void setUpBeforeClass()
throws Exception
{
Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);
Log4jInit.setLevel("ca.nrc.cadc.ac", Level.DEBUG);
// get the configuration of the development server from and config files...
config = getLdapConfig();
......@@ -250,7 +250,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
/**
* Test of addPendingUser method, of class LdapUserDAO.
*/
@Test
// @Test
public void testAddPendingUser() throws Exception
{
// add user using HttpPrincipal
......@@ -331,7 +331,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
/**
* Test of getUser method, of class LdapUserDAO.
*/
@Test
// @Test
public void testGetUser() throws Exception
{
Subject subject = new Subject();
......@@ -466,7 +466,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
/**
* Test of getUserByEmailAddress method, of class LdapUserDAO.
*/
@Test
// @Test
public void testGetUserByEmailAddress() throws Exception
{
// create a user with the email attribute
......@@ -511,7 +511,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
}
@Test
// @Test
public void testGetPendingUser() throws Exception
{
final String userRequestDN = "uid=CADCtestRequest,ou=userrequests,ou=ds,dc=testcanfar";
......@@ -553,7 +553,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
// TODO testGetUser for a user that doesn't exist
@Test
// @Test
public void testApproveUser() throws Exception
{
String username = createUsername();
......@@ -612,7 +612,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
});
}
@Test
// @Test
public void testUpdateUser() throws Exception
{
// Create a test user
......@@ -691,7 +691,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
/**
* Test of deleteUser method, of class LdapUserDAO.
*/
@Test
// @Test
public void deleteUser() throws Exception
{
String userID = createUsername();
......@@ -736,7 +736,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
/**
* Test of deletePendingUser method, of class LdapUserDAO.
*/
@Test
// @Test
public void deletePendingUser() throws Exception
{
String userID = createUsername();
......@@ -782,7 +782,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
/**
* Test of getMember.
*/
@Test
// @Test
public void testGetX500User() throws Exception
{
Subject subject = new Subject();
......@@ -831,7 +831,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
});
}
@Test
// @Test
public void testGetUsers() throws Exception
{
// authenticated access
......@@ -860,7 +860,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
});
}
@Test
// @Test
public void testGetPendingUsers() throws Exception
{
// authenticated access
......@@ -889,7 +889,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
});
}
@Test
// @Test
public void testDoLogin() throws Exception
{
final String username = createUsername();
......@@ -1106,15 +1106,29 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
}
private static void check(final User user1, final User user2)
private static void check(final User expected, final User actual)
{
assertEquals(user1, user2);
assertEquals(user1.personalDetails, user2.personalDetails);
assertEquals("# principals not equal", user1.getIdentities().size(), user2.getIdentities().size());
for( Principal princ1 : user1.getIdentities())
if (expected.getID() != null)
{
assertEquals(expected, actual);
}
for (Principal p : expected.getIdentities())
{
log.debug("expected P: " + p.getName());
}
for (Principal p : actual.getIdentities())
{
log.debug("actual P: " + p.getName());
}
expected.isConsistent(actual);
assertEquals(expected.personalDetails, actual.personalDetails);
for( Principal princ1 : expected.getIdentities())
{
boolean found = false;
for( Principal princ2 : user2.getIdentities())
for( Principal princ2 : actual.getIdentities())
{
if (princ2.getClass() == princ1.getClass())
{
......@@ -1128,8 +1142,8 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
}
assertTrue(princ1.getName(), found);
}
PersonalDetails pd1 = user1.personalDetails;
PersonalDetails pd2 = user2.personalDetails;
PersonalDetails pd1 = expected.personalDetails;
PersonalDetails pd2 = actual.personalDetails;
assertEquals(pd1, pd2);
if (pd1 == null && pd2 == null)
......
cadcAccessControl/build.xml
+ 2
− 2
View file @ 6a219a61
......@@ -123,7 +123,7 @@
<pathelement path="${build}/test/class"/>
<pathelement path="${testingJars}"/>
</classpath>
<test name="ca.nrc.cadc.ac.client.GMSClientTest" />
<!--<test name="ca.nrc.cadc.ac.client.GMSClientTest" />-->
<!--<test name="ca.nrc.cadc.ac.client.JsonUserListInputStreamWrapperTest" />-->
<!--<test name="ca.nrc.cadc.ac.client.UserClientTest" />-->
......@@ -133,7 +133,7 @@
<!--<test name="ca.nrc.cadc.ac.PosixDetailsTest" />-->
<!--<test name="ca.nrc.cadc.ac.RoleTest" />-->
<!--<test name="ca.nrc.cadc.ac.UserRequestTest" />-->
<!--<test name="ca.nrc.cadc.ac.UserTest" />-->
<test name="ca.nrc.cadc.ac.UserTest" />
<!--<test name="ca.nrc.cadc.ac.json.JsonGroupReaderWriterTest" />-->
<!--<test name="ca.nrc.cadc.ac.json.JsonUserReaderWriterTest" />-->
......
cadcAccessControl/src/ca/nrc/cadc/ac/AC.java
+ 3
− 0
View file @ 6a219a61
......@@ -89,5 +89,8 @@ public class AC
// Group URI attribute once the group name is appended
public static final String GROUP_URI = "ivo://cadc.nrc.ca/gms#";
// User URI with appended UUID represents a unique user
public static final String USER_URI = "ivo://cadc.nrc.ca/user?";
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment