aelve/guide
1
1
Fork 0
mirror of https://github.com/aelve/guide.git synced 2024-12-23 21:02:13 +03:00
Code Issues Projects Releases Wiki Activity

Only add http:// in sanitiseUri if it didn't have *any* scheme

Browse Source
This commit is contained in:
Artyom 2017-04-26 21:33:03 +03:00
parent e0ebf3da64
commit 2dae6df953
No known key found for this signature in database
GPG Key ID: B8E35A33FF522710
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guide.cabal
View File

@ -111,6 +111,7 @@ library
, mtl >= 2.1.1 , mtl >= 2.1.1
, neat-interpolation == 0.3.* , neat-interpolation == 0.3.*
, network , network
, network-uri
, patches-vector , patches-vector
, path-pieces , path-pieces
, random >= 1.1 , random >= 1.1
@ -128,6 +129,7 @@ library
, transformers , transformers
, uniplate , uniplate
, unix , unix
, utf8-string
, vector , vector
, wai , wai
, wai-middleware-metrics , wai-middleware-metrics

18
src/Guide/Utils.hs
View File

@ -110,6 +110,9 @@ import qualified Language.Haskell.TH.Syntax as TH (lift)
import Language.Haskell.TH.Quote (QuasiQuoter(..)) import Language.Haskell.TH.Quote (QuasiQuoter(..))
import Language.Haskell.Meta (parseExp) import Language.Haskell.Meta (parseExp)
import Data.Generics.Uniplate.Data (transform) import Data.Generics.Uniplate.Data (transform)
-- needed for 'sanitiseUrl'
import qualified Codec.Binary.UTF8.String as UTF8
import qualified Network.URI as URI
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
@ -173,10 +176,17 @@ type Url = Text
-- if it doesn't have a scheme. -- if it doesn't have a scheme.
sanitiseUrl :: Url -> Maybe Url sanitiseUrl :: Url -> Maybe Url
sanitiseUrl u sanitiseUrl u
| not (sanitaryURI u) = Nothing | not (sanitaryURI u) = Nothing
| "http:" `T.isPrefixOf` u = Just u | otherwise =
| "https:" `T.isPrefixOf` u = Just u Just $ case URI.uriScheme <$> parse (T.toString u) of
| otherwise = Just ("http://" <> u) Nothing -> "http://" <> u
Just "" -> "http://" <> u
_ -> u
where
-- code taken from implementation of 'sanitaryURI'
parse = URI.parseURIReference . escape
escape = URI.escapeURIString URI.isAllowedInURI .
UTF8.encodeString
-- | Make text suitable for inclusion into an URL (by turning spaces into -- | Make text suitable for inclusion into an URL (by turning spaces into
-- hyphens and so on). -- hyphens and so on).