wai-middleware-auth 0.2.5.1 → 0.2.6.0

raw patch · 5 files changed

+17/−6 lines, 5 files

Files

CHANGELOG.md +4/−0
README.md +1/−0
src/Network/Wai/Auth/Config.hs +3/−2
src/Network/Wai/Auth/Executable.hs +8/−3
wai-middleware-auth.cabal +1/−1

CHANGELOG.md view

@@ -1,3 +1,7 @@+# 0.2.6.0++- Add support for https in reverse_proxy+ # 0.2.5.1  - Add support for GHC 9.0.

README.md view

@@ -83,6 +83,7 @@ reverse_proxy:   host: myapp.example.com   port: 80+  secure: false ```  ### Self-hosted GitLab

src/Network/Wai/Auth/Config.hs view

@@ -42,8 +42,9 @@  -- | Configuration for reverse proxy application. data ReverseProxy = ReverseProxy-    { rpHost :: T.Text -- ^ Hostname of the webserver-    , rpPort :: Int -- ^ Port of the webserver+    { rpHost   :: T.Text -- ^ Hostname of the destination webserver+    , rpPort   :: Int -- ^ Port of the destination webserver+    , rpSecure :: Maybe Bool -- ^ Should the request be sent to destination webbserver using https or not (default: false)     }  -- | Available services.

src/Network/Wai/Auth/Executable.hs view

@@ -14,7 +14,7 @@ import           Data.Yaml.Config                     (loadYamlSettings, useEnv) import           Network.HTTP.Client.TLS              (getGlobalManager) import           Network.HTTP.ReverseProxy            (ProxyDest (..),-                                                       WaiProxyResponse (WPRProxyDest),+                                                       WaiProxyResponse (WPRProxyDest, WPRProxyDestSecure),                                                        defaultOnExc, waiProxyTo) import           Network.Wai                          (Application) import           Network.Wai.Application.Static       (defaultFileServerSettings,@@ -41,13 +41,18 @@       { ssRedirectToIndex = fsRedirectToIndex       , ssAddTrailingSlash = fsAddTrailingSlash       }-serviceToApp (ServiceProxy (ReverseProxy host port)) = do+serviceToApp (ServiceProxy (ReverseProxy host port secure)) = do   manager <- getGlobalManager   return $     waiProxyTo-      (const $ return $ WPRProxyDest $ ProxyDest (encodeUtf8 host) port)+      (const $ return $ proxydest $ ProxyDest (encodeUtf8 host) port)       defaultOnExc       manager+  where+    proxydest =+      case secure of+        Just True -> WPRProxyDestSecure+        _         -> WPRProxyDest   -- | Read configuration from a yaml file with ability to use environment

wai-middleware-auth.cabal view

@@ -1,6 +1,6 @@ cabal-version:       1.18 name:                wai-middleware-auth-version:             0.2.5.1+version:             0.2.6.0 synopsis:            Authentication middleware that secures WAI application description:         Please see the README and Haddocks at <https://www.stackage.org/package/wai-middleware-auth> license:             MIT