DELTASPIKE-1386 check SecurityAccess when accessing user home dir
txs to Thomas Frühbeck for the report!
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
index fa80e54..3f43c74 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
@@ -78,19 +78,26 @@
if (userHome != null && !userHome.isEmpty())
{
File dsHome = new File(userHome, PROPERTY_FILE_HOME_NAME);
- if (dsHome.exists())
+ try
{
- try
+ if (dsHome.exists())
{
- ConfigSource dsHomeConfigSource = new PropertyFileConfigSource(dsHome.toURI().toURL());
- configSources.add(dsHomeConfigSource);
- LOG.log(Level.INFO, "Reading configuration from {}", dsHome.getAbsolutePath());
- }
- catch (MalformedURLException e)
- {
- LOG.log(Level.WARNING, "Could not read configuration from " + dsHome.getAbsolutePath(), e);
- }
+ try
+ {
+ ConfigSource dsHomeConfigSource = new PropertyFileConfigSource(dsHome.toURI().toURL());
+ configSources.add(dsHomeConfigSource);
+ LOG.log(Level.INFO, "Reading configuration from {}", dsHome.getAbsolutePath());
+ }
+ catch (MalformedURLException e)
+ {
+ LOG.log(Level.WARNING, "Could not read configuration from " + dsHome.getAbsolutePath(), e);
+ }
+ }
+ }
+ catch (SecurityException se)
+ {
+ LOG.log(Level.INFO, "Not allowed to check if directory {} exists", dsHome.getPath());
}
}
}
