Talk federation authentication

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Oct 9, 2023 · ef1298a · ef1298a
1 parent cad745b
commit ef1298a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/base.php b/lib/base.php
@@ -1054,7 +1054,8 @@ public static function handleRequest(): void {
 				// Don't try to login when a client is trying to get a OAuth token.
 				// OAuth needs to support basic auth too, so the login is not valid
 				// inside Nextcloud and the Login exception would ruin it.
-				if ($request->getRawPathInfo() !== '/apps/oauth2/api/v1/token') {
+				if ($request->getRawPathInfo() !== '/apps/oauth2/api/v1/token'
+					&& !$request->getHeader('X-Nextcloud-Federation')) {
 					self::handleLogin($request);
 				}
 			}

diff --git a/ocs/v1.php b/ocs/v1.php
@@ -57,7 +57,7 @@
 	// side effects in existing apps
 	OC_App::loadApps();
 
-	if (!\OC::$server->getUserSession()->isLoggedIn()) {
+	if (!\OC::$server->getUserSession()->isLoggedIn() && !\OC::$server->getRequest()->getHeader('X-Nextcloud-Federation')) {
 		OC::handleLogin(\OC::$server->getRequest());
 	}