diff --git a/cadc-util/build.gradle b/cadc-util/build.gradle index 52fc3b8d..de558e88 100644 --- a/cadc-util/build.gradle +++ b/cadc-util/build.gradle @@ -16,7 +16,7 @@ sourceCompatibility = 1.8 group = 'org.opencadc' -version = '1.11.1' +version = '1.11.2' description = 'OpenCADC core utility library' def git_url = 'https://github.com/opencadc/core' diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/AuthenticationUtil.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/AuthenticationUtil.java index 2b408d50..9a29b815 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/AuthenticationUtil.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/AuthenticationUtil.java @@ -182,20 +182,20 @@ private static Authenticator getAuthenticator(IdentityManager im) { public static Subject augmentSubject(Subject s) { IdentityManager auth = getIdentityManager(); // temporary backwards compat - Authenticator alt = getAuthenticator(auth); - if (alt != null) { - return alt.augment(s); - } + //Authenticator alt = getAuthenticator(auth); + //if (alt != null) { + // return alt.augment(s); + //} return auth.augment(s); } public static Subject validateSubject(Subject s) throws NotAuthenticatedException { IdentityManager auth = getIdentityManager(); // temporary backwards compat - Authenticator alt = getAuthenticator(auth); - if (alt != null) { - return alt.validate(s); - } + //Authenticator alt = getAuthenticator(auth); + //if (alt != null) { + // return alt.validate(s); + //} return auth.validate(s); } @@ -344,8 +344,9 @@ public static Subject getSubject(PrincipalExtractor principalExtractor, boolean } setAuthMethod(subject, am); if (augmentSubject) { - return augmentSubject(subject); + subject = augmentSubject(subject); } + log.debug("getSubject(augment=" + augmentSubject + "): " + subject); return subject; } diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/PosixPrincipal.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/PosixPrincipal.java index e748f105..79254b2f 100644 --- a/cadc-util/src/main/java/ca/nrc/cadc/auth/PosixPrincipal.java +++ b/cadc-util/src/main/java/ca/nrc/cadc/auth/PosixPrincipal.java @@ -112,6 +112,6 @@ public int compareTo(PosixPrincipal t) { @Override public String toString() { - return "PosixPrincipal [uidNumber=" + uidNumber + "]"; + return "PosixPrincipal [uidNumber=" + uidNumber + "," + defaultGroup + "," + username + "]"; } }