Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 (e6ec0673) · Commits · OATS-CADC / ac

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java

+17 −13

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ import java.util.Set;
		public class GetUserAction extends AbstractUserAction
		{
		private static final Logger log = Logger.getLogger(GetUserAction.class);

		private final Principal userID;
		private final String detail;

		@@ -105,30 +106,33 @@ public class GetUserAction extends AbstractUserAction

		/**
		* Special case 1
		* If the calling Subject user is the notAugmentedX500User, AND it is
		* a GET, call the userDAO to get the User with all identities.
		*/
		if (isAugmentUser())
		{
		log.debug("getting augmented user " + principal.getName());
		user = userPersistence.getAugmentedUser(principal);
		}

		/**
		* Special case 2
		* If detail=identity, AND if the calling Subject user is the same as
		* the requested User, then return the User with the principals from the
		* Subject which has already been augmented.
		*/
		if (detail != null &&
		else if (detail != null &&
		detail.equalsIgnoreCase("identity") &&
		isSubjectUser(principal))
		{
		log.debug("augmenting " + principal.getName() + " from subject");
		Subject subject = Subject.getSubject(AccessController.getContext());
		user = new User<Principal>(principal);
		user.getIdentities().addAll(subject.getPrincipals());
		}

		/**
		* Special case 2
		* If the calling Subject user is the notAugmentedX500User, AND it is
		* a GET, call the userDAO to get the User with all identities.
		*/
		else if (this.isAugmentUser)
		{
		user = userPersistence.getAugmentedUser(principal);
		}
		else
		{
		log.debug("getting user " + principal.getName());
		try
		{
		user = userPersistence.getUser(principal);

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ public class UserServlet extends HttpServlet

		private static final long serialVersionUID = 5289130885807305288L;
		private static final Logger log = Logger.getLogger(UserServlet.class);

		private String notAugmentedX500User;

		@Override
		@@ -121,7 +122,6 @@ public class UserServlet extends HttpServlet
		{
		log.info(logInfo.start());
		AbstractUserAction action = factory.createAction(request);
		SyncOutput syncOut = new SyncOutput(response);

		// Special case: if the calling subject has a servops X500Principal,
		// AND it is a GET request, do not augment the subject.
		@@ -129,14 +129,17 @@ public class UserServlet extends HttpServlet
		if (action instanceof GetUserAction && isNotAugmentedSubject())
		{
		subject = Subject.getSubject(AccessController.getContext());
		log.debug("subject not augmented: " + subject);
		action.setAugmentUser(true);
		}
		else
		{
		subject = AuthenticationUtil.getSubject(request);
		log.debug("augmented subject: " + subject);
		}
		logInfo.setSubject(subject);

		SyncOutput syncOut = new SyncOutput(response);
		action.setLogInfo(logInfo);
		action.setSyncOut(syncOut);
		action.setAcceptedContentType(getAcceptedContentType(request));
		@@ -251,13 +254,16 @@ public class UserServlet extends HttpServlet
		{
		boolean notAugmented = false;
		Subject subject = Subject.getSubject(AccessController.getContext());
		log.debug("subject: " + subject);
		if (subject != null)
		{
		log.debug("notAugmentedX500User" + notAugmentedX500User);
		for (Principal principal : subject.getPrincipals())
		{
		if (principal instanceof X500Principal)
		{
		if (principal.getName().equalsIgnoreCase(this.notAugmentedX500User))
		log.debug("principal: " + principal.getName());
		if (principal.getName().equalsIgnoreCase(notAugmentedX500User))
		{
		notAugmented = true;
		break;

projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java

+98 −26

Original line number	Diff line number	Diff line
		@@ -78,12 +78,14 @@ import ca.nrc.cadc.auth.HttpPrincipal;
		import ca.nrc.cadc.auth.NumericPrincipal;
		import org.junit.Test;

		import javax.security.auth.Subject;
		import javax.security.auth.x500.X500Principal;
		import javax.servlet.http.HttpServletResponse;
		import java.io.PrintWriter;
		import java.io.StringWriter;
		import java.io.Writer;
		import java.security.Principal;
		import java.security.PrivilegedExceptionAction;
		import java.util.HashSet;
		import java.util.Set;

		@@ -136,12 +138,26 @@ public class GetUserActionTest
		@Test
		public void writeUserWithDetailIdentity() throws Exception
		{
		final HttpPrincipal httpPrincipal = new HttpPrincipal("CADCtest");
		final NumericPrincipal numericPrincipal = new NumericPrincipal(789);
		final X500Principal x500Principal = new X500Principal("cn=foo,o=bar");

		Subject testUser = new Subject();
		testUser.getPrincipals().add(httpPrincipal);
		testUser.getPrincipals().add(numericPrincipal);
		testUser.getPrincipals().add(x500Principal);

		Subject.doAs(testUser, new PrivilegedExceptionAction<Object>()
		{
		public Object run() throws Exception
		{

		final HttpServletResponse mockResponse = createMock(HttpServletResponse.class);
		final UserPersistence<HttpPrincipal> mockUserPersistence =
		createMock(UserPersistence.class);
		final HttpPrincipal userID = new HttpPrincipal("CADCtest");

		final GetUserAction testSubject = new GetUserAction(userID, "identity")

		final GetUserAction testSubject = new GetUserAction(httpPrincipal, "identity")
		{
		@Override
		UserPersistence<HttpPrincipal> getUserPersistence()
		@@ -150,9 +166,10 @@ public class GetUserActionTest
		}
		};

		final User<HttpPrincipal> expected = new User<HttpPrincipal>(userID);
		expected.getIdentities().add(new NumericPrincipal(789));
		expected.getIdentities().add(new X500Principal("cn=foo,o=bar"));
		final User<HttpPrincipal> expected = new User<HttpPrincipal>(httpPrincipal);
		expected.getIdentities().add(httpPrincipal);
		expected.getIdentities().add(numericPrincipal);
		expected.getIdentities().add(x500Principal);

		StringBuilder sb = new StringBuilder();
		UserWriter userWriter = new UserWriter();
		@@ -169,7 +186,6 @@ public class GetUserActionTest
		final Writer writer = new StringWriter();
		final PrintWriter printWriter = new PrintWriter(writer);

		expect(mockUserPersistence.getUser(userID)).andReturn(expected).once();
		mockResponse.setHeader("Content-Type", "text/xml");
		expectLastCall().once();
		expect(mockResponse.getWriter()).andReturn(printWriter).once();
		@@ -185,6 +201,10 @@ public class GetUserActionTest
		assertEquals(expectedUser, actualUser);

		verify(mockUserPersistence, mockResponse);

		return null;
		}
		});
		}

		@Test
		@@ -245,6 +265,58 @@ public class GetUserActionTest
		verify(mockUserPersistence, mockResponse);
		}

		@Test
		public void writeAugmentedUser() throws Exception
		{
		final UserPersistence<Principal> mockUserPersistence =
		createMock(UserPersistence.class);
		final HttpServletResponse mockResponse = createMock(HttpServletResponse.class);

		final HttpPrincipal userID = new HttpPrincipal("CADCtest");
		final GetUserAction testSubject = new GetUserAction(userID, null)
		{
		@Override
		UserPersistence<Principal> getUserPersistence()
		{
		return mockUserPersistence;
		}
		};
		testSubject.setAugmentUser(true);

		final NumericPrincipal numericPrincipal = new NumericPrincipal(789);
		final X500Principal x500Principal = new X500Principal("cn=foo,o=bar");

		final User<Principal> expected = new User<Principal>(userID);
		expected.getIdentities().add(userID);
		expected.getIdentities().add(numericPrincipal);
		expected.getIdentities().add(x500Principal);

		StringBuilder sb = new StringBuilder();
		UserWriter userWriter = new UserWriter();
		userWriter.write(expected, sb);
		String expectedUser = sb.toString();

		final Writer writer = new StringWriter();
		final PrintWriter printWriter = new PrintWriter(writer);

		expect(mockUserPersistence.getAugmentedUser(userID)).andReturn(expected).once();
		mockResponse.setHeader("Content-Type", "text/xml");
		expectLastCall().once();
		expect(mockResponse.getWriter()).andReturn(printWriter).once();

		replay(mockUserPersistence, mockResponse);

		SyncOutput syncOutput = new SyncOutput(mockResponse);
		testSubject.setSyncOut(syncOutput);
		testSubject.doAction();

		String actualUser = writer.toString();

		assertEquals(expectedUser, actualUser);

		verify(mockUserPersistence, mockResponse);
		}

		@Test
		public void writeUserJSON() throws Exception
		{