Merge pull request #21 from athanclark/v2.0.0-ipv4-fix

properly parsing ipv4 addresses

Author: garyb

bower.json

@@ -17,14 +17,15 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-globals": "^2.0.0",
-    "purescript-integers": "^2.0.0",
-    "purescript-maps": "^2.0.0",
-    "purescript-pathy": "^3.0.0",
-    "purescript-string-parsers": "^2.0.0",
-    "purescript-unfoldable": "^2.0.0"
+    "purescript-globals": "2.x",
+    "purescript-integers": "2.x",
+    "purescript-maps": "2.x",
+    "purescript-pathy": "3.x",
+    "purescript-string-parsers": "2.x",
+    "purescript-unfoldable": "2.x"
   },
   "devDependencies": {
-    "purescript-test-unit": "10.0.1"
+    "purescript-test-unit": "10.x",
+    "purescript-psci-support": "2.x"
   }
 }

src/Data/URI/Host.purs

@@ -7,13 +7,14 @@ import Prelude
 
 import Control.Alt ((<|>))
 
-import Data.String as S
+import Data.Int as Int
+import Data.Maybe (Maybe (Just))
 import Data.URI.Common (parseSubDelims, parsePCTEncoded, parseUnreserved, joinWith, rxPat)
 import Data.URI.Types (Host(..))
 
-import Text.Parsing.StringParser (Parser, try)
+import Text.Parsing.StringParser (Parser, try, fail)
 import Text.Parsing.StringParser.Combinators ((<?>), many1)
-import Text.Parsing.StringParser.String (string)
+import Text.Parsing.StringParser.String (string, char)
 
 parseHost ∷ Parser Host
 parseHost = parseIPv6Address <|> parseIPv4Address <|> parseRegName
@@ -23,12 +24,24 @@ parseIPv6Address ∷ Parser Host
 parseIPv6Address = IPv6Address <$> (string "[" *> rxPat "[a-f0-9\\.:]+" <* string "]") <?> "IPv6 address"
 
 parseIPv4Address ∷ Parser Host
-parseIPv4Address = IPv4Address <$> rxPat pattern <?> "IPv4 address"
+parseIPv4Address = IPv4Address <$> parse <?> "IPv4 address"
   where
-  pattern ∷ String
-  pattern = S.joinWith "" ["(", octet, "\\.", octet, "\\.", octet, "\\.", octet, ")"]
-  octet ∷ String
-  octet = "(1[0-9]{2}|[1-9][0-9]|[0-9]|2[0-4][0-9]|25[0-5])"
+    parse ∷ Parser String
+    parse = do
+      o1 <- octet
+      _ <- char '.'
+      o2 <- octet
+      _ <- char '.'
+      o3 <- octet
+      _ <- char '.'
+      o4 <- octet
+      pure $ show o1 <> "." <> show o2 <> "." <> show o3 <> "." <> show o4
+    octet ∷ Parser Int
+    octet = do
+      s <- rxPat "0|([1-9][0-9]{0,2})"
+      case Int.fromString s of
+        Just n | n >= 0 && n <= 255 -> pure n
+        _ -> fail "Invalid IPv4 address octet"
 
 parseRegName ∷ Parser Host
 parseRegName =