antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

Try both Unix crypt and Stefan's new MD5 encoding for authentication.

Browse source
This commit is contained in:
hns 2002-03-26 12:09:32 +00:00
parent 7041bf08e7
commit c88ac35c17
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/helma/util/CryptFile.java
View file

@ -31,9 +31,18 @@ public class CryptFile {
users.clear (); users.clear ();
String realpw = users.getProperty (username); String realpw = users.getProperty (username);
if (realpw != null) { if (realpw != null) {
// check if password matches try {
String cryptpw = Crypt.crypt (realpw, pw); // check if password matches
return realpw.equals (cryptpw); // first we try with unix crypt algorithm
String cryptpw = Crypt.crypt (realpw, pw);
if (realpw.equals (cryptpw))
return true;
// then try MD5
if (realpw.equals (MD5Encoder.encode (pw)))
return true;
} catch (Exception x) {
return false;
}
} else { } else {
if (parentFile != null) if (parentFile != null)
return parentFile.authenticate (username, pw); return parentFile.authenticate (username, pw);