From 39f565252fc6fa64506837720d310e197ee53795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sat, 21 Mar 2020 13:26:39 +0100 Subject: [PATCH] =?UTF-8?q?chg:=20further=20replaced=20helma=E2=80=99s=20m?= =?UTF-8?q?d5=20implementation=20with=20apache=20commons=20codec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/helmaTools.zip | Bin 22640 -> 0 bytes modules/tools/Global/helma.auth.js | 4 ++-- src/dist/apps/manage/Global/functions.js | 4 ++-- src/dist/apps/manage/Root/actions.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 modules/helmaTools.zip diff --git a/modules/helmaTools.zip b/modules/helmaTools.zip deleted file mode 100644 index 4eee14a05e1c2fedd04b1593fad1f561d346be71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22640 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 diff --git a/modules/tools/Global/helma.auth.js b/modules/tools/Global/helma.auth.js index c71a06c7..9e2abc50 100644 --- a/modules/tools/Global/helma.auth.js +++ b/modules/tools/Global/helma.auth.js @@ -49,7 +49,7 @@ helma.auth = function(realm) { var accessAllowed = true; if (req.data.username && req.data.password) { if (pw && hostIsAllowed()) { - if (pw == Packages.helma.util.MD5Encoder.encode(req.data.username + "-" + req.data.password)) { + if (pw == Packages.org.apache.commons.codec.digest.DigestUtils.md5Hex(req.data.username + "-" + req.data.password)) { session.data[realm+'Authenticated'] = true; res.redirect(res.data.href); } else { @@ -61,7 +61,7 @@ helma.auth = function(realm) { The adminAccess property is not set.
\ Before proceeding, add the following line to your app.properties or server.properties file:\

adminAccess=' - + Packages.helma.util.MD5Encoder.encode(req.data.username + "-" + req.data.password); + + Packages.org.apache.commons.codec.digest.DigestUtils.md5Hex(req.data.username + "-" + req.data.password); else param.message += 'The '+ realm +'AccessAllowed property does not match your host.
\ Before proceeding, remove this property from your app.properties or server.properties file \ or include your host as follows:

' diff --git a/src/dist/apps/manage/Global/functions.js b/src/dist/apps/manage/Global/functions.js index 7c40b5b7..98b840a0 100644 --- a/src/dist/apps/manage/Global/functions.js +++ b/src/dist/apps/manage/Global/functions.js @@ -46,7 +46,7 @@ function createAddressFilter() { } -/** +/** * updates the stats in app.data.stat every 5 minutes */ function appStat() { @@ -123,7 +123,7 @@ function checkAuth(appObj) { if (uname == null || uname == "" || pwd == null || pwd == "") return forceAuth(); - var md5key = Packages.helma.util.MD5Encoder.encode(uname + "-" + pwd); + var md5key = Packages.org.apache.commons.codec.digest.DigestUtils.md5Hex(uname + "-" + pwd); if (md5key == adminAccess) return true; diff --git a/src/dist/apps/manage/Root/actions.js b/src/dist/apps/manage/Root/actions.js index aac54dc7..4c7c68a8 100644 --- a/src/dist/apps/manage/Root/actions.js +++ b/src/dist/apps/manage/Root/actions.js @@ -75,7 +75,7 @@ function makekey_action() { res.data.body = renderSkinAsString("pwdform", obj); } else { // render the md5-string: - obj.propsString = "adminAccess=" + Packages.helma.util.MD5Encoder.encode(req.data.username + "-" + req.data.password) + "
\n"; + obj.propsString = "adminAccess=" + Packages.org.apache.commons.codec.digest.DigestUtils.md5Hex(req.data.username + "-" + req.data.password) + "
\n"; res.data.body = renderSkinAsString("pwdfeedback", obj); } @@ -127,4 +127,4 @@ function mrtg_action() { } else { res.write("0\n0\n0\n0\n"); } -} \ No newline at end of file +}