Merge pull request 'case-insensitive-auth' (#549) from case-insensitive-auth into staging
Reviewed-on: #549
This commit is contained in:
commit
3d340bf803
@ -491,7 +491,7 @@ WHERE id like ?
|
|||||||
"
|
"
|
||||||
SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
|
SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
|
||||||
FROM user
|
FROM user
|
||||||
WHERE name=?
|
WHERE lower(name)=?
|
||||||
",
|
",
|
||||||
name
|
name
|
||||||
)
|
)
|
||||||
@ -705,8 +705,8 @@ ORDER BY last_access DESC
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn login(db: &SqlitePool, name: &str, pw: &str) -> Result<Self, LoginError> {
|
pub async fn login(db: &SqlitePool, name: &str, pw: &str) -> Result<Self, LoginError> {
|
||||||
let name = name.trim(); // just to make sure...
|
let name = name.trim().to_lowercase(); // just to make sure...
|
||||||
let Some(user) = User::find_by_name(db, name).await else {
|
let Some(user) = User::find_by_name(db, &name).await else {
|
||||||
if ![
|
if ![
|
||||||
"n-sageder",
|
"n-sageder",
|
||||||
"p-hofer",
|
"p-hofer",
|
||||||
@ -737,7 +737,7 @@ ORDER BY last_access DESC
|
|||||||
"d.kortschak",
|
"d.kortschak",
|
||||||
"[login]",
|
"[login]",
|
||||||
]
|
]
|
||||||
.contains(&name)
|
.contains(&name.as_str())
|
||||||
{
|
{
|
||||||
Log::create(db, format!("Username ({name}) not found (tried to login)")).await;
|
Log::create(db, format!("Username ({name}) not found (tried to login)")).await;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user