GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

GFServer.hs: apply UTF8 decoding to all server input

Browse Source
This commit is contained in:
hallgren
2012-05-16 14:03:09 +00:00
parent 5ac7bfc326
commit 114788a3db
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/GFServer.hs
View File

@@ -94,8 +94,8 @@ handle_fcgi execute1 state0 stateM cache =
handle state0 cache execute1 handle state0 cache execute1
rq@(Request method URI{uriPath=upath,uriQuery=q} hdrs body) state = rq@(Request method URI{uriPath=upath,uriQuery=q} hdrs body) state =
case method of case method of
"POST" -> normal_request (inputs body) "POST" -> normal_request (utf8inputs body)
"GET" -> normal_request (inputs q) "GET" -> normal_request (utf8inputs q)
_ -> return (state,resp501 $ "method "++method) _ -> return (state,resp501 $ "method "++method)
where where
normal_request qs = normal_request qs =
@@ -159,7 +159,7 @@ handle state0 cache execute1
return (state',ok200 output) return (state',ok200 output)
parse qs = parse qs =
return (state,json200 (makeObj(map(parseModule.apBoth decodeString) qs))) return (state,json200 (makeObj(map parseModule qs)))
cloud dir cmd qs = cloud dir cmd qs =
case cmd of case cmd of
@@ -394,6 +394,7 @@ toHeader s = FCGI.HttpExtensionHeader s -- cheating a bit
-- * misc utils -- * misc utils
utf8inputs = mapBoth decodeString . inputs
inputs = queryToArguments . fixplus inputs = queryToArguments . fixplus
where where
@@ -402,6 +403,7 @@ inputs = queryToArguments . fixplus
decode c = [c] decode c = [c]
mapFst f xys = [(f x,y)|(x,y)<-xys] mapFst f xys = [(f x,y)|(x,y)<-xys]
mapBoth = map . apBoth
apBoth f (x,y) = (f x,f y) apBoth f (x,y) = (f x,f y)
prop n v = (n,showJSON v) prop n v = (n,showJSON v)