Skip to content

Commit

Permalink
middleware: rename get_csrf to generate_csrf_cookie
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesm committed Oct 28, 2024
1 parent 917989e commit d128a32
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions middleware.ml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ let header header_name reqd =

let user_agent reqd = header "User-Agent" reqd

let get_csrf now reqd =
User_model.(
generate_cookie ~name:"molly_csrf" ~user_agent:(user_agent reqd)
~uuid:(Uuidm.to_string (generate_uuid ()))
~created_at:now ~expires_in:3600)
let generate_csrf_cookie now reqd =
User_model.generate_cookie ~name:"molly_csrf" ~user_agent:(user_agent reqd)
~uuid:(Uuidm.to_string (User_model.generate_uuid ()))
~created_at:now ~expires_in:3600 ()

let has_cookie cookie_name (reqd : Httpaf.Reqd.t) =
match header "Cookie" reqd with
Expand Down
4 changes: 2 additions & 2 deletions unikernel.ml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct
module Map = Map.Make (String)

let generate_csrf_token store user now reqd =
let csrf = Middleware.get_csrf now reqd () in
let csrf = Middleware.generate_csrf_cookie now reqd in
let updated_user =
User_model.update_user user ~updated_at:now
~cookies:(csrf :: user.cookies) ()
Expand Down Expand Up @@ -200,7 +200,7 @@ struct

let sign_up reqd =
let now = Ptime.v (P.now_d_ps ()) in
let csrf = Middleware.get_csrf now reqd () in
let csrf = Middleware.generate_csrf_cookie now reqd in
let csrf_cookie = csrf.name ^ "=" ^ csrf.value ^ ";Path=/;HttpOnly=true" in
match Middleware.session_cookie_value reqd with
| Ok (Some _x) -> Middleware.redirect_to_dashboard reqd ()
Expand Down

0 comments on commit d128a32

Please sign in to comment.