Remove old code + add Middleware

* Add proper middleware for shareinfo
* Remove old shareinfo routes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

3 files changed, 94 insertions, 7 deletions

diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
index db2175c3445..3e95c738df8 100644
--- a/apps/files_sharing/lib/AppInfo/Application.php
+++ b/apps/files_sharing/lib/AppInfo/Application.php
@@ -28,6 +28,7 @@
 namespace OCA\Files_Sharing\AppInfo;
 
 use OCA\Files_Sharing\Middleware\OCSShareAPIMiddleware;
+use OCA\Files_Sharing\Middleware\ShareInfoMiddleware;
 use OCA\Files_Sharing\MountProvider;
 use OCP\AppFramework\App;
 use OC\AppFramework\Utility\SimpleContainer;
@@ -124,9 +125,16 @@ class Application extends App {
 			);
 		});
 
+		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
+			return new ShareInfoMiddleware(
+				$server->getShareManager()
+			);
+		});
+
 		// Execute middlewares
 		$container->registerMiddleWare('SharingCheckMiddleware');
 		$container->registerMiddleWare('OCSShareAPIMiddleware');
+		$container->registerMiddleWare(ShareInfoMiddleware::class);
 
 		$container->registerService('MountProvider', function (IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
diff --git a/apps/files_sharing/lib/Controller/ShareInfoController.php b/apps/files_sharing/lib/Controller/ShareInfoController.php
index d926721f06c..696b064ac0f 100644
--- a/apps/files_sharing/lib/Controller/ShareInfoController.php
+++ b/apps/files_sharing/lib/Controller/ShareInfoController.php
@@ -41,9 +41,9 @@ class ShareInfoController extends ApiController {
 	 * @param null $password
 	 * @param null $dir
 	 * @return JSONResponse
+	 * @throws ShareNotFound
 	 */
 	public function info($t, $password = null, $dir = null) {
-		$this->logger->error('HERE!');
 		try {
 			$share = $this->shareManager->getShareByToken($t);
 		} catch (ShareNotFound $e) {
@@ -79,12 +79,7 @@ class ShareInfoController extends ApiController {
 			}
 		}
 
-		$result = [
-			'data' => $this->parseNode($node),
-			'status' => 'success'
-		];
-
-		return new JSONResponse($result);
+		return new JSONResponse($this->parseNode($node));
 	}
 
 	private function parseNode(Node $node) {
diff --git a/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php b/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php
new file mode 100644
index 00000000000..a069ecacc2a
--- /dev/null
+++ b/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace OCA\Files_Sharing\Middleware;
+
+use OCA\FederatedFileSharing\FederatedShareProvider;
+use OCA\Files_Sharing\Controller\ShareInfoController;
+use OCA\Files_Sharing\Exceptions\S2SException;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Middleware;
+use OCP\Share\IManager;
+
+class ShareInfoMiddleware extends Middleware {
+	/** @var IManager */
+	private $shareManager;
+
+	public function __construct(IManager $shareManager) {
+		$this->shareManager = $shareManager;
+	}
+
+	/**
+	 * @param Controller $controller
+	 * @param string $methodName
+	 * @throws S2SException
+	 */
+	public function beforeController(Controller $controller, $methodName) {
+		if (!($controller instanceof ShareInfoController)) {
+			return;
+		}
+
+		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+			throw new S2SException();
+		}
+	}
+
+	/**
+	 * @param Controller $controller
+	 * @param string $methodName
+	 * @param \Exception $exception
+	 * @throws \Exception
+	 * @return Response
+	 */
+	public function afterException(Controller $controller, $methodName, \Exception $exception) {
+		if (!($controller instanceof ShareInfoController)) {
+			throw $exception;
+		}
+
+		if ($exception instanceof S2SException) {
+			return new JSONResponse([], Http::STATUS_NOT_FOUND);
+		}
+	}
+
+	/**
+	 * @param Controller $controller
+	 * @param string $methodName
+	 * @param Response $response
+	 * @return Response
+	 */
+	public function afterController(Controller $controller, $methodName, Response $response) {
+		if (!($controller instanceof ShareInfoController)) {
+			return $response;
+		}
+
+		if (!($response instanceof JSONResponse)) {
+			return $response;
+		}
+
+		$data = $response->getData();
+		$status = 'error';
+
+		if ($response->getStatus() === Http::STATUS_OK) {
+			$status = 'success';
+		}
+
+		$response->setData([
+			'data' => $data,
+			'status' => $status,
+		]);
+
+		return $response;
+	}
+}