[SHRINKRES-42] Access sysprops in a secure fashion

shrinkwrap · Dec 17, 2012 · c12993f · c12993f · kpiwko · Dec 17, 2012
1 parent 49e803a
commit c12993f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ain/java/org/jboss/shrinkwrap/resolver/impl/maven/task/ConfigureSettingsFromFileTask.java b/...ain/java/org/jboss/shrinkwrap/resolver/impl/maven/task/ConfigureSettingsFromFileTask.java
@@ -66,7 +66,7 @@ public MavenWorkingSession execute(final MavenWorkingSession session) {
         }
 
         final SettingsBuildingRequest request = new DefaultSettingsBuildingRequest()
-            .setSystemProperties(System.getProperties())
+            .setSystemProperties(SecurityActions.getProperties())
             .setUserSettingsFile(settingsXmlFile);
         final MavenWorkingSession newSession = session.execute(request);
         return newSession.regenerateSession();

diff --git a/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/task/SecurityActions.java b/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/task/SecurityActions.java
@@ -93,13 +93,12 @@ public String run() {
 
     static Properties getProperties() {
         try {
-            Properties value = AccessController.doPrivileged(new PrivilegedExceptionAction<Properties>() {
+            return AccessController.doPrivileged(new PrivilegedExceptionAction<Properties>() {
                 @Override
                 public Properties run() {
                     return System.getProperties();
                 }
             });
-            return value;
         }
         // Unwrap
         catch (final PrivilegedActionException pae) {