Skip to content

Commit

Permalink
[CVE-2020-1729] Ensure utility methods wrapping doPrivileged calls ar…
Browse files Browse the repository at this point in the history
…e not publicly available.

Additionally a doPrivileged is not necessary if no SecurityManager is installed.
  • Loading branch information
darranl committed Feb 14, 2020
1 parent 4e7ea86 commit fb0def6
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,26 @@
/**
* @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2018 Red Hat inc.
*/
public class SecuritySupport {
class SecuritySupport {
private static final Logger LOG = Logger.getLogger("io.smallrye.config");

private SecuritySupport() {
}

public static ClassLoader getContextClassLoader() {
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;
});
static ClassLoader getContextClassLoader() {
if (System.getSecurityManager() == null) {
return Thread.currentThread().getContextClassLoader();
} else {
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;
});
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package io.smallrye.config.inject;

import static io.smallrye.config.SecuritySupport.getContextClassLoader;
import static io.smallrye.config.inject.SecuritySupport.getContextClassLoader;

import java.io.Serializable;
import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* Copyright 2018 Red Hat, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.smallrye.config.inject;

import java.security.AccessController;
import java.security.PrivilegedAction;

import org.jboss.logging.Logger;

/**
* @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2018 Red Hat inc.
*/
class SecuritySupport {
private static final Logger LOG = Logger.getLogger("io.smallrye.config");

private SecuritySupport() {
}

static ClassLoader getContextClassLoader() {
if (System.getSecurityManager() == null) {
return Thread.currentThread().getContextClassLoader();
} else {
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;
});
}
}

}

0 comments on commit fb0def6

Please sign in to comment.