echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
adfc22499c6c263b12b2a08efe506f777a1b25ef
i2p.i2p/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java

430 lines
20 KiB
Java
Raw Normal View History

Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
package net.i2p.router.update;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
import java.io.File;
import java.io.IOException;
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
import java.net.URI;
import java.util.List;
* Plugins: - Check plugin key against all installed plugins - Reword some error messages * VersionComparator: add '-' and '_' as valid separators to better support plugin and java version checking
2010-02-10 15:35:00 +00:00
import java.util.Map;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
import java.util.Properties;
import net.i2p.CoreVersion;
import net.i2p.crypto.TrustedUpdate;
import net.i2p.data.DataHelper;
import net.i2p.router.RouterContext;
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
import net.i2p.router.web.ConfigClientsHelper;
import net.i2p.router.web.ConfigUpdateHandler;
import net.i2p.router.web.LogsHelper;
import net.i2p.router.web.Messages;
import net.i2p.router.web.PluginStarter;
import net.i2p.update.*;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
import net.i2p.util.EepGet;
import net.i2p.util.FileUtil;
import net.i2p.util.I2PAppThread;
import net.i2p.util.OrderedProperties;
Set permissions on directories and files when they are created
2010-07-06 15:22:48 +00:00
import net.i2p.util.SecureDirectory;
Plugins: bugfix and defer update.
2012-03-13 09:49:15 +00:00
import net.i2p.util.SecureFile;
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
import net.i2p.util.SimpleScheduler;
import net.i2p.util.SimpleTimer;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
import net.i2p.util.VersionComparator;
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
/**
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
* Check for an updated version of a plugin.
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
* A plugin is a standard .sud file with a 40-byte signature,
start of a plugin starter
2010-02-07 13:32:49 +00:00
* a 16-byte version, and a .zip file.
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
*
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
* So we get the current version and update URL for the installed plugin,
* then fetch the first 56 bytes of the URL, extract the version,
* and compare.
*
* Moved from web/ and turned into an UpdateTask.
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
*
- Split up Updater and Checker interfaces - Update router after check
2012-10-17 22:24:15 +00:00
* @since 0.9.4 moved from PluginUpdateHandler
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
*/
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
class PluginUpdateRunner extends UpdateRunner {
private String _appName;
private final String _oldVersion;
private final URI _uri;
private final String _xpi2pURL;
private boolean _updated;
- Several plugin install fixes - Remove unused UpdateTypes - Only try applicable updaters when updating - Javadoc fixes
2012-10-23 02:34:24 +00:00
private String _errMsg = "";
* Plugins: Add completion message after all-update check
2012-01-23 17:53:59 +00:00
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
private static final String XPI2P = "app.xpi2p";
private static final String ZIP = XPI2P + ".zip";
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
public static final String PLUGIN_DIR = PluginStarter.PLUGIN_DIR;
- Save available unsigned version across restarts - Fix status display after downloaded - Don't display update buttons unless HTTP proxy is up - Pass the manager down thru the constructors
2012-10-19 20:26:08 +00:00
public PluginUpdateRunner(RouterContext ctx, ConsoleUpdateManager mgr, List<URI> uris,
String appName, String oldVersion ) {
super(ctx, mgr, uris);
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
if (uris.isEmpty())
_uri = null;
else
_uri = uris.get(0);
_xpi2pURL = _uri.toString();
_appName = appName;
_oldVersion = oldVersion;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
}
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
@Override
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
public UpdateType getType() {
- Several plugin install fixes - Remove unused UpdateTypes - Only try applicable updaters when updating - Javadoc fixes
2012-10-23 02:34:24 +00:00
return UpdateType.PLUGIN;
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
}
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
@Override
public URI getURI() { return _uri; }
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
- Fix spacing in summary bar - Add start() in UpdateTask so things happen in the right order - Add toString() in UpdateTask for better debugging - Fix getID() for plugin UpdateTasks
2012-10-22 20:25:01 +00:00
@Override
public String getID() { return _appName; }
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
@Override
protected void update() {
Big refactor of the router console update subsystem, in preparation for implementing out-of-console updaters like i2psnark. - Add new update interfaces in net.i2p.update - All update implementations moved to routerconsole update/ - Implement an UpdateManager that registers with the RouterContext - UpdateManager handles multiple types of things to update (router, plugins, news, ...) and methods of updating (HTTP, ...) - UpdateManager maintains list of installed, downloaded, and available versions of everything - Define Updaters that can check for a new version and/or download an item - Individual Updaters register with the UpdateManager obtained from I2PAppContext, identifying the type of update item and update method they can handle. - Updaters need only core libs, no router.jar or routerconsole access required. - All checks and updates are initiated via the UpdateManager. - All status on checks and updates in-progress or completed are obtained from the UpdateManager. No more use of System properties to broadcast update state. - All update and checker tasks are intantiated on demand and threaded; no more static references left over. - Split out the Runners and Checkers from the Handlers and make the inheritance more sane. - No more permanent NewsFetcher thread; run on the SimpleScheduler queue and thread a checker task only to fetch the news. - No more static NewsFetcher instance in routerconsole. All helper methods that are still required are moved to NewsHelper. The UpdateManager implements the policy for when to check and download. All requests go through the UpdateManager. For each update type, there's several parts: - The xxxUpdateHandler implements the Updater - The xxxUpdateChecker implements the UpdateTask for checking - The xxxUpdateRunner implements the UpdateTask for downloading New and moved classes: web/ update/ ---- ------- new ConsoleUpdateManager.java new PluginUpdateChecker.java from PluginUpdateChecker PluginUpdateChecker -> PluginUpdateHandler.java PluginUpdateHandler.java -> PluginUpdateRunner new UnsignedUpdateHandler.java UnsignedUpdateHandler -> UnsignedUpdateRunner.java new UnsignedUpdateChecker from NewsFetcher UpdateHandler.java remains new UpdateHandler.java new UpdateRunner.java from UpdateHandler move NewsHandler from NewsFetcher new NewsFetcher new NewsTimerTask new DummyHandler Initial checkin. Unfinished, untested, unpolished.
2012-06-18 22:09:45 +00:00
* Plugins: Add completion message after all-update check
2012-01-23 17:53:59 +00:00
_updated = false;
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
if(_xpi2pURL.startsWith("file://")) {
Plugins: less confusing message, fix CNFE by catch and ignore on delete.
2012-03-19 01:46:47 +00:00
updateStatus("<b>" + _("Attempting to install from file {0}", _xpi2pURL) + "</b>");
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
// strip off "file://"
String xpi2pfile = _xpi2pURL.substring(7);
- Several plugin install fixes - Remove unused UpdateTypes - Only try applicable updaters when updating - Javadoc fixes
2012-10-23 02:34:24 +00:00
if(xpi2pfile.length() == 0) {
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
statusDone("<b>" + _("No file specified {0}", _xpi2pURL) + "</b>");
} else {
Plugins
2012-03-15 00:39:11 +00:00
// copy the contents of from to _updateFile
long alreadyTransferred = (new File(xpi2pfile)).getAbsoluteFile().length();
if(FileUtil.copy((new File(xpi2pfile)).getAbsolutePath(), _updateFile, true, false)) {
transferComplete(alreadyTransferred, alreadyTransferred, 0L, _xpi2pURL, _updateFile, false);
} else {
Plugins: less confusing message, fix CNFE by catch and ignore on delete.
2012-03-19 01:46:47 +00:00
statusDone("<b>" + _("Failed to install from file {0}, copy failed.", _xpi2pURL) + "</b>");
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
}
}
} else {
Plugins
2012-03-15 00:39:11 +00:00
updateStatus("<b>" + _("Downloading plugin from {0}", _xpi2pURL) + "</b>");
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
// use the same settings as for updater
boolean shouldProxy = Boolean.valueOf(_context.getProperty(ConfigUpdateHandler.PROP_SHOULD_PROXY, ConfigUpdateHandler.DEFAULT_SHOULD_PROXY)).booleanValue();
String proxyHost = _context.getProperty(ConfigUpdateHandler.PROP_PROXY_HOST, ConfigUpdateHandler.DEFAULT_PROXY_HOST);
int proxyPort = ConfigUpdateHandler.proxyPort(_context);
try {
if (shouldProxy)
// 10 retries!!
_get = new EepGet(_context, proxyHost, proxyPort, 10, _updateFile, _xpi2pURL, false);
else
_get = new EepGet(_context, 1, _updateFile, _xpi2pURL, false);
_get.addStatusListener(PluginUpdateRunner.this);
fixups after prop
2012-08-03 18:56:53 +00:00
_get.fetch(CONNECT_TIMEOUT, -1, shouldProxy ? INACTIVITY_TIMEOUT : NOPROXY_INACTIVITY_TIMEOUT);
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
} catch (Throwable t) {
_log.error("Error downloading plugin", t);
}
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
}
- Several plugin install fixes - Remove unused UpdateTypes - Only try applicable updaters when updating - Javadoc fixes
2012-10-23 02:34:24 +00:00
if (_updated)
_mgr.notifyComplete(this, _newVersion, null);
else
_mgr.notifyTaskFailed(this, _errMsg, null);
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
}
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
@Override
public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {
Plugins
2012-03-15 00:39:11 +00:00
boolean update = false;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
updateStatus("<b>" + _("Plugin downloaded") + "</b>");
File f = new File(_updateFile);
Set permissions on directories and files when they are created
2010-07-06 15:22:48 +00:00
File appDir = new SecureDirectory(_context.getConfigDir(), PLUGIN_DIR);
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
if ((!appDir.exists()) && (!appDir.mkdir())) {
f.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Cannot create plugin directory {0}", appDir.getAbsolutePath()) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
TrustedUpdate up = new TrustedUpdate(_context);
File to = new File(_context.getTempDir(), "tmp" + _context.random().nextInt() + ZIP);
// extract to a zip file whether the sig is good or not, so we can get the properties file
String err = up.migrateFile(f, to);
if (err != null) {
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + err + ' ' + _("from {0}", url) + " </b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
f.delete();
to.delete();
return;
}
File tempDir = new File(_context.getTempDir(), "tmp" + _context.random().nextInt() + "-unzip");
if (!FileUtil.extractZip(to, tempDir)) {
f.delete();
to.delete();
FileUtil.rmdir(tempDir, false);
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin from {0} is corrupt", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
start of a plugin starter
2010-02-07 13:32:49 +00:00
File installProps = new File(tempDir, "plugin.config");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
Properties props = new OrderedProperties();
try {
DataHelper.loadProps(props, installProps);
} catch (IOException ioe) {
f.delete();
to.delete();
FileUtil.rmdir(tempDir, false);
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin from {0} does not contain the required configuration file", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
// we don't need this anymore, we will unzip again
FileUtil.rmdir(tempDir, false);
// ok, now we check sigs and deal with a bad sig
String pubkey = props.getProperty("key");
* Plugins: - Fix plugin start button - Change signer prop to match docs - Tweaks
2010-02-17 18:12:46 +00:00
String signer = props.getProperty("signer");
if (pubkey == null || signer == null || pubkey.length() != 172 || signer.length() <= 0) {
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
f.delete();
to.delete();
* Plugins: - Fix plugin start button - Change signer prop to match docs - Tweaks
2010-02-17 18:12:46 +00:00
//updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' ' + signer + "</b>");
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin from {0} contains an invalid key", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
* Plugins: - Check plugin key against all installed plugins - Reword some error messages * VersionComparator: add '-' and '_' as valid separators to better support plugin and java version checking
2010-02-10 15:35:00 +00:00
// add all existing plugin keys, so any conflicts with existing keys
// will be discovered and rejected
Map<String, String> existingKeys = PluginStarter.getPluginKeys(_context);
for (Map.Entry<String, String> e : existingKeys.entrySet()) {
// ignore dups/bad keys
up.addKey(e.getKey(), e.getValue());
}
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
if (up.haveKey(pubkey)) {
// the key is already in the TrustedUpdate keyring
* Plugins: - Fix plugin start button - Change signer prop to match docs - Tweaks
2010-02-17 18:12:46 +00:00
// verify the sig and verify that it is signed by the signer in the plugin.config file
* Plugins: Fix signature verification if router.config specifies trustedUpdateKeys (ticket #416)
2011-02-19 19:14:05 +00:00
// Allow "" as the previously-known signer
verify that signing key name matches
2010-02-15 16:12:49 +00:00
String signingKeyName = up.verifyAndGetSigner(f);
* Plugins: Fix signature verification if router.config specifies trustedUpdateKeys (ticket #416)
2011-02-19 19:14:05 +00:00
if (!(signer.equals(signingKeyName) || "".equals(signingKeyName))) {
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
f.delete();
to.delete();
* Plugins: Fix signature verification if router.config specifies trustedUpdateKeys (ticket #416)
2011-02-19 19:14:05 +00:00
if (signingKeyName == null)
_log.error("Failed to verify plugin signature, corrupt plugin or bad signature, signed by: " + signer);
else
_log.error("Plugin signer \"" + signer + "\" does not match existing signer in plugin.config file \"" + signingKeyName + "\"");
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin signature verification of {0} failed", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
} else {
// add to keyring...
* Plugins: - Fix plugin start button - Change signer prop to match docs - Tweaks
2010-02-17 18:12:46 +00:00
if(!up.addKey(pubkey, signer)) {
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
// bad or duplicate key
f.delete();
to.delete();
* Plugins: Fix signature verification if router.config specifies trustedUpdateKeys (ticket #416)
2011-02-19 19:14:05 +00:00
_log.error("Bad key or key mismatch - Failed to add plugin key \"" + pubkey + "\" for plugin signer \"" + signer + "\"");
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin signature verification of {0} failed", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
// ...and try the verify again
* Plugins: - Fix plugin start button - Change signer prop to match docs - Tweaks
2010-02-17 18:12:46 +00:00
// verify the sig and verify that it is signed by the signer in the plugin.config file
verify that signing key name matches
2010-02-15 16:12:49 +00:00
String signingKeyName = up.verifyAndGetSigner(f);
* Plugins: - Fix plugin start button - Change signer prop to match docs - Tweaks
2010-02-17 18:12:46 +00:00
if (!signer.equals(signingKeyName)) {
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
f.delete();
to.delete();
* Plugins: Fix signature verification if router.config specifies trustedUpdateKeys (ticket #416)
2011-02-19 19:14:05 +00:00
if (signingKeyName == null)
_log.error("Failed to verify plugin signature, corrupt plugin or bad signature, signed by: " + signer);
else
// shouldn't happen
_log.error("Plugin signer \"" + signer + "\" does not match new signer in plugin.config file \"" + signingKeyName + "\"");
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin signature verification of {0} failed", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
}
check for mismatched versions
2010-02-08 22:50:30 +00:00
String sudVersion = TrustedUpdate.getVersionString(f);
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
f.delete();
String appName = props.getProperty("name");
String version = props.getProperty("version");
if (appName == null || version == null || appName.length() <= 0 || version.length() <= 0 ||
... and more
2010-02-08 23:37:31 +00:00
appName.indexOf("<") >= 0 || appName.indexOf(">") >= 0 ||
version.indexOf("<") >= 0 || version.indexOf(">") >= 0 ||
appName.startsWith(".") || appName.indexOf("/") >= 0 || appName.indexOf("\\") >= 0) {
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin from {0} has invalid name or version", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
check for mismatched versions
2010-02-08 22:50:30 +00:00
if (!version.equals(sudVersion)) {
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin {0} has mismatched versions", appName) + "</b>");
check for mismatched versions
2010-02-08 22:50:30 +00:00
return;
}
- Several plugin install fixes - Remove unused UpdateTypes - Only try applicable updaters when updating - Javadoc fixes
2012-10-23 02:34:24 +00:00
// set so notifyComplete() will work
_appName = appName;
_newVersion = version;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
... and more
2010-02-08 23:37:31 +00:00
String minVersion = ConfigClientsHelper.stripHTML(props, "min-i2p-version");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
if (minVersion != null &&
(new VersionComparator()).compare(CoreVersion.VERSION, minVersion) < 0) {
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("This plugin requires I2P version {0} or higher", minVersion) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
... and more
2010-02-08 23:37:31 +00:00
minVersion = ConfigClientsHelper.stripHTML(props, "min-java-version");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
if (minVersion != null &&
(new VersionComparator()).compare(System.getProperty("java.version"), minVersion) < 0) {
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("This plugin requires Java version {0} or higher", minVersion) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
* Plugins: - Only stop a plugin before update if it was running - Don't start a plugin after update if it was disabled - Disable plugin if it fails version checks at startup
2012-01-15 16:59:33 +00:00
boolean wasRunning = false;
Set permissions on directories and files when they are created
2010-07-06 15:22:48 +00:00
File destDir = new SecureDirectory(appDir, appName);
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
if (destDir.exists()) {
start of a plugin starter
2010-02-07 13:32:49 +00:00
if (Boolean.valueOf(props.getProperty("install-only")).booleanValue()) {
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Downloaded plugin is for new installs only, but the plugin is already installed", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
// compare previous version
start of a plugin starter
2010-02-07 13:32:49 +00:00
File oldPropFile = new File(destDir, "plugin.config");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
Properties oldProps = new OrderedProperties();
try {
DataHelper.loadProps(oldProps, oldPropFile);
} catch (IOException ioe) {
to.delete();
FileUtil.rmdir(tempDir, false);
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Installed plugin does not contain the required configuration file", url) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
String oldPubkey = oldProps.getProperty("key");
* Plugins: - Fix plugin start button - Change signer prop to match docs - Tweaks
2010-02-17 18:12:46 +00:00
String oldKeyName = oldProps.getProperty("signer");
Plugins: bugfix and defer update.
2012-03-13 09:49:15 +00:00
String oldAppName = oldProps.getProperty("name");
* Plugins: - Fix plugin start button - Change signer prop to match docs - Tweaks
2010-02-17 18:12:46 +00:00
if ((!pubkey.equals(oldPubkey)) || (!signer.equals(oldKeyName)) || (!appName.equals(oldAppName))) {
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Signature of downloaded plugin does not match installed plugin") + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
String oldVersion = oldProps.getProperty("version");
if (oldVersion == null ||
(new VersionComparator()).compare(oldVersion, version) >= 0) {
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Downloaded plugin version {0} is not newer than installed plugin", version) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
... and more
2010-02-08 23:37:31 +00:00
minVersion = ConfigClientsHelper.stripHTML(props, "min-installed-version");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
if (minVersion != null &&
(new VersionComparator()).compare(minVersion, oldVersion) > 0) {
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin update requires installed plugin version {0} or higher", minVersion) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
... and more
2010-02-08 23:37:31 +00:00
String maxVersion = ConfigClientsHelper.stripHTML(props, "max-installed-version");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
if (maxVersion != null &&
(new VersionComparator()).compare(maxVersion, oldVersion) < 0) {
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin update requires installed plugin version {0} or lower", maxVersion) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
* Plugins: - Enforce min and max Jetty versions at plugin installation - Enforce I2P, Java, and Jetty versions at plugin startup too
2011-12-24 00:48:30 +00:00
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;
}
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
// do we defer extraction and installation?
Plugins: bugfix and defer update.
2012-03-13 09:49:15 +00:00
if (Boolean.valueOf(props.getProperty("router-restart-required")).booleanValue()) {
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
// Yup!
Plugins: bugfix and defer update.
2012-03-13 09:49:15 +00:00
try {
if(!FileUtil.copy(to, (new SecureFile( new SecureFile(appDir.getCanonicalPath() +"/" + appName +"/"+ ZIP).getCanonicalPath())) , true, true)) {
to.delete();
statusDone("<b>" + _("Cannot copy plugin to directory {0}", destDir.getAbsolutePath()) + "</b>");
return;
}
} catch (Throwable t) {
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
to.delete();
Plugins: bugfix and defer update.
2012-03-13 09:49:15 +00:00
_log.error("Error copying plugin {0}", t);
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
return;
}
// we don't need the original file anymore.
to.delete();
statusDone("<b>" + _("Plugin will be installed on next restart.") + "</b>");
Plugins: bugfix and defer update.
2012-03-13 09:49:15 +00:00
return;
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
}
* Plugins: - Only stop a plugin before update if it was running - Don't start a plugin after update if it was disabled - Disable plugin if it fails version checks at startup
2012-01-15 16:59:33 +00:00
if (PluginStarter.isPluginRunning(appName, _context)) {
wasRunning = true;
try {
if (!PluginStarter.stopPlugin(_context, appName)) {
// failed, ignore
}
} catch (Throwable e) {
// no updateStatus() for this one
_log.error("Error stopping plugin " + appName, e);
plugin stopper
2010-02-08 20:37:49 +00:00
}
fix stop button; catch and log exceptions better
2010-02-11 21:41:54 +00:00
}
Plugins
2012-03-15 00:39:11 +00:00
update = true;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
} else {
start of a plugin starter
2010-02-07 13:32:49 +00:00
if (Boolean.valueOf(props.getProperty("update-only")).booleanValue()) {
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin is for upgrades only, but the plugin is not installed") + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
if (!destDir.mkdir()) {
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Cannot create plugin directory {0}", destDir.getAbsolutePath()) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
}
// Finally, extract the zip to the plugin directory
if (!FileUtil.extractZip(to, destDir)) {
to.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Failed to install plugin in {0}", destDir.getAbsolutePath()) + "</b>");
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
return;
}
* Plugins: Add completion message after all-update check
2012-01-23 17:53:59 +00:00
_updated = true;
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
to.delete();
Plugins
2012-03-15 00:39:11 +00:00
// install != update. Changing the user's settings like this is probabbly a bad idea.
if (Boolean.valueOf( props.getProperty("dont-start-at-install")).booleanValue()) {
statusDone("<b>" + _("Plugin {0} installed", appName) + "</b>");
if(!update) {
plugin description on configclients
2010-02-08 16:15:23 +00:00
Properties pluginProps = PluginStarter.pluginProperties();
pluginProps.setProperty(PluginStarter.PREFIX + appName + PluginStarter.ENABLED, "false");
PluginStarter.storePluginProperties(pluginProps);
}
* Plugins: - Only stop a plugin before update if it was running - Don't start a plugin after update if it was disabled - Disable plugin if it fails version checks at startup
2012-01-15 16:59:33 +00:00
} else if (wasRunning || PluginStarter.isPluginEnabled(appName)) {
// start everything unless it was disabled and not running before
start of a plugin starter
2010-02-07 13:32:49 +00:00
try {
linkify message
2010-11-27 13:48:53 +00:00
if (PluginStarter.startPlugin(_context, appName)) {
String linkName = ConfigClientsHelper.stripHTML(props, "consoleLinkName_" + Messages.getLanguage(_context));
if (linkName == null)
linkName = ConfigClientsHelper.stripHTML(props, "consoleLinkName");
String linkURL = ConfigClientsHelper.stripHTML(props, "consoleLinkURL");
String link;
if (linkName != null && linkURL != null)
link = "<a target=\"_blank\" href=\"" + linkURL + "\"/>" + linkName + "</a>";
else
link = appName;
statusDone("<b>" + _("Plugin {0} installed and started", link) + "</b>");
}
start of a plugin starter
2010-02-07 13:32:49 +00:00
else
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin {0} installed but failed to start, check logs", appName) + "</b>");
fix stop button; catch and log exceptions better
2010-02-11 21:41:54 +00:00
} catch (Throwable e) {
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Plugin {0} installed but failed to start", appName) + ": " + e + "</b>");
fix stop button; catch and log exceptions better
2010-02-11 21:41:54 +00:00
_log.error("Error starting plugin " + appName, e);
start of a plugin starter
2010-02-07 13:32:49 +00:00
}
* Plugins: - Only stop a plugin before update if it was running - Don't start a plugin after update if it was disabled - Disable plugin if it fails version checks at startup
2012-01-15 16:59:33 +00:00
} else {
statusDone("<b>" + _("Plugin {0} installed", appName) + "</b>");
start of a plugin starter
2010-02-07 13:32:49 +00:00
}
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
}
@Override
public void transferFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt) {
File f = new File(_updateFile);
f.delete();
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
statusDone("<b>" + _("Failed to download plugin from {0}", url) + "</b>");
}
private void statusDone(String msg) {
- Several plugin install fixes - Remove unused UpdateTypes - Only try applicable updaters when updating - Javadoc fixes
2012-10-23 02:34:24 +00:00
// if we fail, we will pass this back in notifyTaskFailed()
_errMsg = msg;
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
updateStatus(msg);
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
}
* Plugins: Remove final check and install console messages after a while
2010-03-25 20:23:32 +00:00
* Plugins: New plugin downloader/installer * configclients.jsp: Use new WebAppStarter so webapps that are started later also get the temp dir, password, and classpath configuration just like if they were started at the beginning * configupdate.jsp: Delay after checking for update so the summary bar will have buttons.
2010-02-06 20:25:13 +00:00
}
Plugins: Handle 'file://' URLs for installation and updates.
2012-03-13 05:49:02 +00:00
Reference in New Issue Copy Permalink