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

server password is now encoded as one single entry in server.properties

Browse source 
(adminAccess instead of adminUsername+adminPassword)
This commit is contained in:
stefanp 2002-11-22 14:31:28 +00:00
parent 917502ba56
commit c709dd4c59
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Global/functions.js
View file

@ -108,10 +108,9 @@ function checkAuth(appObj) {
var ok = false; var ok = false;
// check against root // check against root
var rootUsername = root.getProperty("adminusername"); var adminAccess = root.getProperty("adminAccess");
var rootPassword = root.getProperty("adminpassword");
if ( rootUsername==null || rootUsername=="" || rootPassword==null || rootPassword=="" ) { if (adminAccess==null || adminAccess=="") {
return createAuth(); return createAuth();
} }
@ -121,10 +120,9 @@ function checkAuth(appObj) {
if ( uname==null || uname=="" || pwd==null || pwd=="" ) if ( uname==null || uname=="" || pwd==null || pwd=="" )
return forceAuth(); return forceAuth();
var md5username = Packages.helma.util.MD5Encoder.encode(uname); var md5key = Packages.helma.util.MD5Encoder.encode(uname + "-" + pwd);
var md5password = Packages.helma.util.MD5Encoder.encode(pwd);
if ( md5username==rootUsername && md5password==rootPassword ) if (md5key==adminAccess)
return true; return true;
if (appObj!=null && appObj.isActive()) { if (appObj!=null && appObj.isActive()) {
@ -200,9 +198,9 @@ function createAuth() {
renderSkin("pwdform",obj); renderSkin("pwdform",obj);
return false; return false;
} }
var str = "adminUsername=" + Packages.helma.util.MD5Encoder.encode(req.data.username) + "<br>\n"; var str = "adminAccess=" + Packages.helma.util.MD5Encoder.encode(req.data.username + "-" + req.data.password) + "<br>\n";
str += "adminPassword=" + Packages.helma.util.MD5Encoder.encode(req.data.password) + "<br>";
res.write ("<pre>" + str + "</pre>"); res.write ("<pre>" + str + "</pre>");
return false;
} else { } else {
// no input from webform, so print it // no input from webform, so print it