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

Jump to bottom

Include trusted issuer details in SSL diagnostics #61702

Merged
merged 5 commits into from Sep 18, 2020
Merged

Include trusted issuer details in SSL diagnostics #61702

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45ea5cd
Include trusted issuer details in SSL diagnostics
tvernum Aug 31, 2020
08da2d4
Add test for large # of issuers
tvernum Sep 3, 2020
d293233
Merge branch 'master' into ssl-diagnostics-empty-trust
tvernum Sep 3, 2020
3672afc
Merge branch 'master' into ssl-diagnostics-empty-trust
tvernum Sep 18, 2020
e46bd7f
Add tests for unknown issuers
tvernum Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 24 additions & 2 deletions libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslDiagnostics.java
View file
Open in desktop
Expand Up @@ -254,11 +254,11 @@ private static CharSequence describeIssuerTrust(String contextName, @Nullable Ma
final IssuerTrust trust = checkIssuerTrust(trustedIssuers, certificate);
if (trust.isVerified()) {
message.append("; the issuing ")
.append(trust.issuerCerts.size() == 1 ? "certificate": "certificates")
.append(trust.issuerCerts.size() == 1 ? "certificate" : "certificates")
.append(" with ")
.append(fingerprintDescription(trust.issuerCerts))
.append(" ")
.append(trust.issuerCerts.size() == 1 ? "is": "are")
.append(trust.issuerCerts.size() == 1 ? "is" : "are")
.append(" trusted in this ssl context ([")
.append(contextName)
.append("])");
Expand All @@ -277,6 +277,28 @@ private static CharSequence describeIssuerTrust(String contextName, @Nullable Ma
message.append("; this ssl context ([")
.append(contextName)
.append("]) is not configured to trust that issuer");

if (trustedIssuers.isEmpty()) {
message.append(" or any other issuer");
} else {
if (trustedIssuers.size() == 1) {
String trustedIssuer = trustedIssuers.keySet().iterator().next();
message.append(", it only trusts the issuer [")
.append(trustedIssuer)
.append("] with ")
.append(fingerprintDescription(trustedIssuers.get(trustedIssuer)));
} else {
message.append(" but trusts [")
.append(trustedIssuers.size())
.append("] other issuers");
if (trustedIssuers.size() < 10) {
// 10 is an arbitrary number, but printing out hundreds of trusted issuers isn't helpful
message.append(" ([")
.append(trustedIssuers.keySet().stream().sorted().collect(Collectors.joining(", ")))
.append("])");
}
}
}
}
return message;
}
Expand Down
5 changes: 3 additions & 2 deletions libs/ssl-config/src/test/java/org/elasticsearch/common/ssl/SslDiagnosticsTests.java
View file
Open in desktop
Expand Up @@ -126,7 +126,8 @@ public void testDiagnosticMessageWhenServerProvidesEndCertificateOnlyButTheCertA
" the certificate has subject alternative names [DNS:localhost,IP:127.0.0.1];" +
" the certificate is issued by [CN=Test CA 1]" +
" but the server did not provide a copy of the issuing certificate in the certificate chain;" +
" this ssl context ([xpack.http.ssl]) is not configured to trust that issuer"));
" this ssl context ([xpack.http.ssl]) is not configured to trust that issuer" +
" but trusts [2] other issuers ([CN=Test CA 2, CN=Test CA 3])"));
tvernum marked this conversation as resolved.
Show resolved Hide resolved
}

public void testDiagnosticMessageWhenServerProvidesEndCertificateOnlyWithMimicIssuer() throws Exception {
Expand Down Expand Up @@ -215,7 +216,7 @@ public void testDiagnosticMessageWhenServerProvidePartialChainFromUntrustedCA()
" signed by (subject [CN=ca,OU=windows,DC=example,DC=com] fingerprint [" + MOCK_FINGERPRINT_3 + "])" +
" signed by (subject [CN=issuing-ca,DC=example,DC=com] fingerprint [" + MOCK_FINGERPRINT_2 + "])" +
" which is issued by [CN=root-ca,DC=example,DC=com] (but that issuer certificate was not provided in the chain);" +
" this ssl context ([xpack.security.authc.realms.ldap.ldap1.ssl]) is not configured to trust that issuer"));
" this ssl context ([xpack.security.authc.realms.ldap.ldap1.ssl]) is not configured to trust that issuer or any other issuer"));
}

public void testDiagnosticMessageWhenServerProvidesASelfSignedCertThatIsDirectlyTrusted() throws Exception {
Expand Down