Support for instance-scope keys when verifying HTTP signature

src/Data/Aeson/Local.hs

@@ -18,6 +18,7 @@ module Data.Aeson.Local
     , toEither
     , fromEither
     , frg
+    , parseHttpsURI'
     , parseHttpsURI
     , renderURI
     , (.=?)
@@ -29,7 +30,6 @@ import Prelude
 import Control.Applicative ((<|>))
 import Data.Aeson
 import Data.Aeson.Types (Parser)
-import Data.Maybe (isJust)
 import Data.Text (Text)
 import Network.URI
 
@@ -56,16 +56,22 @@ fromEither (Right y) = Right' y
 frg :: Text
 frg = "https://forgefed.angeley.es/ns#"
 
-parseHttpsURI :: Text -> Parser URI
-parseHttpsURI t =
+parseHttpsURI' :: Text -> Either String URI
+parseHttpsURI' t =
     case parseURI $ T.unpack t of
-        Nothing -> fail "Invalid absolute URI"
+        Nothing -> Left "Invalid absolute URI"
         Just u ->
             if uriScheme u == "https:"
-                then if isJust $ uriAuthority u
-                        then return u
-                        else fail "URI has empty authority"
-                else fail "URI scheme isn't https"
+                then case uriAuthority u of
+                        Just a ->
+                            if uriUserInfo a == "" && uriPort a == ""
+                                then Right u
+                                else Left "URI has userinfo or port"
+                        Nothing -> Left "URI has empty authority"
+                else Left "URI scheme isn't https"
+
+parseHttpsURI :: Text -> Parser URI
+parseHttpsURI = either fail return . parseHttpsURI'
 
 renderURI :: URI -> String
 renderURI u = uriToString id u ""