Changeset bb7a88f

Timestamp:

Dec 24, 2011 12:48:30 AM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

87008f3

Parents:

8fa7205

Message:

• Plugins:
  • Enforce min and max Jetty versions at plugin installation
  • Enforce I2P, Java, and Jetty versions at plugin startup too

Location:

apps/routerconsole/java/src/net/i2p/router/web

Files:

• LogsHelper.java (modified) (1 diff)
• PluginStarter.java (modified) (7 diffs)
• PluginUpdateHandler.java (modified) (1 diff)

apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java

@@ -13 +13 @@
     /** @since 0.8.11 */
     public String getJettyVersion() {
-        return Version.getImplVersion();
+        return jettyVersion();
+    }
+    
+    /** @since 0.8.13 */
+    static String jettyVersion() {
+        try {
+            return Version.getImplVersion();
+        } catch (Throwable t) {
+            return "unknown";
+        }
     }
 

apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java

@@ -18 +18 @@
 import java.util.concurrent.ConcurrentHashMap;
 
+import net.i2p.CoreVersion;
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
@@ -28 +29 @@
 import net.i2p.util.Log;
 import net.i2p.util.Translate;
+import net.i2p.util.VersionComparator;
 
 import org.mortbay.jetty.Server;
@@ -96 +98 @@
             return false;
         }
+
+        Properties props = pluginProperties(ctx, appName);
+        String minVersion = ConfigClientsHelper.stripHTML(props, "min-i2p-version");
+        if (minVersion != null &&
+            (new VersionComparator()).compare(CoreVersion.VERSION, minVersion) < 0) {
+            String foo = "Plugin " + appName + " requires I2P version " + minVersion + " or higher";
+            log.error(foo);
+            throw new Exception(foo);
+        }
+
+        minVersion = ConfigClientsHelper.stripHTML(props, "min-java-version");
+        if (minVersion != null &&
+            (new VersionComparator()).compare(System.getProperty("java.version"), minVersion) < 0) {
+            String foo = "Plugin " + appName + " requires Java version " + minVersion + " or higher";
+            log.error(foo);
+            throw new Exception(foo);
+        }
+
+        String jVersion = LogsHelper.jettyVersion();
+        minVersion = ConfigClientsHelper.stripHTML(props, "min-jetty-version");
+        if (minVersion != null &&
+            (new VersionComparator()).compare(minVersion, jVersion) > 0) {
+            String foo = "Plugin " + appName + " requires Jetty version " + minVersion + " or higher";
+            log.error(foo);
+            throw new Exception(foo);
+        }
+
+        String maxVersion = ConfigClientsHelper.stripHTML(props, "max-jetty-version");
+        if (maxVersion != null &&
+            (new VersionComparator()).compare(maxVersion, jVersion) < 0) {
+            String foo = "Plugin " + appName + " requires Jetty version " + maxVersion + " or lower";
+            log.error(foo);
+            throw new Exception(foo);
+        }
+
         if (log.shouldLog(Log.INFO))
             log.info("Starting plugin: " + appName);
@@ -114 +151 @@
         File clientConfig = new File(pluginDir, "clients.config");
         if (clientConfig.exists()) {
-            Properties props = new Properties();
-            DataHelper.loadProps(props, clientConfig);
+            Properties cprops = new Properties();
+            DataHelper.loadProps(cprops, clientConfig);
             List<ClientAppConfig> clients = ClientAppConfig.getClientApps(clientConfig);
             runClientApps(ctx, pluginDir, clients, "start");
@@ -124 +161 @@
         if (server != null) {
             File consoleDir = new File(pluginDir, "console");
-            Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
+            Properties wprops = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
             File webappDir = new File(consoleDir, "webapps");
             String fileNames[] = webappDir.list(RouterConsoleRunner.WarFilenameFilter.instance());
@@ -139 +176 @@
                             continue;
                         }
-                        String enabled = props.getProperty(RouterConsoleRunner.PREFIX + warName + ENABLED);
+                        String enabled = wprops.getProperty(RouterConsoleRunner.PREFIX + warName + ENABLED);
                         if (! "false".equals(enabled)) {
                             if (log.shouldLog(Log.INFO))
@@ -182 +219 @@
 
         // add summary bar link
-        Properties props = pluginProperties(ctx, appName);
         String name = ConfigClientsHelper.stripHTML(props, "consoleLinkName_" + Messages.getLanguage(ctx));
         if (name == null)

apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java

@@ -335 +335 @@
                     return;
                 }
+                oldVersion = LogsHelper.jettyVersion();
+                minVersion = ConfigClientsHelper.stripHTML(props, "min-jetty-version");
+                if (minVersion != null &&
+                    (new VersionComparator()).compare(minVersion, oldVersion) > 0) {
+                    to.delete();
+                    statusDone("<b>" + _("Plugin requires Jetty version {0} or higher", minVersion) + "</b>");
+                    return;
+                }
+                maxVersion = ConfigClientsHelper.stripHTML(props, "max-jetty-version");
+                if (maxVersion != null &&
+                    (new VersionComparator()).compare(maxVersion, oldVersion) < 0) {
+                    to.delete();
+                    statusDone("<b>" + _("Plugin requires Jetty version {0} or lower", maxVersion) + "</b>");
+                    return;
+                }
 
                 // check if it is running first?