Skip to content

HV-2106 Security Fix for ClassLoader Access in fromContext() Method #1618

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

Closed
wants to merge 1 commit into from
Closed

HV-2106 Security Fix for ClassLoader Access in fromContext() Method #1618

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
16 changes: 15 additions & 1 deletion engine/src/main/java/org/hibernate/validator/internal/util/actions/GetClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,21 @@ private GetClassLoader() {
}

public static ClassLoader fromContext() {
return Thread.currentThread().getContextClassLoader();
if (System.getSecurityManager() == null) {
// Fast path when no SecurityManager is active
return Thread.currentThread().getContextClassLoader();
} else {
// Use AccessController when SecurityManager is active
return AccessController.doPrivileged((PrivilegedAction<ClassLoader>) () -> {
ClassLoader tccl = null;
try {
tccl = Thread.currentThread().getContextClassLoader();
} catch (SecurityException ex) {
LOG.warn("Unable to get context classloader instance.", ex);
}
return tccl;
});
}
}

public static ClassLoader fromClass(Class<?> clazz) {
Expand Down
Loading