echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Move MD5 functions to core util where i2ptunnel can use them

Browse Source
This commit is contained in:
zzz
2012-10-15 12:28:45 +00:00
parent ba37839adf
commit 977cdee046
3 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java
View File

@ -70,8 +70,7 @@ public class ConfigUIHandler extends FormHandler {
}
ConsolePasswordManager mgr = new ConsolePasswordManager(_context);
// rfc 2617
pw = name + ':' + RouterConsoleRunner.JETTY_REALM + ':' + pw;
if (mgr.saveMD5(RouterConsoleRunner.PROP_CONSOLE_PW, name, pw)) {
if (mgr.saveMD5(RouterConsoleRunner.PROP_CONSOLE_PW, RouterConsoleRunner.JETTY_REALM, name, pw)) {
addFormNotice(_("Added user {0}", name));
addFormNotice(_("Restart required to take effect"));
} else {

70
apps/routerconsole/java/src/net/i2p/router/web/ConsolePasswordManager.java
View File

@ -1,8 +1,5 @@
package net.i2p.router.web;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@ -35,20 +32,6 @@ public class ConsolePasswordManager extends RouterPasswordManager {
migrateConsole();
}
/**
* Checks both plaintext and hash
*
* @param realm e.g. i2cp, routerconsole, etc.
* @param user null or "" for no user, already trimmed
* @param pw plain text, already trimmed
* @return if pw verified
*/
public boolean check(String realm, String user, String pw) {
return super.check(realm, user, pw) ||
//checkCrypt(realm, user, pw) ||
checkMD5(realm, user, pw);
}
/**
* The username is the salt
*
@ -77,23 +60,14 @@ public class ConsolePasswordManager extends RouterPasswordManager {
* @param pw plain text, already trimmed
* @return if pw verified
*/
public boolean checkMD5(String realm, String user, String pw) {
public boolean checkMD5(String realm, String subrealm, String user, String pw) {
String pfx = realm;
if (user != null && user.length() > 0)
pfx += '.' + user;
String hex = _context.getProperty(pfx + PROP_MD5);
if (hex == null)
return false;
try {
MessageDigest md = MessageDigest.getInstance("MD5");
md.update(pw.getBytes("ISO-8859-1"));
// must use the method that adds leading zeros
return hex.equals(DataHelper.toString(md.digest()));
} catch (UnsupportedEncodingException uee) {
return false;
} catch (NoSuchAlgorithmException nsae) {
return false;
}
return hex.equals(md5Hex(subrealm, user, pw));
}
/**
@ -132,8 +106,8 @@ public class ConsolePasswordManager extends RouterPasswordManager {
String pw = _context.getProperty(PROP_CONSOLE_OLD);
if (pw != null) {
if (pw.length() > 0) {
pw = CONSOLE_USER + ':' + RouterConsoleRunner.JETTY_REALM + ':' + pw;
saveMD5(RouterConsoleRunner.PROP_CONSOLE_PW, CONSOLE_USER, pw);
saveMD5(RouterConsoleRunner.PROP_CONSOLE_PW, RouterConsoleRunner.JETTY_REALM,
CONSOLE_USER, pw);
}
Map toAdd = Collections.singletonMap(PROP_MIGRATED, "true");
List toDel = Collections.singletonList(PROP_CONSOLE_OLD);
@ -172,32 +146,28 @@ public class ConsolePasswordManager extends RouterPasswordManager {
/**
* Straight MD5, no salt
* Compatible with Jetty and RFC 2617.
*
* @param realm The full realm, e.g. routerconsole.auth.i2prouter, etc.
* @param user null or "" for no user, already trimmed
* @param pw plain text, must be of the form user:realm:pw to be compatible with Jetty
* @param subrealm to be used in creating the checksum
* @param user non-null, non-empty, already trimmed
* @param pw plain text
* @return if pw verified
*/
public boolean saveMD5(String realm, String user, String pw) {
public boolean saveMD5(String realm, String subrealm, String user, String pw) {
String pfx = realm;
if (user != null && user.length() > 0)
pfx += '.' + user;
try {
MessageDigest md = MessageDigest.getInstance("MD5");
md.update(pw.getBytes("ISO-8859-1"));
String hex = DataHelper.toString(md.digest());
Map<String, String> toAdd = Collections.singletonMap(pfx + PROP_MD5, hex);
List<String> toDel = new ArrayList(4);
toDel.add(pfx + PROP_PW);
toDel.add(pfx + PROP_B64);
toDel.add(pfx + PROP_CRYPT);
toDel.add(pfx + PROP_SHASH);
return _context.router().saveConfig(toAdd, toDel);
} catch (UnsupportedEncodingException uee) {
String hex = md5Hex(subrealm, user, pw);
if (hex == null)
return false;
} catch (NoSuchAlgorithmException nsae) {
return false;
}
Map<String, String> toAdd = Collections.singletonMap(pfx + PROP_MD5, hex);
List<String> toDel = new ArrayList(4);
toDel.add(pfx + PROP_PW);
toDel.add(pfx + PROP_B64);
toDel.add(pfx + PROP_CRYPT);
toDel.add(pfx + PROP_SHASH);
return _context.router().saveConfig(toAdd, toDel);
}
public static void main(String args[]) {
@ -221,9 +191,9 @@ public class ConsolePasswordManager extends RouterPasswordManager {
System.out.println("Fail 5");
System.out.println("Test MD5");
if (!pm.saveMD5("type3", "user3", "pw3"))
if (!pm.saveMD5("type3", "realm", "user3", "pw3"))
System.out.println("Fail 6");
if (!pm.checkMD5("type3", "user3", "pw3"))
if (!pm.checkMD5("type3", "realm", "user3", "pw3"))
System.out.println("Fail 7");
//System.out.println("Test crypt");