Skip to content

cadc-util: defer to IdentityManager when logging user #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pdowler merged 1 commit into from
Oct 24, 2025
Merged

cadc-util: defer to IdentityManager when logging user #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cadc-util/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sourceCompatibility = 1.8

group = 'org.opencadc'

version = '1.12.11'
version = '1.12.12'

description = 'OpenCADC core utility library'
def git_url = 'https://github.com/opencadc/core'
Expand Down
18 changes: 9 additions & 9 deletions cadc-util/src/main/java/ca/nrc/cadc/log/WebServiceLogInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import ca.nrc.cadc.auth.AuthMethod;
import ca.nrc.cadc.auth.AuthenticationUtil;
import ca.nrc.cadc.auth.HttpPrincipal;
import ca.nrc.cadc.auth.IdentityManager;
import ca.nrc.cadc.date.DateUtil;
import ca.nrc.cadc.util.StringUtil;
import java.lang.reflect.Field;
Expand All @@ -84,7 +85,6 @@
import java.util.UUID;

import javax.security.auth.Subject;
import javax.security.auth.x500.X500Principal;
import org.apache.log4j.Logger;

/**
Expand Down Expand Up @@ -342,18 +342,18 @@ public void setJobID(String jobID) {
protected String getUser(Subject subject) {
try {
if (subject != null) {
// backwards compat for cadc-specific abuse of HttpPrincipal
final Set<HttpPrincipal> httpPrincipals = subject.getPrincipals(HttpPrincipal.class);
if (!httpPrincipals.isEmpty()) {
HttpPrincipal principal = httpPrincipals.iterator().next();
this.proxyUser = principal.getProxyUser();
return principal.getName();
}

final Set<X500Principal> x500Principals = subject.getPrincipals(X500Principal.class);
if (!x500Principals.isEmpty()) {
X500Principal principal = x500Principals.iterator().next();
return principal.getName();
if (principal.getProxyUser() != null) {
this.proxyUser = principal.getProxyUser(); // side effect
return principal.getName();
}
}
// defer to configured IM
IdentityManager im = AuthenticationUtil.getIdentityManager();
return im.toDisplayString(subject);
}
} catch (Throwable t) {
// ignore - can't throw exceptions here
Expand Down