ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-27 16:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2513 from louislam/revert-2433-mathias/Auth-case-insensitive-login

Browse source 
Revert "Auth: Case insensitive login check on username"
This commit is contained in:
Louis Lam 2023-01-01 22:19:27 +08:00 committed by GitHub
commit 28c3291020
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
db/patch-user-username-case-insensitive.sql
View file

@ -1,47 +0,0 @@
CREATE TABLE [temp_user](
[id] INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
[username] VARCHAR(255) NOT NULL UNIQUE COLLATE NOCASE,
[password] VARCHAR(255),
[active] BOOLEAN NOT NULL DEFAULT 1,
[timezone] VARCHAR(150),
twofa_secret VARCHAR(64),
twofa_status BOOLEAN default 0 NOT NULL,
twofa_last_token VARCHAR(6)
);
INSERT INTO [temp_user] SELECT
[id],
[username],
[password],
[active],
[timezone],
twofa_secret,
twofa_status,
twofa_last_token
FROM user;
DROP TABLE user;
CREATE TABLE [user](
[id] INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
[username] VARCHAR(255) NOT NULL UNIQUE COLLATE NOCASE,
[password] VARCHAR(255),
[active] BOOLEAN NOT NULL DEFAULT 1,
[timezone] VARCHAR(150),
twofa_secret VARCHAR(64),
twofa_status BOOLEAN default 0 NOT NULL,
twofa_last_token VARCHAR(6)
);
INSERT INTO [user] SELECT
[id],
[username],
[password],
[active],
[timezone],
twofa_secret,
twofa_status,
twofa_last_token
FROM [temp_user];
DROP TABLE [temp_user];

2
server/auth.js
View file

@ -15,7 +15,7 @@ exports.login = async function (username, password) {
return null;
}
let user = await R.findOne("user", " username = ? AND active = 1", [
let user = await R.findOne("user", " username = ? AND active = 1 ", [
username,
]);

1
server/database.js
View file

@ -66,7 +66,6 @@ class Database {
"patch-add-radius-monitor.sql": true,
"patch-monitor-add-resend-interval.sql": true,
"patch-maintenance-table2.sql": true,
"patch-user-username-case-insensitive.sql": { parents: [ "patch-2fa-invalidate-used-token.sql", "patch-2fa.sql" ] }
};
/**