haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clientsession changes

Browse Source
This commit is contained in:
Michael Snoyman 2010-05-21 09:41:33 +03:00
parent 7762559c86
commit ae43848001
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Yesod/Dispatch.hs
View File

@ -191,7 +191,8 @@ toWaiApp' y segments env = do
let eh er = runHandler (errorHandler y er) render eurl' id y id let eh er = runHandler (errorHandler y er) render eurl' id y id
(s, hs, ct, c, sessionFinal) <- unYesodApp ya eh rr types (s, hs, ct, c, sessionFinal) <- unYesodApp ya eh rr types
let sessionVal = encodeSession key' exp' host sessionFinal let sessionVal = encodeSession key' exp' host sessionFinal
let hs' = AddCookie (clientSessionDuration y) sessionName sessionVal let hs' = AddCookie (clientSessionDuration y) sessionName
(cs sessionVal)
: hs : hs
hs'' = map (headerToPair getExpires) hs' hs'' = map (headerToPair getExpires) hs'
hs''' = (W.ContentType, cs $ contentTypeToString ct) : hs'' hs''' = (W.ContentType, cs $ contentTypeToString ct) : hs''
@ -296,9 +297,9 @@ encodeSession :: Key
-> UTCTime -- ^ expire time -> UTCTime -- ^ expire time
-> B.ByteString -- ^ remote host -> B.ByteString -- ^ remote host
-> [(String, String)] -- ^ session -> [(String, String)] -- ^ session
-> String -- ^ cookie value -> B.ByteString -- ^ cookie value
encodeSession key expire rhost session' = encodeSession key expire rhost session' =
encrypt key $ cs $ encode $ SessionCookie expire rhost session' encrypt key $ encode $ SessionCookie expire rhost session'
decodeSession :: Key decodeSession :: Key
-> UTCTime -- ^ current time -> UTCTime -- ^ current time
@ -306,10 +307,9 @@ decodeSession :: Key
-> B.ByteString -- ^ cookie value -> B.ByteString -- ^ cookie value
-> Maybe [(String, String)] -> Maybe [(String, String)]
decodeSession key now rhost encrypted = do decodeSession key now rhost encrypted = do
decrypted <- decrypt key $ B.unpack encrypted decrypted <- decrypt key encrypted
SessionCookie expire rhost' session' <- SessionCookie expire rhost' session' <-
either (const Nothing) Just $ decode either (const Nothing) Just $ decode decrypted
$ cs decrypted
guard $ expire > now guard $ expire > now
guard $ rhost' == rhost guard $ rhost' == rhost
return session' return session'