swrup/geochan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix db error on bad user name login

Browse source
This commit is contained in:
Swrup 2022-02-22 00:15:30 +01:00
parent c91623050e
commit 54e5511ca1
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/user.ml
View file

@ -40,7 +40,7 @@ module Q = struct
"SELECT nick FROM user;" "SELECT nick FROM user;"
let get_user = let get_user =
Caqti_request.find_opt Caqti_type.string Caqti_request.find Caqti_type.string
Caqti_type.(tup4 string string string Caqti_type.(tup2 string string)) Caqti_type.(tup4 string string string Caqti_type.(tup2 string string))
"SELECT * FROM user WHERE nick=?;" "SELECT * FROM user WHERE nick=?;"
@ -70,15 +70,19 @@ let () =
(List.map (fun query -> Db.exec query ()) tables) (List.map (fun query -> Db.exec query ()) tables)
then Dream.error (fun log -> log "can't create table") then Dream.error (fun log -> log "can't create table")
let exists nick = Result.is_ok (Db.find Q.get_user nick)
let login ~nick ~password request = let login ~nick ~password request =
let^? good_password = Db.find_opt Q.get_password nick in if exists nick then
if Bcrypt.verify password (Bcrypt.hash_of_string good_password) then let^? good_password = Db.find_opt Q.get_password nick in
let _ = if Bcrypt.verify password (Bcrypt.hash_of_string good_password) then
let%lwt () = Dream.invalidate_session request in let _ =
Dream.put_session "nick" nick request let%lwt () = Dream.invalidate_session request in
in Dream.put_session "nick" nick request
Ok () in
else Error "wrong password" Ok ()
else Error "wrong password"
else Error "wrong user name"
let register ~email ~nick ~password = let register ~email ~nick ~password =
(* TODO: remove bad characters (e.g. delthas) *) (* TODO: remove bad characters (e.g. delthas) *)
@ -168,5 +172,3 @@ let upload_avatar files nick =
let^ () = Db.exec Q.upload_avatar (content, nick) in let^ () = Db.exec Q.upload_avatar (content, nick) in
Ok () Ok ()
| _files -> Error "More than one file provided" | _files -> Error "More than one file provided"
let exists nick = Result.is_ok (Db.find_opt Q.get_user nick)