From 24b7b6fabd59c3bfc83eb54ea61cc5b2d80934f6 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 13 Oct 2012 21:42:52 +0000 Subject: [PATCH] - Don't migrate any plaintext passwords to obfuscated, it's too messy --- .../src/net/i2p/router/util/RouterPasswordManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/router/java/src/net/i2p/router/util/RouterPasswordManager.java b/router/java/src/net/i2p/router/util/RouterPasswordManager.java index 44bc431e30..5579596f55 100644 --- a/router/java/src/net/i2p/router/util/RouterPasswordManager.java +++ b/router/java/src/net/i2p/router/util/RouterPasswordManager.java @@ -26,9 +26,14 @@ public class RouterPasswordManager extends PasswordManager { // migrate these to hash private static final String PROP_I2CP_OLD = "i2cp.password"; private static final String PROP_I2CP_NEW = "i2cp.auth"; +/**** // migrate these to b64 private static final String[] MIGRATE_FROM = { + // This has a separate router.reseedProxy.username prop, + // so let's not mess with it "router.reseedProxy.password", + // Don't migrate these until we have a console form for them, + // which we aren't likely to ever bother with "routerconsole.keyPassword", "routerconsole.keystorePassword", "i2cp.keyPassword", @@ -41,6 +46,7 @@ public class RouterPasswordManager extends PasswordManager { "i2cp.ssl.key.auth", "i2cp.ssl.keystore.auth" }; +****/ public RouterPasswordManager(RouterContext ctx) { super(ctx); @@ -67,12 +73,14 @@ public class RouterPasswordManager extends PasswordManager { // obfuscation of plaintext passwords Map toAdd = new HashMap(5); List toDel = new ArrayList(5); + /**** for (int i = 0; i < MIGRATE_FROM.length; i++) { if ((pw = _context.getProperty(MIGRATE_FROM[i])) != null) { toAdd.put(MIGRATE_TO[i], Base64.encode(DataHelper.getUTF8(pw))); toDel.add(MIGRATE_FROM[i]); } } + ****/ toAdd.put(PROP_MIGRATED, "true"); return _context.router().saveConfig(toAdd, toDel); }