Changeset 50e22b6


Ignore:
Timestamp:
Feb 20, 2011 7:16:54 AM (9 years ago)
Author:
hiddenz <hiddenz@…>
Branches:
master
Children:
b406c6c
Parents:
fbe3a48 (diff), 7c3af2c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of 'af76c48b3494f94a988fd96021bc5855e50d7e84'

and 'cdbfd85082605354db8dc98dee56d49ad42994ba'

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

    rfbe3a48 r50e22b6  
    211211     */
    212212    public void startRunning() {
    213         Thread t = new I2PAppThread(this, "Server " + remoteHost + ':' + remotePort, true);
     213        // prevent JVM exit when running outside the router
     214        boolean isDaemon = getTunnel().getContext().isRouterContext();
     215        Thread t = new I2PAppThread(this, "Server " + remoteHost + ':' + remotePort, isDaemon);
    214216        t.start();
    215217    }
  • apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java

    rfbe3a48 r50e22b6  
    214214                // the key is already in the TrustedUpdate keyring
    215215                // verify the sig and verify that it is signed by the signer in the plugin.config file
     216                // Allow "" as the previously-known signer
    216217                String signingKeyName = up.verifyAndGetSigner(f);
    217                 if (!signer.equals(signingKeyName)) {
     218                if (!(signer.equals(signingKeyName) || "".equals(signingKeyName))) {
    218219                    f.delete();
    219220                    to.delete();
     221                    if (signingKeyName == null)
     222                        _log.error("Failed to verify plugin signature, corrupt plugin or bad signature, signed by: " + signer);
     223                    else
     224                        _log.error("Plugin signer \"" + signer + "\" does not match existing signer in plugin.config file \"" + signingKeyName + "\"");
    220225                    statusDone("<b>" + _("Plugin signature verification of {0} failed", url) + "</b>");
    221226                    return;
     
    227232                    f.delete();
    228233                    to.delete();
     234                    _log.error("Bad key or key mismatch - Failed to add plugin key \"" + pubkey + "\" for plugin signer \"" + signer + "\"");
    229235                    statusDone("<b>" + _("Plugin signature verification of {0} failed", url) + "</b>");
    230236                    return;
     
    236242                    f.delete();
    237243                    to.delete();
     244                    if (signingKeyName == null)
     245                        _log.error("Failed to verify plugin signature, corrupt plugin or bad signature, signed by: " + signer);
     246                    else
     247                        // shouldn't happen
     248                        _log.error("Plugin signer \"" + signer + "\" does not match new signer in plugin.config file \"" + signingKeyName + "\"");
    238249                    statusDone("<b>" + _("Plugin signature verification of {0} failed", url) + "</b>");
    239250                    return;
  • history.txt

    rfbe3a48 r50e22b6  
     12011-02-19 zzz
     2    * I2PTunnel: Fix standalone server tunnels
     3                 http://forum.i2p/viewtopic.php?t=5376
     4    * Plugins: Fix signature verification if router.config specifies
     5               trustedUpdateKeys (ticket #416)
     6
    172011-02-18 Mathiasdm
    28    * Desktopgui now has an option to be disabled (desktopgui.enabled)
     9
    3102011-02-17 zzz
    411    * Build:
  • router/java/src/net/i2p/router/RouterVersion.java

    rfbe3a48 r50e22b6  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 14;
     21    public final static long BUILD = 16;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "";
     24    public final static String EXTRA = "-rc";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
Note: See TracChangeset for help on using the changeset viewer.