Skip to content

Consider any custom security provider as potentially loading JUL #8291

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
merged 1 commit into from
Jan 28, 2025
Merged

Consider any custom security provider as potentially loading JUL #8291

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
15 changes: 7 additions & 8 deletions dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,23 +1348,22 @@ private static String ddGetEnv(final String sysProp) {
}

private static boolean okHttpMayIndirectlyLoadJUL() {
if (isIBMSASLInstalled() || isACCPInstalled()) {
return true; // 'IBMSASL' and 'ACCP' crypto providers can load JUL when OkHttp accesses TLS
if (isCustomSecurityProviderInstalled() || isIBMSASLInstalled()) {
return true; // custom security providers may load JUL when OkHttp accesses TLS
}
if (isJavaVersionAtLeast(9)) {
return false; // JDKs since 9 have reworked JFR to use a different logging facility, not JUL
}
return isJFRSupported(); // assume OkHttp will indirectly load JUL via its JFR events
}

private static boolean isIBMSASLInstalled() {
return ClassLoader.getSystemResource("com/ibm/security/sasl/IBMSASL.class") != null;
private static boolean isCustomSecurityProviderInstalled() {
return ClassLoader.getSystemResource("META-INF/services/java.security.Provider") != null;
}

private static boolean isACCPInstalled() {
return ClassLoader.getSystemResource(
"com/amazon/corretto/crypto/provider/AmazonCorrettoCryptoProvider.class")
!= null;
private static boolean isIBMSASLInstalled() {
// need explicit check as this is installed without using the service-loader mechanism
return ClassLoader.getSystemResource("com/ibm/security/sasl/IBMSASL.class") != null;
}

private static boolean isJFRSupported() {
Expand Down
Loading