Skip to content

Commit 2b8e5f6

Browse files
authored
fix authentication check bug with new split hosts
1 parent cf59027 commit 2b8e5f6

File tree

1 file changed

+4
-6
lines changed
  • src/Distribution/Server/Framework

1 file changed

+4
-6
lines changed

src/Distribution/Server/Framework/Auth.hs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,17 @@ checkAuthenticated realm users ServerEnv { serverRequiredBaseHostHeader } = do
113113
{ actualHost=Just hostHeaderValue
114114
, oughtToBeHost=serverRequiredBaseHostHeader
115115
}
116-
else pure $ Left BadHost
117-
{ actualHost=Nothing
118-
, oughtToBeHost=serverRequiredBaseHostHeader
119-
}
120-
Nothing -> do
116+
else goCheck
117+
Nothing -> goCheck
118+
where
119+
goCheck = do
121120
req <- askRq
122121
return $ case getHeaderAuth req of
123122
Just (DigestAuth, ahdr) -> checkDigestAuth users ahdr req
124123
Just _ | plainHttp req -> Left InsecureAuthError
125124
Just (BasicAuth, ahdr) -> checkBasicAuth users realm ahdr
126125
Just (AuthToken, ahdr) -> checkTokenAuth users ahdr
127126
Nothing -> Left NoAuthError
128-
where
129127
getHeaderAuth :: Request -> Maybe (AuthType, BS.ByteString)
130128
getHeaderAuth req =
131129
case getHeader "authorization" req of

0 commit comments

Comments
 (0)