X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRest%2FRouter.php;h=a520130d06167f6fae3c8ec5134cf38bb24c543d;hb=54c93f1d384cd5accd2db2ebbb911e4d627c2980;hp=14b4c9cb89b8d43133474470a1fece467bf15645;hpb=9d9b2e385414c4cde629e8745088dfa48a61f12f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Rest/Router.php b/includes/Rest/Router.php
index 14b4c9cb89..a520130d06 100644
--- a/includes/Rest/Router.php
+++ b/includes/Rest/Router.php
@@ -6,6 +6,7 @@ use AppendIterator;
 use BagOStuff;
 use MediaWiki\Rest\BasicAccess\BasicAuthorizerInterface;
 use MediaWiki\Rest\PathTemplateMatcher\PathMatcher;
+use MediaWiki\Rest\Validator\Validator;
 use Wikimedia\ObjectFactory;
 
 /**
@@ -44,6 +45,12 @@ class Router {
 	/** @var BasicAuthorizerInterface */
 	private $basicAuth;
 
+	/** @var ObjectFactory */
+	private $objectFactory;
+
+	/** @var Validator */
+	private $restValidator;
+
 	/**
 	 * @param string[] $routeFiles List of names of JSON files containing routes
 	 * @param array $extraRoutes Extension route array
@@ -51,10 +58,13 @@ class Router {
 	 * @param BagOStuff $cacheBag A cache in which to store the matcher trees
 	 * @param ResponseFactory $responseFactory
 	 * @param BasicAuthorizerInterface $basicAuth
+	 * @param ObjectFactory $objectFactory
+	 * @param Validator $restValidator
 	 */
 	public function __construct( $routeFiles, $extraRoutes, $rootPath,
 		BagOStuff $cacheBag, ResponseFactory $responseFactory,
-		BasicAuthorizerInterface $basicAuth
+		BasicAuthorizerInterface $basicAuth, ObjectFactory $objectFactory,
+		Validator $restValidator
 	) {
 		$this->routeFiles = $routeFiles;
 		$this->extraRoutes = $extraRoutes;
@@ -62,6 +72,8 @@ class Router {
 		$this->cacheBag = $cacheBag;
 		$this->responseFactory = $responseFactory;
 		$this->basicAuth = $basicAuth;
+		$this->objectFactory = $objectFactory;
+		$this->restValidator = $restValidator;
 	}
 
 	/**
@@ -245,9 +257,10 @@ class Router {
 		$request->setPathParams( array_map( 'rawurldecode', $match['params'] ) );
 		$spec = $match['userData'];
 		$objectFactorySpec = array_intersect_key( $spec,
+			// @todo ObjectFactory supports more keys than this.
 			[ 'factory' => true, 'class' => true, 'args' => true ] );
 		/** @var $handler Handler (annotation for PHPStorm) */
-		$handler = ObjectFactory::getObjectFromSpec( $objectFactorySpec );
+		$handler = $this->objectFactory->createObject( $objectFactorySpec );
 		$handler->init( $this, $request, $spec, $this->responseFactory );
 
 		try {
@@ -263,10 +276,14 @@ class Router {
 	 * @return ResponseInterface
 	 */
 	private function executeHandler( $handler ): ResponseInterface {
+		// @phan-suppress-next-line PhanAccessMethodInternal
 		$authResult = $this->basicAuth->authorize( $handler->getRequest(), $handler );
 		if ( $authResult ) {
 			return $this->responseFactory->createHttpError( 403, [ 'error' => $authResult ] );
 		}
+
+		$handler->validate( $this->restValidator );
+
 		$response = $handler->execute();
 		if ( !( $response instanceof ResponseInterface ) ) {
 			$response = $this->responseFactory->createFromReturnValue( $response );