Merge pull request #903 from AdoptOpenJDK/extension-properties

Set properties specified in extension jnlp

Author: sclassen

core/src/main/java/net/adoptopenjdk/icedteaweb/jnlp/element/resource/ExtensionDesc.java

@@ -18,7 +18,14 @@
 package net.adoptopenjdk.icedteaweb.jnlp.element.resource;
 
 import net.adoptopenjdk.icedteaweb.jnlp.version.VersionString;
-
+import net.adoptopenjdk.icedteaweb.logging.Logger;
+import net.adoptopenjdk.icedteaweb.logging.LoggerFactory;
+import net.adoptopenjdk.icedteaweb.xmlparser.ParseException;
+import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.JNLPFileFactory;
+import net.adoptopenjdk.icedteaweb.i18n.Translator;
+
+import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,6 +39,8 @@
  * @version $Revision: 1.8 $
  */
 public class ExtensionDesc {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ExtensionDesc.class);
     public static final String EXT_DOWNLOAD_ELEMENT = "ext-download";
     public static final String HREF_ATTRIBUTE = "href";
     public static final String DOWNLOAD_ATTRIBUTE = "download";
@@ -58,6 +67,9 @@ public class ExtensionDesc {
     /** eager ext parts */
     private final List<String> eagerExtParts = new ArrayList<>();
 
+    /** the JNLPFile the extension refers to */
+    private JNLPFile file;
+
     /**
      * Create an extension descriptor.
      *
@@ -108,4 +120,34 @@ public VersionString getVersion() {
     public URL getLocation() {
         return location;
     }
+
+    /**
+     * Resolves the extension by creating a JNLPFile from the file
+     * specified by the extension's location property.
+     *
+     * @throws IOException if the extension JNLPFile could not be resolved.
+     * @throws ParseException if the extension JNLPFile could not be
+     * parsed or was not a component or installer descriptor.
+     */
+    public void resolve() throws ParseException, IOException {
+        if (file == null) {
+            file = new JNLPFileFactory().create(location);
+
+            LOG.debug("Resolve: {}", file.getInformation().getTitle());
+
+            // check for it being an extension descriptor
+            if (!file.isComponent() && !file.isInstaller()) {
+                 throw new ParseException(Translator.R("JInvalidExtensionDescriptor", name, location));
+            }
+        }
+
+    }
+
+    /**
+     * @return a JNLPFile for the extension, or null if the JNLP
+     * file has not been resolved.
+     */
+    public JNLPFile getJNLPFile() {
+        return file;
+    }
 }

core/src/main/java/net/sourceforge/jnlp/runtime/ApplicationInstance.java

@@ -16,10 +16,12 @@
 
 package net.sourceforge.jnlp.runtime;
 
+import net.adoptopenjdk.icedteaweb.jnlp.element.resource.ExtensionDesc;
 import net.adoptopenjdk.icedteaweb.jnlp.element.resource.PropertyDesc;
 import net.adoptopenjdk.icedteaweb.jnlp.element.security.SecurityDesc;
 import net.adoptopenjdk.icedteaweb.logging.Logger;
 import net.adoptopenjdk.icedteaweb.logging.LoggerFactory;
+import net.adoptopenjdk.icedteaweb.xmlparser.ParseException;
 import net.sourceforge.jnlp.JNLPFile;
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.classloader.JNLPClassLoader;
@@ -34,7 +36,9 @@
 import java.security.CodeSource;
 import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
-
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 /**
  * Represents a running instance of an application described in a
  * JNLPFile. This class provides a way to track the application's
@@ -130,9 +134,9 @@ public void finalize() {
      * Install the environment variables.
      */
     private void installEnvironment() {
-        final PropertyDesc[] props = file.getResources().getProperties();
+        final List<PropertyDesc> props = collectPropertiesFromJnlpHierarchy(new ArrayList<>(), file);
 
-        if (!(props.length == 0)) {
+        if (!(props.size() == 0)) {
             final CodeSource cs = new CodeSource(null, (java.security.cert.Certificate[]) null);
 
             final JNLPClassLoader loader = this.loader;
@@ -142,6 +146,7 @@ private void installEnvironment() {
 
             final PrivilegedAction<Object> setPropertiesAction = () -> {
                 for (PropertyDesc propDesc : props) {
+                    LOG.debug("Setting Property {}", propDesc.getKey());
                     System.setProperty(propDesc.getKey(), propDesc.getValue());
                 }
                 return null;
@@ -276,4 +281,29 @@ public boolean isSigned() {
         return isSigned;
     }
 
+    /**
+     * Collects properties from the full hierarchy of JNLP files
+     *
+     * @param props a list of all properties collected so far
+     * @param jnlpFile the current tip of the jnlp hierarchy
+     * @return a list of properties collected from the full hierarchy of JNLP files
+     */
+    private List<PropertyDesc> collectPropertiesFromJnlpHierarchy(List<PropertyDesc> props, JNLPFile jnlpFile) {
+        // Collect properties from the current jnlp file
+        props.addAll(Arrays.asList(jnlpFile.getResources().getProperties()));
+        for (ExtensionDesc ext : jnlpFile.getResources().getExtensions()) {
+            // Recursively look for extension jnlp files to collect their properties
+            try {
+                ext.resolve();
+                JNLPFile extFile = ext.getJNLPFile();
+                if (extFile != null) {
+                    collectPropertiesFromJnlpHierarchy(props, extFile);
+                }
+            } catch (ParseException | IOException e) {
+                LOG.debug("Could not resolve JNLP file {} (declared properties won't be set): {} ", ext.getName(),  e.getMessage());
+            }
+        }
+        return props;
+    }
+
 }