Revert "attoparsec 0.10"

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

View File

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

View File

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