haskell/stackage-server
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage-server.git synced 2026-02-06 16:17:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't force SSL for tarballs (for cabal-install support)

Browse Source
This commit is contained in:
Michael Snoyman 2016-02-03 12:37:48 +00:00
parent 46c3364a19
commit 6a5a29672d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Application.hs
View File

@ -10,7 +10,7 @@ import Control.Exception (catch)
import Data.WebsiteContent import Data.WebsiteContent
import Import hiding (catch) import Import hiding (catch)
import Language.Haskell.TH.Syntax (Loc(..)) import Language.Haskell.TH.Syntax (Loc(..))
import Network.Wai (Middleware, responseLBS) import Network.Wai (Middleware, responseLBS, rawPathInfo)
import Network.Wai.Logger (clockDateCacher) import Network.Wai.Logger (clockDateCacher)
import Network.Wai.Middleware.ForceSSL (forceSSL) import Network.Wai.Middleware.ForceSSL (forceSSL)
import Network.Wai.Middleware.RequestLogger import Network.Wai.Middleware.RequestLogger
@ -89,9 +89,14 @@ makeApplication echo@False conf = do
return (middleware app, logFunc) return (middleware app, logFunc)
forceSSL' :: AppConfig DefaultEnv Extra -> Middleware forceSSL' :: AppConfig DefaultEnv Extra -> Middleware
forceSSL' app forceSSL' ac app
| extraForceSsl $ appExtra app = forceSSL | extraForceSsl $ appExtra ac = \req send ->
| otherwise = id -- Don't force SSL for tarballs, to provide 00-index.tar.gz and package
-- tarball access for cabal-install
if ".tar.gz" `isSuffixOf` rawPathInfo req
then app req send
else forceSSL app req send
| otherwise = app
nicerExceptions :: Middleware nicerExceptions :: Middleware
nicerExceptions app req send = catch (app req send) $ \e -> do nicerExceptions app req send = catch (app req send) $ \e -> do