forked from I2P_Developers/i2p.i2p
zzz
e62b76d2cc
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.
70 lines
2.3 KiB
Java
70 lines
2.3 KiB
Java
package net.i2p.router.update;
|
|
|
|
import java.io.ByteArrayInputStream;
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.File;
|
|
import java.net.URI;
|
|
import java.text.DecimalFormat;
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
import java.util.StringTokenizer;
|
|
|
|
import net.i2p.crypto.TrustedUpdate;
|
|
import net.i2p.data.DataHelper;
|
|
import net.i2p.router.Router;
|
|
import net.i2p.router.RouterContext;
|
|
import net.i2p.router.RouterVersion;
|
|
import net.i2p.router.util.RFC822Date;
|
|
import net.i2p.update.*;
|
|
import net.i2p.util.EepGet;
|
|
import net.i2p.util.I2PAppThread;
|
|
import net.i2p.util.Log;
|
|
import net.i2p.util.PartialEepGet;
|
|
import net.i2p.util.VersionComparator;
|
|
|
|
/**
|
|
* <p>Handles the request to update the router by firing one or more
|
|
* {@link net.i2p.util.EepGet} calls to download the latest signed update file
|
|
* and displaying the status to anyone who asks.
|
|
* </p>
|
|
* <p>After the download completes the signed update file is verified with
|
|
* {@link net.i2p.crypto.TrustedUpdate}, and if it's authentic the payload
|
|
* of the signed update file is unpacked and the router is restarted to complete
|
|
* the update process.
|
|
* </p>
|
|
*
|
|
* This does not do any checking, that is handled by the NewsFetcher.
|
|
*/
|
|
class UpdateHandler implements Updater {
|
|
protected final RouterContext _context;
|
|
|
|
public UpdateHandler(RouterContext ctx) {
|
|
_context = ctx;
|
|
}
|
|
|
|
/** Can't check, the NewsHandler does that */
|
|
public UpdateTask check(UpdateType type, UpdateMethod method,
|
|
String id, String currentVersion, long maxTime) {
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Start a download and return a handle to the download task.
|
|
* Should not block.
|
|
*
|
|
* @param id plugin name or ignored
|
|
* @param maxTime how long you have
|
|
* @return active task or null if unable to download
|
|
*/
|
|
public UpdateTask update(UpdateType type, UpdateMethod method, List<URI> updateSources,
|
|
String id, String newVersion, long maxTime) {
|
|
if ((type != UpdateType.ROUTER_SIGNED && type != UpdateType.ROUTER_SIGNED_PACK200) ||
|
|
method != UpdateMethod.HTTP || updateSources.isEmpty())
|
|
return null;
|
|
UpdateRunner update = new UpdateRunner(_context, updateSources);
|
|
update.start();
|
|
return update;
|
|
}
|
|
}
|