haskell/xss-sanitize
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "attoparsec 0.10"

Browse Source 
This reverts commit 9c901f5785.
This commit is contained in:
Greg Weber 2011-11-29 07:14:18 -06:00
parent 5ec6b639df
commit 0d1b6f5677
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Text/HTML/SanitizeXSS/Css.hs
View File

@ -12,7 +12,7 @@ import Data.Attoparsec.Text
import Data.Text.Lazy.Builder (toLazyText)
import Data.Text.Lazy (toStrict)
import Data.Set (member, fromList, Set)
import Data.Char (isDigit, isSpace)
import Data.Char (isDigit)
import Control.Applicative ((<|>), pure)
import Text.CSS.Render (renderAttrs)
import Text.CSS.Parse (parseAttrs)
@ -38,7 +38,7 @@ sanitizeCSS css = toStrict . toLazyText .
rejectUrl = do
pre <- manyTill anyChar (string "url")
skipWhile isSpace
skipMany space
_<-char '('
skipWhile (/= ')')
_<-char ')'
@ -82,11 +82,11 @@ allowedCssAttributeValue val =
-- should have used sepBy (symbol ",")
rgb = do
_<- string "rgb("
skipWhile1 isDigit >> skipOk (== '%')
skipMany1 digit >> skipOk (== '%')
skip (== ',')
skipWhile1 isDigit >> skipOk (== '%')
skipMany digit >> skipOk (== '%')
skip (== ',')
skipWhile1 isDigit >> skipOk (== '%')
skipMany digit >> skipOk (== '%')
skip (== ')')
return True
@ -95,7 +95,7 @@ allowedCssAttributeValue val =
skipOk isDigit
skipOk (== '.')
skipOk isDigit >> skipOk isDigit
skipWhile isSpace
skipSpace
unit <- takeText
return $ T.null unit || unit `member` allowed_css_attribute_value_units
@ -138,6 +138,3 @@ allowed_svg_properties = fromList acceptable_svg_properties
acceptable_svg_properties = [ "fill", "fill-opacity", "fill-rule",
"stroke", "stroke-width", "stroke-linecap", "stroke-linejoin",
"stroke-opacity"]
skipWhile1 :: (Char -> Bool) -> Parser ()
skipWhile1 f = skip f >> skipWhile f

2
xss-sanitize.cabal
View File

@ -20,7 +20,7 @@ library
, network >= 2
, css-text >= 0.1 && < 0.2
, text >= 0.11 && < 0.12
, attoparsec >= 0.10 && < 0.11
, attoparsec-text >= 0.8.5.1 && < 0.9
exposed-modules: Text.HTML.SanitizeXSS