Merge pull request #55620 from nextcloud/fix/appframework/check-reponder-existence

Author: provokateurin

lib/private/AppFramework/Http/Dispatcher.php

@@ -222,8 +222,7 @@ private function executeController(Controller $controller, string $methodName):
 		// format response
 		if ($response instanceof DataResponse || !($response instanceof Response)) {
 			$format = $this->request->getFormat();
-
-			if ($format !== null) {
+			if ($format !== null && $controller->isResponderRegistered($format)) {
 				$response = $controller->buildResponse($response, $format);
 			} else {
 				$response = $controller->buildResponse($response);

lib/private/AppFramework/Middleware/OCSMiddleware.php

@@ -110,7 +110,10 @@ public function afterController($controller, $methodName, Response $response) {
 	 * @return V1Response|V2Response
 	 */
 	private function buildNewResponse(Controller $controller, $code, $message) {
-		$format = $this->request->getFormat() ?? 'xml';
+		$format = $this->request->getFormat();
+		if ($format === null || !$controller->isResponderRegistered($format)) {
+			$format = 'xml';
+		}
 
 		$data = new DataResponse();
 		$data->setStatus($code);

lib/public/AppFramework/Controller.php

@@ -7,6 +7,7 @@
  */
 namespace OCP\AppFramework;
 
+use Closure;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\Response;
@@ -32,7 +33,7 @@ abstract class Controller {
 	protected $request;
 
 	/**
-	 * @var array
+	 * @var array<string, Closure>
 	 * @since 7.0.0
 	 */
 	private $responders;
@@ -113,10 +114,10 @@ public function getResponderByHTTPHeader($acceptHeader, $default = 'json') {
 	/**
 	 * Registers a formatter for a type
 	 * @param string $format
-	 * @param \Closure $responder
+	 * @param Closure $responder
 	 * @since 7.0.0
 	 */
-	protected function registerResponder($format, \Closure $responder) {
+	protected function registerResponder($format, Closure $responder) {
 		$this->responders[$format] = $responder;
 	}
 
@@ -139,4 +140,8 @@ public function buildResponse($response, $format = 'json') {
 		throw new \DomainException('No responder registered for format '
 			. $format . '!');
 	}
+
+	public function isResponderRegistered(string $responder): bool {
+		return isset($this->responders[$responder]);
+	}
 }