From 6f1844199d769b8d2ef3ead1ccab1ec36eb0f288 Mon Sep 17 00:00:00 2001
From: Alinga Yeung <Alinga.Yeung@nrc-cnrc.gc.ca>
Date: Mon, 10 Aug 2015 15:17:47 -0700
Subject: [PATCH] Story ac2. Updated after Brian's code review comments.
---
.../src/ca/nrc/cadc/ac/server/web/users/PasswordServlet.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/PasswordServlet.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/PasswordServlet.java
index a7979bbd..141a0ae0 100644
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/PasswordServlet.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/PasswordServlet.java
@@ -97,7 +97,6 @@ public class PasswordServlet extends HttpServlet
public void doPost(final HttpServletRequest request, final HttpServletResponse response)
throws IOException
{
- response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
final long start = System.currentTimeMillis();
final ServletLogInfo logInfo = new ServletLogInfo(request);
log.info(logInfo.start());
@@ -106,7 +105,7 @@ public class PasswordServlet extends HttpServlet
final Subject subject = AuthenticationUtil.getSubject(request);
if ((subject == null) || (subject.getPrincipals(HttpPrincipal.class).isEmpty()))
{
- logInfo.setMessage("Missing subject");
+ logInfo.setMessage("Unauthorized subject");
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
}
else
@@ -119,7 +118,6 @@ public class PasswordServlet extends HttpServlet
{
try
{
- response.setStatus(HttpServletResponse.SC_OK);
final Set<HttpPrincipal> webPrincipals =
subject.getPrincipals(HttpPrincipal.class);
@@ -174,6 +172,7 @@ public class PasswordServlet extends HttpServlet
log.error(message, t);
logInfo.setSuccess(false);
logInfo.setMessage(message);
+ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
finally
{
--
GitLab