From 2e8f66883073a1855706556100873c4ec0775c6e Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 24 Jul 2020 15:07:04 +0200 Subject: Ignore the oauth token path in login with the environment variables Signed-off-by: Roeland Jago Douma --- appinfo/app.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appinfo/app.php b/appinfo/app.php index 11aa7e8f..43db79eb 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -80,6 +80,12 @@ switch($config->getAppValue('user_saml', 'type')) { } if ($type === 'environment-variable') { + // We should ignore oauth2 token endpoint (oauth can send the credentials as basic auth which will fail with apache auth) + $uri = $request->getRequestUri(); + if (substr($uri, -24) === '/apps/oauth/api/v1/token') { + return; + } + OC_User::handleApacheAuth(); } -- cgit v1.2.3