escape characters in URLs

This commit is contained in:
Jonathan Lamothe 2021-10-22 16:51:04 -04:00
parent 8590219126
commit 3484fda01e
2 changed files with 23 additions and 15 deletions

View File

@ -42,10 +42,10 @@ encodeRequest req =
authority = reqHost req ++ case reqPort req of
Just port -> ':' : show port
Nothing -> ""
path = intercalate "/" $ reqPath req
path = intercalate "/" $ map escapeString $ reqPath req
query = case reqQuery req of
"" -> ""
q -> '?' : q
q -> '?' : escapeString q
-- | add required escape sequences to a string
escapeString :: String -> String

View File

@ -44,6 +44,7 @@ encodeRequestSpec = describe "encodeRequest" $ mapM_
, ( "with port", withPortReq, withPortExp )
, ( "with path", withPathReq, withPathExp )
, ( "with query", withQueryReq, withQueryExp )
, ( "with escape", withEscapeReq, withEscapeExp )
]
where
@ -56,6 +57,13 @@ encodeRequestSpec = describe "encodeRequest" $ mapM_
withQueryReq = simpleReq { reqQuery = "foo" }
withQueryExp = "gemini://example.com/?foo"
withEscapeReq = simpleReq
{ reqPath = ["foo bar"]
, reqQuery = "baz quux"
}
withEscapeExp = "gemini://example.com/foo%20bar?baz%20quux"
escapeStringSpec :: Spec
escapeStringSpec = describe "escapeString" $ mapM_
( \(input, expected) -> context (show input) $