@galadrim/galadmin 0.1.88 → 0.1.90
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +13 -6
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/front/build/asset-manifest.json +6 -6
- package/src/front/build/index.html +1 -1
- package/src/front/build/static/css/{main.b81f30ce.css → main.af6a35f2.css} +2 -2
- package/src/front/build/static/css/main.af6a35f2.css.map +1 -0
- package/src/front/build/static/js/{main.181122a6.js → main.89e1fdbe.js} +3 -3
- package/src/front/build/static/js/{main.181122a6.js.map → main.89e1fdbe.js.map} +1 -1
- package/src/front/node_modules/.cache/.eslintcache +1 -1
- package/src/front/node_modules/.cache/babel-loader/6e656c8e19d5bfc72071f066db9df465077e006a087080d47fa46bef6dee8d24.json +1 -0
- package/src/front/src/App.css +48 -0
- package/src/front/src/components/Sidebar.js +31 -13
- package/src/index.ts +13 -11
- package/src/front/build/static/css/main.b81f30ce.css.map +0 -1
- package/src/front/node_modules/.cache/babel-loader/c1367cd2e909c66ae9dc54900b2bb34011458d60b4476beed4fc4a8d7ffcd254.json +0 -1
- /package/src/front/build/static/js/{main.181122a6.js.LICENSE.txt → main.89e1fdbe.js.LICENSE.txt} +0 -0
package/dist/index.js
CHANGED
|
@@ -55,10 +55,19 @@ exports.default = (config) => {
|
|
|
55
55
|
saveUninitialized: false,
|
|
56
56
|
name: 'galadmin.sid'
|
|
57
57
|
}));
|
|
58
|
-
|
|
59
|
-
if (
|
|
60
|
-
|
|
58
|
+
const passwordMatch = (password, hash) => {
|
|
59
|
+
if (password === hash || bcrypt.compareSync(password, hash)) {
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
try {
|
|
63
|
+
if (argon.verify(hash, password)) {
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
61
66
|
}
|
|
67
|
+
catch (e) { }
|
|
68
|
+
return false;
|
|
69
|
+
};
|
|
70
|
+
app.post('/api/login', async (req, res) => {
|
|
62
71
|
if (req.body.username === config.auth.username && req.body.password === config.auth.password) {
|
|
63
72
|
req.session.user = { role: "root" };
|
|
64
73
|
res.send({ success: true });
|
|
@@ -66,9 +75,7 @@ exports.default = (config) => {
|
|
|
66
75
|
else if (config.authRoles) {
|
|
67
76
|
for (const authRole of config.authRoles) {
|
|
68
77
|
const { rows } = await db.query("SELECT * FROM ?? WHERE ?? = ?", [authRole.table, authRole.usernameField, req.body.username]);
|
|
69
|
-
const user = rows.find(x =>
|
|
70
|
-
argon.verify(x[authRole.passwordField], req.body.password) ||
|
|
71
|
-
req.body.password === x[authRole.passwordField]);
|
|
78
|
+
const user = rows.find(x => passwordMatch(req.body.password, x[authRole.passwordField]));
|
|
72
79
|
if (!user) {
|
|
73
80
|
continue;
|
|
74
81
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,mCAAmC;AACnC,2CAA2C;AAC3C,sDAAsD;AACtD,oDAAoD;AACpD,yCAAyC;AACzC,yBAAyB;AACzB,iDAA0C;AAC1C,mCAAmC;AACnC,gCAAgC;AAEhC,yBAAyB;AACzB,6BAA6B;AAC7B,6BAA6B;AAE7B,iCAAiC;AAIjC,+BAAuB;AAEvB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAEpB,kBAAe,CAAC,MAAc,EAAO,EAAE;IACnC,MAAM,EAAE,GAAG,IAAI,mBAAS,EAAE,CAAC;IAE3B,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG,EAAE,GAAG,EAAE,IAAI;QAC5B,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,uBAAuB,CAAC,CAAC;QACtE,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,wCAAwC,CAAC,CAAC;QACxF,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,sDAAsD,CAAC,CAAC;QACtG,GAAG,CAAC,SAAS,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;QACjB,KAAK,EAAE,MAAM;KAChB,CAAC,CAAC,CAAC;IAEJ,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC,aAAa;QAC5B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;YACrD,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;gBAC5B,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;gBAC5B,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;gBACpC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;gBACpC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI;gBACpC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG;aAC7B,CAAC;YACF,oBAAoB,EAAE,IAAI;YAC1B,SAAS,EAAE,mBAAmB;SACjC,CAAC,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC;YAClB,MAAM,EAAE,EAAE,SAAS,EAAE,mBAAmB,EAAE;SAC7C,EAAE,MAAM,CAAC,UAAU,CAAC;YACjB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;YACvB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;YACvB,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;YAC/B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;YAC/B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI;SAClC,CAAC,CAAC;QACH,MAAM,EAAE,KAAK;QACb,iBAAiB,EAAE,KAAK;QACxB,IAAI,EAAE,cAAc;KACvB,CAAC,CAAC,CAAC;IAEJ,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|