Skip to content
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

cadc-util: fix X509CertificateChain extract principal from chain #253

Merged
merged 1 commit into from
Oct 21, 2024
Merged

cadc-util: fix X509CertificateChain extract principal from chain #253

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 @@ -16,7 +16,7 @@ sourceCompatibility = 1.8

group = 'org.opencadc'

version = '1.11.4'
version = '1.11.5'

description = 'OpenCADC core utility library'
def git_url = 'https://github.com/opencadc/core'
Expand Down
36 changes: 11 additions & 25 deletions cadc-util/src/main/java/ca/nrc/cadc/auth/X509CertificateChain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,31 +140,17 @@ public X509CertificateChain(X509Certificate[] chain, PrivateKey key) {
}

private void initPrincipal() {
for (X509Certificate c : chain) {
this.endEntity = c;
X500Principal sp = c.getSubjectX500Principal();
String sdn = sp.getName(X500Principal.RFC1779);
X500Principal ip = c.getIssuerX500Principal();
String idn = ip.getName(X500Principal.RFC1779);
log.debug("found: subject=" + sdn + ", issuer=" + idn);
if (sdn.endsWith(idn)) {
this.principal = ip;
this.isProxy = true;
} else {
this.principal = sp;
}

}

String canonizedDn = AuthenticationUtil.canonizeDistinguishedName(principal.getName());
// TODO: some upstream SSL termination engines (haproxy, tomcat) only pass the
// first certificate in the
// chain which makes the correct method above fail if the proxy certificate has
// more than two certificates
// in the chain. The following is just a workaround to remove extra leading
// CN(s):
if (canonizedDn.lastIndexOf("cn=") > -1) {
canonizedDn = canonizedDn.substring(canonizedDn.lastIndexOf("cn="));
X509Certificate c = chain[0];
X500Principal xp = c.getSubjectX500Principal();

// put into canonical form and look for multiple CN: proxy cert
String canonizedDn = AuthenticationUtil.canonizeDistinguishedName(xp.getName());

int cn1 = canonizedDn.indexOf("cn=");
int cnex = canonizedDn.lastIndexOf("cn=");
if (cnex > cn1) {
canonizedDn = canonizedDn.substring(cnex);
this.isProxy = true;
}
this.principal = new X500Principal(canonizedDn);
log.debug("principal: " + principal.getName(X500Principal.RFC1779));
Expand Down
Loading