Merge pull request #54534 from nextcloud/fix/dispatcher/catch-type-errors-bad-request

fix(Dispatcher): Catch TypeErrors and turn them into bad request responses

Author: susnux

lib/private/AppFramework/Http/Dispatcher.php

@@ -201,7 +201,18 @@ private function executeController(Controller $controller, string $methodName):
 		}
 
 		$this->eventLogger->start('controller:' . get_class($controller) . '::' . $methodName, 'App framework controller execution');
-		$response = \call_user_func_array([$controller, $methodName], $arguments);
+		try {
+			$response = \call_user_func_array([$controller, $methodName], $arguments);
+		} catch (\TypeError $e) {
+			// Only intercept TypeErrors occuring on the first line, meaning that the invocation of the controller method failed.
+			// Any other TypeError happens inside the controller method logic and should be logged as normal.
+			if ($e->getFile() === $this->reflector->getFile() && $e->getLine() === $this->reflector->getStartLine()) {
+				$this->logger->debug('Failed to call controller method: ' . $e->getMessage(), ['exception' => $e]);
+				return new Response(Http::STATUS_BAD_REQUEST);
+			}
+
+			throw $e;
+		}
 		$this->eventLogger->end('controller:' . get_class($controller) . '::' . $methodName);
 
 		if (!($response instanceof Response)) {

lib/private/AppFramework/Utility/ControllerMethodReflector.php

@@ -18,13 +18,18 @@ class ControllerMethodReflector implements IControllerMethodReflector {
 	private $types = [];
 	private $parameters = [];
 	private array $ranges = [];
+	private int $startLine = 0;
+	private string $file = '';
 
 	/**
 	 * @param object $object an object or classname
 	 * @param string $method the method which we want to inspect
 	 */
 	public function reflect($object, string $method) {
 		$reflection = new \ReflectionMethod($object, $method);
+		$this->startLine = $reflection->getStartLine();
+		$this->file = $reflection->getFileName();
+
 		$docs = $reflection->getDocComment();
 
 		if ($docs !== false) {
@@ -134,4 +139,12 @@ public function getAnnotationParameter(string $name, string $key): string {
 
 		return '';
 	}
+
+	public function getStartLine(): int {
+		return $this->startLine;
+	}
+
+	public function getFile(): string {
+		return $this->file;
+	}
 }