Skip to content

Reject mixing keyManager and sslContext in TlsConfigHelper #8710

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

Open
thswlsqls wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −1
Open

Reject mixing keyManager and sslContext in TlsConfigHelper #8710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b68e41
Reject mixing keyManager and sslContext in TlsConfigHelper
thswlsqls Aug 10, 2026
d5ce900
Reject a configured sslContext in setTrustManagerFromCerts
thswlsqls Aug 28, 2026
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
9 changes: 9 additions & 0 deletions exporters/common/src/main/java/io/opentelemetry/exporter/internal/TlsConfigHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public TlsConfigHelper() {}
* @param trustedCertsPem Certificate in PEM format.
*/
public void setTrustManagerFromCerts(byte[] trustedCertsPem) {
if (sslContext != null) {
throw new IllegalStateException("sslContext has been previously configured");
}
if (trustManager != null) {
throw new IllegalStateException("trustManager has been previously configured");
}
Expand Down Expand Up @@ -72,6 +75,9 @@ public void setKeyManagerFromCerts(byte[] privateKeyPem, byte[] certificatePem)
if (keyManager != null) {
throw new IllegalStateException("keyManager has been previously configured");
}
if (sslContext != null) {
throw new IllegalStateException("sslContext has been previously configured");
}

try {
keyManager = TlsUtil.keyManager(privateKeyPem, certificatePem);
Expand All @@ -95,6 +101,9 @@ public void setSslContext(SSLContext sslContext, X509TrustManager trustManager)
if (this.sslContext != null || this.trustManager != null) {
throw new IllegalStateException("sslContext or trustManager has been previously configured");
}
if (this.keyManager != null) {
throw new IllegalStateException("keyManager has been previously configured");
Comment thread
thswlsqls marked this conversation as resolved.
}
this.trustManager = trustManager;
this.sslContext = sslContext;
}
Expand Down
19 changes: 18 additions & 1 deletion exporters/common/src/test/java/io/opentelemetry/exporter/internal/TlsConfigHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void createTrustManager_AlreadyExists_Throws() throws Exception {
SSLContext.getInstance("TLS"), TlsUtil.trustManager(serverTls.certificate().getEncoded()));
assertThatThrownBy(() -> helper.setTrustManagerFromCerts(serverTls.certificate().getEncoded()))
.isInstanceOf(IllegalStateException.class)
.hasMessageContaining("trustManager has been previously configured");
.hasMessageContaining("sslContext has been previously configured");
}

@Test
Expand All @@ -66,6 +66,16 @@ void createKeyManager_AlreadyExists_Throws() throws Exception {
serverTls.privateKey().getEncoded(), serverTls.certificate().getEncoded()))
.isInstanceOf(IllegalStateException.class)
.hasMessageContaining("keyManager has been previously configured");

helper = new TlsConfigHelper();
helper.setSslContext(
SSLContext.getInstance("TLS"), TlsUtil.trustManager(serverTls.certificate().getEncoded()));
assertThatThrownBy(
() ->
helper.setKeyManagerFromCerts(
serverTls.privateKey().getEncoded(), serverTls.certificate().getEncoded()))
.isInstanceOf(IllegalStateException.class)
.hasMessageContaining("sslContext has been previously configured");
}

@Test
Expand Down Expand Up @@ -93,5 +103,12 @@ void setSslContext_AlreadyExists_Throws() throws Exception {
assertThatThrownBy(() -> helper.setSslContext(sslContext, trustManager))
.isInstanceOf(IllegalStateException.class)
.hasMessageContaining("sslContext or trustManager has been previously configured");

helper = new TlsConfigHelper();
helper.setKeyManagerFromCerts(
serverTls.privateKey().getEncoded(), serverTls.certificate().getEncoded());
assertThatThrownBy(() -> helper.setSslContext(sslContext, trustManager))
.isInstanceOf(IllegalStateException.class)
.hasMessageContaining("keyManager has been previously configured");
}
}
Loading