refactor: move logStdout/corsPolicy to Middleware

* remove configQuiet from Config

configQuiet was not an end user setting.
The logging setup is now an internal parameter.

* move proxy uri validation to Private dir

src/PostgREST/OpenAPI.hs

@@ -6,8 +6,8 @@ Description : Generates the OpenAPI output
 
 module PostgREST.OpenAPI (
   encodeOpenAPI
-, isMalformedProxyUri
 , pickProxy
+, isMalformedProxyUri
 ) where
 
 import qualified Data.HashSet.InsOrd as Set
@@ -20,20 +20,21 @@ import Data.String                (IsString (..))
 import Data.Text                  (append, breakOn, dropWhile, init,
                                    intercalate, pack, tail, toLower,
                                    unpack)
-import Network.URI                (URI (..), URIAuth (..),
-                                   isAbsoluteURI, parseURI)
+import Network.URI                (URI (..), URIAuth (..))
 
 import Control.Lens
 import Data.Swagger
 
-import PostgREST.ApiRequest (ContentType (..))
-import PostgREST.Config     (docsVersion, prettyVersion)
-import PostgREST.Types      (Column (..), ForeignKey (..), PgArg (..),
-                             PrimaryKey (..), ProcDescription (..),
-                             Proxy (..), Table (..), toMime)
-import Protolude            hiding (Proxy, dropWhile, get,
-                             intercalate, toLower, toS, (&))
-import Protolude.Conv       (toS)
+import PostgREST.ApiRequest       (ContentType (..))
+import PostgREST.Config           (docsVersion, prettyVersion)
+import PostgREST.Private.ProxyUri (isMalformedProxyUri, toURI)
+import PostgREST.Types            (Column (..), ForeignKey (..),
+                                   PgArg (..), PrimaryKey (..),
+                                   ProcDescription (..), Proxy (..),
+                                   Table (..), toMime)
+import Protolude                  hiding (Proxy, dropWhile, get,
+                                   intercalate, toLower, toS, (&))
+import Protolude.Conv             (toS)
 
 makeMimeList :: [ContentType] -> MimeList
 makeMimeList cs = MimeList $ map (fromString . toS . toMime) cs
@@ -306,24 +307,6 @@ postgrestSpec pds ti (s, h, p, b) sd pks = (mempty :: Swagger)
 encodeOpenAPI :: [ProcDescription] -> [(Table, [Column], [Text])] -> (Text, Text, Integer, Text) -> Maybe Text -> [PrimaryKey] ->  LByteString
 encodeOpenAPI pds ti uri sd pks = encode $ postgrestSpec pds ti uri sd pks
 
-{-|
-  Test whether a proxy uri is malformed or not.
-  A valid proxy uri should be an absolute uri without query and user info,
-  only http(s) schemes are valid, port number range is 1-65535.
-
-  For example
-  http://postgrest.com/openapi.json
-  https://postgrest.com:8080/openapi.json
--}
-isMalformedProxyUri :: Maybe Text -> Bool
-isMalformedProxyUri Nothing =  False
-isMalformedProxyUri (Just uri)
-  | isAbsoluteURI (toS uri) = not $ isUriValid $ toURI uri
-  | otherwise = True
-
-toURI :: Text -> URI
-toURI uri = fromJust $ parseURI (toS uri)
-
 pickProxy :: Maybe Text -> Maybe Proxy
 pickProxy proxy
   | isNothing proxy = Nothing
@@ -352,40 +335,3 @@ pickProxy proxy
              ("", "http")  -> 80
              ("", "https") -> 443
              _             -> readPort $ unpack $ tail $ pack port'
-
-isUriValid:: URI -> Bool
-isUriValid = fAnd [isSchemeValid, isQueryValid, isAuthorityValid]
-
-fAnd :: [a -> Bool] -> a -> Bool
-fAnd fs x = all ($ x) fs
-
-isSchemeValid :: URI -> Bool
-isSchemeValid URI {uriScheme = s}
-  | toLower (pack s) == "https:" = True
-  | toLower (pack s) == "http:" = True
-  | otherwise = False
-
-isQueryValid :: URI -> Bool
-isQueryValid URI {uriQuery = ""} = True
-isQueryValid _                   = False
-
-isAuthorityValid :: URI -> Bool
-isAuthorityValid URI {uriAuthority = a}
-  | isJust a = fAnd [isUserInfoValid, isHostValid, isPortValid] $ fromJust a
-  | otherwise = False
-
-isUserInfoValid :: URIAuth -> Bool
-isUserInfoValid URIAuth {uriUserInfo = ""} = True
-isUserInfoValid _                          = False
-
-isHostValid :: URIAuth -> Bool
-isHostValid URIAuth {uriRegName = ""} = False
-isHostValid _                         = True
-
-isPortValid :: URIAuth -> Bool
-isPortValid URIAuth {uriPort = ""} = True
-isPortValid URIAuth {uriPort = (':':p)} =
-  case readMaybe p of
-    Just i  -> i > (0 :: Integer) && i < 65536
-    Nothing -> False
-isPortValid _ = False