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

Console: Fix UTF-8 passwords

Browse Source 
Partial fix for UTF-8 usernames
Better input checking and help messages
This commit is contained in:
zzz
2016-05-08 19:49:14 +00:00
parent 8bb6922e80
commit 6b578dfd8c
5 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/src/net/i2p/data/DataHelper.java
View File

@@ -1873,7 +1873,9 @@ public class DataHelper {
* Roughly the same as orig.getBytes("ISO-8859-1") but much faster and
* will not throw an exception.
*
* @param orig non-null, must be 7-bit chars
* Warning - misnamed, converts to ISO-8859-1.
*
* @param orig non-null, truncates to 8-bit chars
* @since 0.9.5
*/
public static byte[] getASCII(String orig) {

21
core/java/src/net/i2p/util/PasswordManager.java
View File

@@ -30,7 +30,7 @@ public class PasswordManager {
protected static final String PROP_PW = ".password";
/** stored obfuscated as b64 of the UTF-8 bytes */
protected static final String PROP_B64 = ".b64";
/** stored as the hex of the MD5 hash of the ISO-8859-1 bytes. Compatible with Jetty. */
/** stored as the hex of the MD5 hash of the UTF-8 bytes. Compatible with Jetty. */
protected static final String PROP_MD5 = ".md5";
/** stored as a Unix crypt string */
protected static final String PROP_CRYPT = ".crypt";
@@ -185,6 +185,10 @@ public class PasswordManager {
* Will return the MD5 sum of "user:subrealm:pw", compatible with Jetty
* and RFC 2617.
*
* Updated in 0.9.26 to use UTF-8, as implied in RFC 7616/7617
* See also http://stackoverflow.com/questions/7242316/what-encoding-should-i-use-for-http-basic-authentication
* http://stackoverflow.com/questions/702629/utf-8-characters-mangled-in-http-basic-auth-username
*
* @param subrealm to be used in creating the checksum
* @param user non-null, non-empty, already trimmed
* @param pw non-null, plain text, already trimmed
@@ -200,17 +204,18 @@ public class PasswordManager {
* Will return the MD5 sum of the data, compatible with Jetty
* and RFC 2617.
*
* Updated in 0.9.26 to use UTF-8, as implied in RFC 7616/7617
* See also http://stackoverflow.com/questions/7242316/what-encoding-should-i-use-for-http-basic-authentication
*
* @param fullpw non-null, plain text, already trimmed
* @return lower-case hex with leading zeros, 32 chars, or null on error
*/
public static String md5Hex(String fullpw) {
try {
byte[] data = fullpw.getBytes("ISO-8859-1");
byte[] sum = md5Sum(data);
if (sum != null)
// adds leading zeros if necessary
return DataHelper.toString(sum);
} catch (UnsupportedEncodingException uee) {}
byte[] data = DataHelper.getUTF8(fullpw);
byte[] sum = md5Sum(data);
if (sum != null)
// adds leading zeros if necessary
return DataHelper.toString(sum);
return null;
}