From 0245eee67b2082e68049e083fcf11b5970301f9c Mon Sep 17 00:00:00 2001
From: Jeff Burke <Jeff.Burke@nrc-cnrc.gc.ca>
Date: Fri, 4 Sep 2015 14:03:11 -0700
Subject: [PATCH] s1728: WhoAmIServlet fixes.
---
.../src/ca/nrc/cadc/ac/server/web/UserServlet.java | 3 +--
.../src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java | 8 +++++---
.../src/ca/nrc/cadc/auth/AuthenticatorImpl.java | 8 +++++---
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java
index 2d7bf6f9..17809261 100644
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java
@@ -259,7 +259,6 @@ public class UserServlet extends HttpServlet
{
ServletPrincipalExtractor extractor = new ServletPrincipalExtractor(request);
Set<Principal> principals = extractor.getPrincipals();
- log.debug("Principals: " + principals);
for (Principal principal : principals)
{
@@ -267,12 +266,12 @@ public class UserServlet extends HttpServlet
{
if (principal.getName().equalsIgnoreCase(notAugmentedX500User))
{
+ log.debug("found notAugmentedX500User " + notAugmentedX500User);
return true;
}
}
}
return false;
-
}
}
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
index 20dc72d3..5647dcf1 100644
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
@@ -162,11 +162,13 @@ public class WhoAmIServlet extends HttpServlet
final RegistryClient registryClient = getRegistryClient();
final URL redirectURL =
registryClient.getServiceURL(
- URI.create(AC.GMS_SERVICE_URI), "http", USER_GET_PATH);
+ URI.create(AC.GMS_SERVICE_URI), "https", USER_GET_PATH);
// Take the first one.
- response.sendRedirect(String.format(redirectURL.toExternalForm(),
- webPrincipal.getName()));
+ final String redirectUrl =
+ String.format(redirectURL.toString(), webPrincipal.getName());
+ log.debug("redirecting to " + redirectUrl);
+ response.sendRedirect(redirectUrl);
}
/**
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
index 1812fc7e..7559f8fe 100644
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
@@ -102,9 +102,13 @@ public class AuthenticatorImpl implements Authenticator
*/
public Subject getSubject(Subject subject)
{
+ log.debug("ac augment subject: " + subject);
AuthMethod am = AuthenticationUtil.getAuthMethod(subject);
if (am == null || AuthMethod.ANON.equals(am))
+ {
+ log.debug("returning anon subject");
return subject;
+ }
if (subject != null && subject.getPrincipals().size() > 0)
{
@@ -126,14 +130,13 @@ public class AuthenticatorImpl implements Authenticator
protected void augmentSubject(final Subject subject)
{
-
try
{
LdapUserPersistence<Principal> dao = new LdapUserPersistence<Principal>();
User<Principal> user = dao.getAugmentedUser(subject.getPrincipals().iterator().next());
if (user.getIdentities() != null)
{
- log.debug("Found " + user.getIdentities().size() + " principals after agument");
+ log.debug("Found " + user.getIdentities().size() + " principals after argument");
}
else
{
@@ -150,7 +153,6 @@ public class AuthenticatorImpl implements Authenticator
{
throw new IllegalStateException("Internal error", e);
}
-
}
}
--
GitLab