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

Clean up nonce generation.

Browse Source
This commit is contained in:
Björn Buckwalter 2011-09-12 00:16:01 +08:00
parent 0c55024500
commit 864abd6ed1
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yesod-core/Yesod/Internal/Request.hs
View File

@ -6,11 +6,12 @@ module Yesod.Internal.Request
, FileInfo (..) , FileInfo (..)
) where ) where
import Control.Arrow (first, second) import Control.Applicative ((<$>))
import Control.Arrow (second)
import qualified Network.Wai.Parse as NWP import qualified Network.Wai.Parse as NWP
import Yesod.Internal import Yesod.Internal
import qualified Network.Wai as W import qualified Network.Wai as W
import System.Random (randomR, newStdGen) import System.Random (randomRs, newStdGen)
import Web.Cookie (parseCookiesText) import Web.Cookie (parseCookiesText)
import Data.Monoid (mempty) import Data.Monoid (mempty)
import qualified Data.ByteString.Char8 as S8 import qualified Data.ByteString.Char8 as S8
@ -54,19 +55,11 @@ parseWaiRequest env session' key' = do
nonce <- case (key', lookup nonceKey session') of nonce <- case (key', lookup nonceKey session') of
(Nothing, _) -> return Nothing (Nothing, _) -> return Nothing
(_, Just x) -> return $ Just x (_, Just x) -> return $ Just x
(_, Nothing) -> do _ -> Just . pack . randomString 10 <$> newStdGen
g <- newStdGen
return $ Just $ pack $ fst $ randomString 10 g
let gets'' = map (second $ fromMaybe "") gets' let gets'' = map (second $ fromMaybe "") gets'
return $ Request gets'' cookies' env langs''' nonce return $ Request gets'' cookies' env langs''' nonce
where where
randomString len = randomString len = map toChar . take len . randomRs (0, 61)
first (map toChar) . sequence' (replicate len (randomR (0, 61)))
sequence' [] g = ([], g)
sequence' (f:fs) g =
let (f', g') = f g
(fs', g'') = sequence' fs g'
in (f' : fs', g'')
toChar i toChar i
| i < 26 = toEnum $ i + fromEnum 'A' | i < 26 = toEnum $ i + fromEnum 'A'
| i < 52 = toEnum $ i + fromEnum 'a' - 26 | i < 52 = toEnum $ i + fromEnum 'a' - 26