root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Factored out "suppressGetenvAccess()" method 

Issue: SPR-11297
This commit is contained in:
Juergen Hoeller 2014-01-22 23:57:36 +01:00
parent c1569d7ecd
commit 52d050d21a
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java vendored
View File

@ -60,6 +60,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
* resolvable otherwise. Consider switching this flag to "true" if you experience * resolvable otherwise. Consider switching this flag to "true" if you experience
* log warnings from {@code getenv} calls coming from Spring, e.g. on WebSphere * log warnings from {@code getenv} calls coming from Spring, e.g. on WebSphere
* with strict SecurityManager settings and AccessControlExceptions warnings. * with strict SecurityManager settings and AccessControlExceptions warnings.
* @see #suppressGetenvAccess()
*/ */
public static final String IGNORE_GETENV_PROPERTY_NAME = "spring.getenv.ignore"; public static final String IGNORE_GETENV_PROPERTY_NAME = "spring.getenv.ignore";
@ -359,17 +360,9 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Map<String, Object> getSystemEnvironment() { public Map<String, Object> getSystemEnvironment() {
try { if (suppressGetenvAccess()) {
if ("true".equalsIgnoreCase(System.getProperty(IGNORE_GETENV_PROPERTY_NAME))) { return Collections.emptyMap();
return Collections.emptyMap();
}
} }
catch (Throwable ex) {
if (logger.isDebugEnabled()) {
logger.debug("Could not obtain system property '" + IGNORE_GETENV_PROPERTY_NAME + "': " + ex);
}
}
try { try {
return (Map) System.getenv(); return (Map) System.getenv();
} }
@ -393,6 +386,27 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
} }
} }
/**
* Determine whether to suppress {@link System#getenv()}/{@link System#getenv(String)}
* access for the purposes of {@link #getSystemEnvironment()}.
* <p>If this method returns {@code true}, an empty dummy Map will be used instead
* of the regular system environment Map, never even trying to call {@code getenv}
* and therefore avoiding security manager warnings (if any).
* <p>The default implementation checks for the "spring.getenv.ignore" system property,
* returning {@code true} if its value equals "true" in any case.
*/
protected boolean suppressGetenvAccess() {
try {
return "true".equalsIgnoreCase(System.getProperty(IGNORE_GETENV_PROPERTY_NAME));
}
catch (Throwable ex) {
if (logger.isDebugEnabled()) {
logger.debug("Could not obtain system property '" + IGNORE_GETENV_PROPERTY_NAME + "': " + ex);
}
return false;
}
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Map<String, Object> getSystemProperties() { public Map<String, Object> getSystemProperties() {
try { try {