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 2d7bf6f993081c3b8d84083827263b0a501ec421..17809261b4d3161ec5e8c7171878f0d25e1f0c38 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 20dc72d35a61db26e0d639fe23a8a286b150de69..5647dcf177059b48fd8d84d17a848b32bf79da04 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 1812fc7eaa9cc6704f2022fe4b3085fda9eb5a5e..7559f8fe86a5752c3d8cc674a0e5d50c898870c4 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); } - } }