Skip to content

Fix unqualified Data.Text import. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yitz-zoomin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix unqualified Data.Text import. #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Yesod/Csp.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module Yesod.Csp (
import qualified Data.CaseInsensitive as CI
import Data.Data (Data)
import Data.List.NonEmpty
import Data.Text
import Data.Text (Text)
import qualified Data.Text as T
import qualified Data.Text.Encoding as TE
import Data.Typeable (Typeable)
Expand Down Expand Up @@ -82,18 +82,18 @@ notEscapable = not . flip elem toEscape

-- | Escapes ';' '\'' and ' ', and parses to URI
escapeAndParseURI :: Text -> Maybe EscapedURI
escapeAndParseURI = fmap EscapedURI . parseURI . escapeURIString notEscapable . unpack
escapeAndParseURI = fmap EscapedURI . parseURI . escapeURIString notEscapable . T.unpack

-- | Escapes Text to be a valid nonce value
escapedTextForNonce :: String -> EscapedText
escapedTextForNonce = EscapedText . Prelude.filter notEscapable

-- | Escapes a Text value, returning a valid Nonce
nonce :: Text -> Source
nonce = Nonce . escapedTextForNonce . unpack
nonce = Nonce . escapedTextForNonce . T.unpack

directiveListToHeader :: DirectiveList -> Text
directiveListToHeader = intercalate "; " . fmap textDirective
directiveListToHeader = T.intercalate "; " . fmap textDirective

w :: Text -> SourceList -> Text
w = wrap
Expand Down Expand Up @@ -132,13 +132,13 @@ textSource Wildcard = "*"
textSource None = "'none'"
textSource Self = "'self'"
textSource DataScheme = "data:"
textSource (Host x) = (pack . show) x
textSource (Host x) = (T.pack . show) x
textSource Https = "https:"
textSource UnsafeInline = "'unsafe-inline'"
textSource UnsafeEval = "'unsafe-eval'"
textSource StrictDynamic = "'strict-dynamic'"
textSource (MetaSource _) = ""
textSource (Nonce x) = (pack . show) x
textSource (Nonce x) = (T.pack . show) x

-- | A list of restrictions to apply.
type DirectiveList = [Directive]
Expand Down Expand Up @@ -176,7 +176,7 @@ textDirective (ObjectSrc x) = w "object-src" x
textDirective (MediaSrc x) = w "media-src" x
textDirective (FrameSrc x) = w "frame-src" x
textDirective (FrameAncestors x) = w "frame-ancestors" x
textDirective (ReportUri t) = mconcat ["report-uri ", (pack . show) t]
textDirective (ReportUri t) = mconcat ["report-uri ", (T.pack . show) t]
textDirective (Sandbox []) = "sandbox"
textDirective (Sandbox s) = mconcat ["sandbox ", T.unwords . fmap textSandbox $ s]
where textSandbox AllowForms = "allow-forms"
Expand Down