From 50711391d1ddd8a597aba578609fabaade82e8c4 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sun, 1 Jan 2023 22:19:00 +0800
Subject: [PATCH] Revert "Auth: Case insensitive login check on username"
---
db/patch-user-username-case-insensitive.sql | 47 ---------------------
server/auth.js | 2 +-
server/database.js | 1 -
3 files changed, 1 insertion(+), 49 deletions(-)
delete mode 100644 db/patch-user-username-case-insensitive.sql
diff --git a/db/patch-user-username-case-insensitive.sql b/db/patch-user-username-case-insensitive.sql
deleted file mode 100644
index 90b7f1cb..00000000
--- a/db/patch-user-username-case-insensitive.sql
+++ /dev/null
@@ -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];
diff --git a/server/auth.js b/server/auth.js
index b4eeee41..3ce1a604 100644
--- a/server/auth.js
+++ b/server/auth.js
@@ -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,
]);
diff --git a/server/database.js b/server/database.js
index 7764df3f..2544f197 100644
--- a/server/database.js
+++ b/server/database.js
@@ -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" ] }
};
/**