mirror of
https://github.com/louislam/uptime-kuma.git
synced 2025-01-31 08:46:16 +00:00
Fix #1318, basic auth is completely disabled if the auth is disabled
This commit is contained in:
parent
775d1696fa
commit
d32ba7cadd
1 changed files with 31 additions and 21 deletions
|
@ -31,31 +31,41 @@ exports.login = async function (username, password) {
|
||||||
};
|
};
|
||||||
|
|
||||||
function myAuthorizer(username, password, callback) {
|
function myAuthorizer(username, password, callback) {
|
||||||
setting("disableAuth").then((result) => {
|
// Login Rate Limit
|
||||||
if (result) {
|
loginRateLimiter.pass(null, 0).then((pass) => {
|
||||||
callback(null, true);
|
if (pass) {
|
||||||
} else {
|
exports.login(username, password).then((user) => {
|
||||||
// Login Rate Limit
|
callback(null, user != null);
|
||||||
loginRateLimiter.pass(null, 0).then((pass) => {
|
|
||||||
if (pass) {
|
|
||||||
exports.login(username, password).then((user) => {
|
|
||||||
callback(null, user != null);
|
|
||||||
|
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
loginRateLimiter.removeTokens(1);
|
loginRateLimiter.removeTokens(1);
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
callback(null, false);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
callback(null, false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.basicAuth = basicAuth({
|
/**
|
||||||
authorizer: myAuthorizer,
|
* If disabled auth, it does not call `next`.
|
||||||
authorizeAsync: true,
|
*/
|
||||||
challenge: true,
|
exports.checkBasicAuth = async (req, res, next) => {
|
||||||
});
|
|
||||||
|
};
|
||||||
|
|
||||||
|
exports.basicAuth = async function (req, res, next) {
|
||||||
|
const middleware = basicAuth({
|
||||||
|
authorizer: myAuthorizer,
|
||||||
|
authorizeAsync: true,
|
||||||
|
challenge: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
const disabledAuth = await setting("disableAuth");
|
||||||
|
|
||||||
|
if (!disabledAuth) {
|
||||||
|
middleware(req, res, next);
|
||||||
|
} else {
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue