nextcloud / server

lib/public/AppFramework/Middleware.php

Indentation +57 added lines, -57 removed lines

@@ -43,69 +43,69 @@
 abstract class Middleware {
 
 
-	/**
-	 * This is being run in normal order before the controller is being
-	 * called which allows several modifications and checks
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @since 6.0.0
-	 */
-	public function beforeController(Controller $controller, $methodName){
+    /**
+     * This is being run in normal order before the controller is being
+     * called which allows several modifications and checks
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @since 6.0.0
+     */
+    public function beforeController(Controller $controller, $methodName){
 
-	}
+    }
 
 
-	/**
-	 * This is being run when either the beforeController method or the
-	 * controller method itself is throwing an exception. The middleware is
-	 * asked in reverse order to handle the exception and to return a response.
-	 * If the response is null, it is assumed that the exception could not be
-	 * handled and the error will be thrown again
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param \Exception $exception the thrown exception
-	 * @throws \Exception the passed in exception if it can't handle it
-	 * @return Response a Response object in case that the exception was handled
-	 * @since 6.0.0
-	 */
-	public function afterException(Controller $controller, $methodName, \Exception $exception){
-		throw $exception;
-	}
+    /**
+     * This is being run when either the beforeController method or the
+     * controller method itself is throwing an exception. The middleware is
+     * asked in reverse order to handle the exception and to return a response.
+     * If the response is null, it is assumed that the exception could not be
+     * handled and the error will be thrown again
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param \Exception $exception the thrown exception
+     * @throws \Exception the passed in exception if it can't handle it
+     * @return Response a Response object in case that the exception was handled
+     * @since 6.0.0
+     */
+    public function afterException(Controller $controller, $methodName, \Exception $exception){
+        throw $exception;
+    }
 
 
-	/**
-	 * This is being run after a successful controllermethod call and allows
-	 * the manipulation of a Response object. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param Response $response the generated response from the controller
-	 * @return Response a Response object
-	 * @since 6.0.0
-	 */
-	public function afterController(Controller $controller, $methodName, Response $response){
-		return $response;
-	}
+    /**
+     * This is being run after a successful controllermethod call and allows
+     * the manipulation of a Response object. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param Response $response the generated response from the controller
+     * @return Response a Response object
+     * @since 6.0.0
+     */
+    public function afterController(Controller $controller, $methodName, Response $response){
+        return $response;
+    }
 
 
-	/**
-	 * This is being run after the response object has been rendered and
-	 * allows the manipulation of the output. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param string $output the generated output from a response
-	 * @return string the output that should be printed
-	 * @since 6.0.0
-	 */
-	public function beforeOutput(Controller $controller, $methodName, $output){
-		return $output;
-	}
+    /**
+     * This is being run after the response object has been rendered and
+     * allows the manipulation of the output. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param string $output the generated output from a response
+     * @return string the output that should be printed
+     * @since 6.0.0
+     */
+    public function beforeOutput(Controller $controller, $methodName, $output){
+        return $output;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 	 *                           the controller
 	 * @since 6.0.0
 	 */
-	public function beforeController(Controller $controller, $methodName){
+	public function beforeController(Controller $controller, $methodName) {
 
 	}
 
@@ -72,7 +72,7 @@ 
 	 * @return Response a Response object in case that the exception was handled
 	 * @since 6.0.0
 	 */
-	public function afterException(Controller $controller, $methodName, \Exception $exception){
+	public function afterException(Controller $controller, $methodName, \Exception $exception) {
 		throw $exception;
 	}
 
@@ -88,7 +88,7 @@ 
 	 * @return Response a Response object
 	 * @since 6.0.0
 	 */
-	public function afterController(Controller $controller, $methodName, Response $response){
+	public function afterController(Controller $controller, $methodName, Response $response) {
 		return $response;
 	}
 
@@ -104,7 +104,7 @@ 
 	 * @return string the output that should be printed
 	 * @since 6.0.0
 	 */
-	public function beforeOutput(Controller $controller, $methodName, $output){
+	public function beforeOutput(Controller $controller, $methodName, $output) {
 		return $output;
 	}
 

core/Middleware/TwoFactorMiddleware.php

Doc Comments +3 added lines

@@ -104,6 +104,9 @@
 		// TODO: dont check/enforce 2FA if a auth token is used
 	}
 
+	/**
+	 * @param string $methodName
+	 */
 	private function checkTwoFactor(Controller $controller, $methodName, IUser $user) {
 		// If two-factor auth is in progress disallow access to any controllers
 		// defined within "LoginController".

Indentation +95 added lines, -95 removed lines

@@ -41,100 +41,100 @@
 
 class TwoFactorMiddleware extends Middleware {
 
-	/** @var Manager */
-	private $twoFactorManager;
-
-	/** @var Session */
-	private $userSession;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IControllerMethodReflector */
-	private $reflector;
-
-	/** @var IRequest */
-	private $request;
-
-	/**
-	 * @param Manager $twoFactorManager
-	 * @param Session $userSession
-	 * @param ISession $session
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(Manager $twoFactorManager, Session $userSession, ISession $session,
-		IURLGenerator $urlGenerator, IControllerMethodReflector $reflector, IRequest $request) {
-		$this->twoFactorManager = $twoFactorManager;
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-		$this->reflector = $reflector;
-		$this->request = $request;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 */
-	public function beforeController(Controller $controller, $methodName) {
-		if ($this->reflector->hasAnnotation('PublicPage')) {
-			// Don't block public pages
-			return;
-		}
-
-		if ($controller instanceof LoginController && $methodName === 'logout') {
-			// Don't block the logout page, to allow canceling the 2FA
-			return;
-		}
-
-		if ($this->userSession->isLoggedIn()) {
-			$user = $this->userSession->getUser();
-
-			if ($this->twoFactorManager->isTwoFactorAuthenticated($user)) {
-				$this->checkTwoFactor($controller, $methodName, $user);
-			} else if ($controller instanceof TwoFactorChallengeController) {
-				// Allow access to the two-factor controllers only if two-factor authentication
-				// is in progress.
-				throw new UserAlreadyLoggedInException();
-			}
-		}
-		// TODO: dont check/enforce 2FA if a auth token is used
-	}
-
-	private function checkTwoFactor(Controller $controller, $methodName, IUser $user) {
-		// If two-factor auth is in progress disallow access to any controllers
-		// defined within "LoginController".
-		$needsSecondFactor = $this->twoFactorManager->needsSecondFactor($user);
-		$twoFactor = $controller instanceof TwoFactorChallengeController;
-
-		// Disallow access to any controller if 2FA needs to be checked
-		if ($needsSecondFactor && !$twoFactor) {
-			throw new TwoFactorAuthRequiredException();
-		}
-
-		// Allow access to the two-factor controllers only if two-factor authentication
-		// is in progress.
-		if (!$needsSecondFactor && $twoFactor) {
-			throw new UserAlreadyLoggedInException();
-		}
-	}
-
-	public function afterException(Controller $controller, $methodName, Exception $exception) {
-		if ($exception instanceof TwoFactorAuthRequiredException) {
-			$params = [];
-			if (isset($this->request->server['REQUEST_URI'])) {
-				$params['redirect_url'] = $this->request->server['REQUEST_URI'];
-			}
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge', $params));
-		}
-		if ($exception instanceof UserAlreadyLoggedInException) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index'));
-		}
-
-		throw $exception;
-	}
+    /** @var Manager */
+    private $twoFactorManager;
+
+    /** @var Session */
+    private $userSession;
+
+    /** @var ISession */
+    private $session;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var IControllerMethodReflector */
+    private $reflector;
+
+    /** @var IRequest */
+    private $request;
+
+    /**
+     * @param Manager $twoFactorManager
+     * @param Session $userSession
+     * @param ISession $session
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(Manager $twoFactorManager, Session $userSession, ISession $session,
+        IURLGenerator $urlGenerator, IControllerMethodReflector $reflector, IRequest $request) {
+        $this->twoFactorManager = $twoFactorManager;
+        $this->userSession = $userSession;
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+        $this->reflector = $reflector;
+        $this->request = $request;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     */
+    public function beforeController(Controller $controller, $methodName) {
+        if ($this->reflector->hasAnnotation('PublicPage')) {
+            // Don't block public pages
+            return;
+        }
+
+        if ($controller instanceof LoginController && $methodName === 'logout') {
+            // Don't block the logout page, to allow canceling the 2FA
+            return;
+        }
+
+        if ($this->userSession->isLoggedIn()) {
+            $user = $this->userSession->getUser();
+
+            if ($this->twoFactorManager->isTwoFactorAuthenticated($user)) {
+                $this->checkTwoFactor($controller, $methodName, $user);
+            } else if ($controller instanceof TwoFactorChallengeController) {
+                // Allow access to the two-factor controllers only if two-factor authentication
+                // is in progress.
+                throw new UserAlreadyLoggedInException();
+            }
+        }
+        // TODO: dont check/enforce 2FA if a auth token is used
+    }
+
+    private function checkTwoFactor(Controller $controller, $methodName, IUser $user) {
+        // If two-factor auth is in progress disallow access to any controllers
+        // defined within "LoginController".
+        $needsSecondFactor = $this->twoFactorManager->needsSecondFactor($user);
+        $twoFactor = $controller instanceof TwoFactorChallengeController;
+
+        // Disallow access to any controller if 2FA needs to be checked
+        if ($needsSecondFactor && !$twoFactor) {
+            throw new TwoFactorAuthRequiredException();
+        }
+
+        // Allow access to the two-factor controllers only if two-factor authentication
+        // is in progress.
+        if (!$needsSecondFactor && $twoFactor) {
+            throw new UserAlreadyLoggedInException();
+        }
+    }
+
+    public function afterException(Controller $controller, $methodName, Exception $exception) {
+        if ($exception instanceof TwoFactorAuthRequiredException) {
+            $params = [];
+            if (isset($this->request->server['REQUEST_URI'])) {
+                $params['redirect_url'] = $this->request->server['REQUEST_URI'];
+            }
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge', $params));
+        }
+        if ($exception instanceof UserAlreadyLoggedInException) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index'));
+        }
+
+        throw $exception;
+    }
 
 }

apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php

Indentation +127 added lines, -127 removed lines

@@ -47,20 +47,20 @@ 
  */
 class SharingCheckMiddleware extends Middleware {
 
-	/** @var string */
-	protected $appName;
-	/** @var IConfig */
-	protected $config;
-	/** @var IAppManager */
-	protected $appManager;
-	/** @var IControllerMethodReflector */
-	protected $reflector;
-	/** @var IManager */
-	protected $shareManager;
-	/** @var IRequest */
-	protected $request;
-
-	/***
+    /** @var string */
+    protected $appName;
+    /** @var IConfig */
+    protected $config;
+    /** @var IAppManager */
+    protected $appManager;
+    /** @var IControllerMethodReflector */
+    protected $reflector;
+    /** @var IManager */
+    protected $shareManager;
+    /** @var IRequest */
+    protected $request;
+
+    /***
 	 * @param string $appName
 	 * @param IConfig $config
 	 * @param IAppManager $appManager
@@ -68,118 +68,118 @@ 
 	 * @param IManager $shareManager
 	 * @param IRequest $request
 	 */
-	public function __construct($appName,
-								IConfig $config,
-								IAppManager $appManager,
-								IControllerMethodReflector $reflector,
-								IManager $shareManager,
-								IRequest $request
-								) {
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->reflector = $reflector;
-		$this->shareManager = $shareManager;
-		$this->request = $request;
-	}
-
-	/**
-	 * Check if sharing is enabled before the controllers is executed
-	 *
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws NotFoundException
-	 * @throws S2SException
-	 * @throws ShareNotFound
-	 */
-	public function beforeController(Controller $controller, $methodName) {
-		if(!$this->isSharingEnabled()) {
-			throw new NotFoundException('Sharing is disabled.');
-		}
-
-		if ($controller instanceof ExternalSharesController &&
-			!$this->externalSharesChecks()) {
-			throw new S2SException('Federated sharing not allowed');
-		} else if ($controller instanceof ShareController) {
-			$token = $this->request->getParam('token');
-			$share = $this->shareManager->getShareByToken($token);
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK
-				&& !$this->isLinkSharingEnabled()) {
-				throw new NotFoundException('Link sharing is disabled');
-			}
-		}
-	}
-
-	/**
-	 * Return 404 page in case of a not found exception
-	 *
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @return NotFoundResponse
-	 * @throws \Exception
-	 */
-	public function afterException(Controller $controller, $methodName, \Exception $exception) {
-		if(is_a($exception, '\OCP\Files\NotFoundException')) {
-			return new NotFoundResponse();
-		}
-
-		if (is_a($exception, '\OCA\Files_Sharing\Exceptions\S2SException')) {
-			return new JSONResponse($exception->getMessage(), 405);
-		}
-
-		throw $exception;
-	}
-
-	/**
-	 * Checks for externalshares controller
-	 * @return bool
-	 */
-	private function externalSharesChecks() {
-
-		if (!$this->reflector->hasAnnotation('NoIncomingFederatedSharingRequired') &&
-			$this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') !== 'yes') {
-			return false;
-		}
-
-		if (!$this->reflector->hasAnnotation('NoOutgoingFederatedSharingRequired') &&
-		    $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') !== 'yes') {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check whether sharing is enabled
-	 * @return bool
-	 */
-	private function isSharingEnabled() {
-		// FIXME: This check is done here since the route is globally defined and not inside the files_sharing app
-		// Check whether the sharing application is enabled
-		if(!$this->appManager->isEnabledForUser($this->appName)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if link sharing is allowed
-	 * @return bool
-	 */
-	private function isLinkSharingEnabled() {
-		// Check if the shareAPI is enabled
-		if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
-			return false;
-		}
-
-		// Check whether public sharing is enabled
-		if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
-			return false;
-		}
-
-		return true;
-	}
+    public function __construct($appName,
+                                IConfig $config,
+                                IAppManager $appManager,
+                                IControllerMethodReflector $reflector,
+                                IManager $shareManager,
+                                IRequest $request
+                                ) {
+        $this->appName = $appName;
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->reflector = $reflector;
+        $this->shareManager = $shareManager;
+        $this->request = $request;
+    }
+
+    /**
+     * Check if sharing is enabled before the controllers is executed
+     *
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws NotFoundException
+     * @throws S2SException
+     * @throws ShareNotFound
+     */
+    public function beforeController(Controller $controller, $methodName) {
+        if(!$this->isSharingEnabled()) {
+            throw new NotFoundException('Sharing is disabled.');
+        }
+
+        if ($controller instanceof ExternalSharesController &&
+            !$this->externalSharesChecks()) {
+            throw new S2SException('Federated sharing not allowed');
+        } else if ($controller instanceof ShareController) {
+            $token = $this->request->getParam('token');
+            $share = $this->shareManager->getShareByToken($token);
+            if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK
+                && !$this->isLinkSharingEnabled()) {
+                throw new NotFoundException('Link sharing is disabled');
+            }
+        }
+    }
+
+    /**
+     * Return 404 page in case of a not found exception
+     *
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @return NotFoundResponse
+     * @throws \Exception
+     */
+    public function afterException(Controller $controller, $methodName, \Exception $exception) {
+        if(is_a($exception, '\OCP\Files\NotFoundException')) {
+            return new NotFoundResponse();
+        }
+
+        if (is_a($exception, '\OCA\Files_Sharing\Exceptions\S2SException')) {
+            return new JSONResponse($exception->getMessage(), 405);
+        }
+
+        throw $exception;
+    }
+
+    /**
+     * Checks for externalshares controller
+     * @return bool
+     */
+    private function externalSharesChecks() {
+
+        if (!$this->reflector->hasAnnotation('NoIncomingFederatedSharingRequired') &&
+            $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') !== 'yes') {
+            return false;
+        }
+
+        if (!$this->reflector->hasAnnotation('NoOutgoingFederatedSharingRequired') &&
+            $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') !== 'yes') {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check whether sharing is enabled
+     * @return bool
+     */
+    private function isSharingEnabled() {
+        // FIXME: This check is done here since the route is globally defined and not inside the files_sharing app
+        // Check whether the sharing application is enabled
+        if(!$this->appManager->isEnabledForUser($this->appName)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if link sharing is allowed
+     * @return bool
+     */
+    private function isLinkSharingEnabled() {
+        // Check if the shareAPI is enabled
+        if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+            return false;
+        }
+
+        // Check whether public sharing is enabled
+        if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+            return false;
+        }
+
+        return true;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
 	 * @throws ShareNotFound
 	 */
 	public function beforeController(Controller $controller, $methodName) {
-		if(!$this->isSharingEnabled()) {
+		if (!$this->isSharingEnabled()) {
 			throw new NotFoundException('Sharing is disabled.');
 		}
 
@@ -120,7 +120,7 @@ 
 	 * @throws \Exception
 	 */
 	public function afterException(Controller $controller, $methodName, \Exception $exception) {
-		if(is_a($exception, '\OCP\Files\NotFoundException')) {
+		if (is_a($exception, '\OCP\Files\NotFoundException')) {
 			return new NotFoundResponse();
 		}
 
@@ -157,7 +157,7 @@ 
 	private function isSharingEnabled() {
 		// FIXME: This check is done here since the route is globally defined and not inside the files_sharing app
 		// Check whether the sharing application is enabled
-		if(!$this->appManager->isEnabledForUser($this->appName)) {
+		if (!$this->appManager->isEnabledForUser($this->appName)) {
 			return false;
 		}
 
@@ -175,7 +175,7 @@ 
 		}
 
 		// Check whether public sharing is enabled
-		if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+		if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
 			return false;
 		}
 

apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php

Indentation +35 added lines, -35 removed lines

@@ -11,43 +11,43 @@
 use OCP\Share\IManager;
 
 class OCSShareAPIMiddleware extends Middleware {
-	/** @var IManager */
-	private $shareManager;
-	/** @var IL10N */
-	private $l;
+    /** @var IManager */
+    private $shareManager;
+    /** @var IL10N */
+    private $l;
 
-	public function __construct(IManager $shareManager,
-								IL10N $l) {
-		$this->shareManager = $shareManager;
-		$this->l = $l;
-	}
+    public function __construct(IManager $shareManager,
+                                IL10N $l) {
+        $this->shareManager = $shareManager;
+        $this->l = $l;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws OCSNotFoundException
-	 */
-	public function beforeController(Controller $controller, $methodName) {
-		if ($controller instanceof ShareAPIController) {
-			if (!$this->shareManager->shareApiEnabled()) {
-				throw new OCSNotFoundException($this->l->t('Share API is disabled'));
-			}
-		}
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     *
+     * @throws OCSNotFoundException
+     */
+    public function beforeController(Controller $controller, $methodName) {
+        if ($controller instanceof ShareAPIController) {
+            if (!$this->shareManager->shareApiEnabled()) {
+                throw new OCSNotFoundException($this->l->t('Share API is disabled'));
+            }
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController(Controller $controller, $methodName, Response $response) {
-		if ($controller instanceof ShareAPIController) {
-			/** @var ShareAPIController $controller */
-			$controller->cleanup();
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController(Controller $controller, $methodName, Response $response) {
+        if ($controller instanceof ShareAPIController) {
+            /** @var ShareAPIController $controller */
+            $controller->cleanup();
+        }
 
-		return $response;
-	}
+        return $response;
+    }
 }

apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php

Indentation +45 added lines, -45 removed lines

@@ -11,55 +11,55 @@
 
 class ProvisioningApiMiddleware extends Middleware {
 
-	/** @var IControllerMethodReflector */
-	private $reflector;
+    /** @var IControllerMethodReflector */
+    private $reflector;
 
-	/** @var bool */
-	private $isAdmin;
+    /** @var bool */
+    private $isAdmin;
 
-	/** @var bool */
-	private $isSubAdmin;
+    /** @var bool */
+    private $isSubAdmin;
 
-	/**
-	 * ProvisioningApiMiddleware constructor.
-	 *
-	 * @param IControllerMethodReflector $reflector
-	 * @param bool $isAdmin
-	 * @param bool $isSubAdmin
-	 */
-	public function __construct(
-		IControllerMethodReflector $reflector,
-		$isAdmin,
-		$isSubAdmin) {
-		$this->reflector = $reflector;
-		$this->isAdmin = $isAdmin;
-		$this->isSubAdmin = $isSubAdmin;
-	}
+    /**
+     * ProvisioningApiMiddleware constructor.
+     *
+     * @param IControllerMethodReflector $reflector
+     * @param bool $isAdmin
+     * @param bool $isSubAdmin
+     */
+    public function __construct(
+        IControllerMethodReflector $reflector,
+        $isAdmin,
+        $isSubAdmin) {
+        $this->reflector = $reflector;
+        $this->isAdmin = $isAdmin;
+        $this->isSubAdmin = $isSubAdmin;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws NotSubAdminException
-	 */
-	public function beforeController(Controller $controller, $methodName) {
-		if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
-			throw new NotSubAdminException();
-		}
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     *
+     * @throws NotSubAdminException
+     */
+    public function beforeController(Controller $controller, $methodName) {
+        if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
+            throw new NotSubAdminException();
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return Response
-	 */
-	public function afterException(Controller $controller, $methodName, \Exception $exception) {
-		if ($exception instanceof NotSubAdminException) {
-			throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return Response
+     */
+    public function afterException(Controller $controller, $methodName, \Exception $exception) {
+        if ($exception instanceof NotSubAdminException) {
+            throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 }

lib/private/AppFramework/Middleware/SessionMiddleware.php

Indentation +42 added lines, -42 removed lines

@@ -32,52 +32,52 @@
 
 class SessionMiddleware extends Middleware {
 
-	/**
-	 * @var IRequest
-	 */
-	private $request;
+    /**
+     * @var IRequest
+     */
+    private $request;
 
-	/**
-	 * @var ControllerMethodReflector
-	 */
-	private $reflector;
+    /**
+     * @var ControllerMethodReflector
+     */
+    private $reflector;
 
-	/**
-	 * @param IRequest $request
-	 * @param ControllerMethodReflector $reflector
-	 */
-	public function __construct(IRequest $request,
-								ControllerMethodReflector $reflector,
-								ISession $session
+    /**
+     * @param IRequest $request
+     * @param ControllerMethodReflector $reflector
+     */
+    public function __construct(IRequest $request,
+                                ControllerMethodReflector $reflector,
+                                ISession $session
 ) {
-		$this->request = $request;
-		$this->reflector = $reflector;
-		$this->session = $session;
-	}
+        $this->request = $request;
+        $this->reflector = $reflector;
+        $this->session = $session;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 */
-	public function beforeController(Controller $controller, $methodName) {
-		$useSession = $this->reflector->hasAnnotation('UseSession');
-		if (!$useSession) {
-			$this->session->close();
-		}
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     */
+    public function beforeController(Controller $controller, $methodName) {
+        $useSession = $this->reflector->hasAnnotation('UseSession');
+        if (!$useSession) {
+            $this->session->close();
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController(Controller $controller, $methodName, Response $response){
-		$useSession = $this->reflector->hasAnnotation('UseSession');
-		if ($useSession) {
-			$this->session->close();
-		}
-		return $response;
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController(Controller $controller, $methodName, Response $response){
+        $useSession = $this->reflector->hasAnnotation('UseSession');
+        if ($useSession) {
+            $this->session->close();
+        }
+        return $response;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	 * @param Response $response
 	 * @return Response
 	 */
-	public function afterController(Controller $controller, $methodName, Response $response){
+	public function afterController(Controller $controller, $methodName, Response $response) {
 		$useSession = $this->reflector->hasAnnotation('UseSession');
 		if ($useSession) {
 			$this->session->close();

lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php

Indentation +40 added lines, -40 removed lines

@@ -36,49 +36,49 @@
  * @package OC\AppFramework\Middleware\Security
  */
 class BruteForceMiddleware extends Middleware {
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var Throttler */
-	private $throttler;
-	/** @var IRequest */
-	private $request;
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var Throttler */
+    private $throttler;
+    /** @var IRequest */
+    private $request;
 
-	/**
-	 * @param ControllerMethodReflector $controllerMethodReflector
-	 * @param Throttler $throttler
-	 * @param IRequest $request
-	 */
-	public function __construct(ControllerMethodReflector $controllerMethodReflector,
-								Throttler $throttler,
-								IRequest $request) {
-		$this->reflector = $controllerMethodReflector;
-		$this->throttler = $throttler;
-		$this->request = $request;
-	}
+    /**
+     * @param ControllerMethodReflector $controllerMethodReflector
+     * @param Throttler $throttler
+     * @param IRequest $request
+     */
+    public function __construct(ControllerMethodReflector $controllerMethodReflector,
+                                Throttler $throttler,
+                                IRequest $request) {
+        $this->reflector = $controllerMethodReflector;
+        $this->throttler = $throttler;
+        $this->request = $request;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function beforeController(Controller $controller, $methodName) {
-		parent::beforeController($controller, $methodName);
+    /**
+     * {@inheritDoc}
+     */
+    public function beforeController(Controller $controller, $methodName) {
+        parent::beforeController($controller, $methodName);
 
-		if($this->reflector->hasAnnotation('BruteForceProtection')) {
-			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
-			$this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
-		}
-	}
+        if($this->reflector->hasAnnotation('BruteForceProtection')) {
+            $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
+            $this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function afterController(Controller $controller, $methodName, Response $response) {
-		if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
-			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
-			$ip = $this->request->getRemoteAddress();
-			$this->throttler->sleepDelay($ip, $action);
-			$this->throttler->registerAttempt($action, $ip);
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function afterController(Controller $controller, $methodName, Response $response) {
+        if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
+            $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
+            $ip = $this->request->getRemoteAddress();
+            $this->throttler->sleepDelay($ip, $action);
+            $this->throttler->registerAttempt($action, $ip);
+        }
 
-		return parent::afterController($controller, $methodName, $response);
-	}
+        return parent::afterController($controller, $methodName, $response);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	public function beforeController(Controller $controller, $methodName) {
 		parent::beforeController($controller, $methodName);
 
-		if($this->reflector->hasAnnotation('BruteForceProtection')) {
+		if ($this->reflector->hasAnnotation('BruteForceProtection')) {
 			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
 			$this->throttler->sleepDelay($this->request->getRemoteAddress(), $action);
 		}
@@ -72,7 +72,7 @@ 
 	 * {@inheritDoc}
 	 */
 	public function afterController(Controller $controller, $methodName, Response $response) {
-		if($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
+		if ($this->reflector->hasAnnotation('BruteForceProtection') && $response->isThrottled()) {
 			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
 			$ip = $this->request->getRemoteAddress();
 			$this->throttler->sleepDelay($ip, $action);

lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php

Indentation +77 added lines, -77 removed lines

@@ -48,87 +48,87 @@
  * @package OC\AppFramework\Middleware\Security
  */
 class RateLimitingMiddleware extends Middleware {
-	/** @var IRequest $request */
-	private $request;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var Limiter */
-	private $limiter;
+    /** @var IRequest $request */
+    private $request;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var Limiter */
+    private $limiter;
 
-	/**
-	 * @param IRequest $request
-	 * @param IUserSession $userSession
-	 * @param ControllerMethodReflector $reflector
-	 * @param Limiter $limiter
-	 */
-	public function __construct(IRequest $request,
-								IUserSession $userSession,
-								ControllerMethodReflector $reflector,
-								Limiter $limiter) {
-		$this->request = $request;
-		$this->userSession = $userSession;
-		$this->reflector = $reflector;
-		$this->limiter = $limiter;
-	}
+    /**
+     * @param IRequest $request
+     * @param IUserSession $userSession
+     * @param ControllerMethodReflector $reflector
+     * @param Limiter $limiter
+     */
+    public function __construct(IRequest $request,
+                                IUserSession $userSession,
+                                ControllerMethodReflector $reflector,
+                                Limiter $limiter) {
+        $this->request = $request;
+        $this->userSession = $userSession;
+        $this->reflector = $reflector;
+        $this->limiter = $limiter;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 * @throws RateLimitExceededException
-	 */
-	public function beforeController(Controller $controller, $methodName) {
-		parent::beforeController($controller, $methodName);
+    /**
+     * {@inheritDoc}
+     * @throws RateLimitExceededException
+     */
+    public function beforeController(Controller $controller, $methodName) {
+        parent::beforeController($controller, $methodName);
 
-		$anonLimit = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'limit');
-		$anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
-		$userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
-		$userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
-		$rateLimitIdentifier = get_class($controller) . '::' . $methodName;
-		if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
-			$this->limiter->registerUserRequest(
-				$rateLimitIdentifier,
-				$userLimit,
-				$userPeriod,
-				$this->userSession->getUser()
-			);
-		} elseif ($anonLimit !== '' && $anonPeriod !== '') {
-			$this->limiter->registerAnonRequest(
-				$rateLimitIdentifier,
-				$anonLimit,
-				$anonPeriod,
-				$this->request->getRemoteAddress()
-			);
-		}
-	}
+        $anonLimit = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'limit');
+        $anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
+        $userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
+        $userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
+        $rateLimitIdentifier = get_class($controller) . '::' . $methodName;
+        if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
+            $this->limiter->registerUserRequest(
+                $rateLimitIdentifier,
+                $userLimit,
+                $userPeriod,
+                $this->userSession->getUser()
+            );
+        } elseif ($anonLimit !== '' && $anonPeriod !== '') {
+            $this->limiter->registerAnonRequest(
+                $rateLimitIdentifier,
+                $anonLimit,
+                $anonPeriod,
+                $this->request->getRemoteAddress()
+            );
+        }
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function afterException(Controller $controller, $methodName, \Exception $exception) {
-		if($exception instanceof RateLimitExceededException) {
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
-				$response = new JSONResponse(
-					[
-						'message' => $exception->getMessage(),
-					],
-					$exception->getCode()
-				);
-			} else {
-					$response = new TemplateResponse(
-						'core',
-						'403',
-							[
-								'file' => $exception->getMessage()
-							],
-						'guest'
-					);
-					$response->setStatus($exception->getCode());
-			}
+    /**
+     * {@inheritDoc}
+     */
+    public function afterException(Controller $controller, $methodName, \Exception $exception) {
+        if($exception instanceof RateLimitExceededException) {
+            if (stripos($this->request->getHeader('Accept'),'html') === false) {
+                $response = new JSONResponse(
+                    [
+                        'message' => $exception->getMessage(),
+                    ],
+                    $exception->getCode()
+                );
+            } else {
+                    $response = new TemplateResponse(
+                        'core',
+                        '403',
+                            [
+                                'file' => $exception->getMessage()
+                            ],
+                        'guest'
+                    );
+                    $response->setStatus($exception->getCode());
+            }
 
-			return $response;
-		}
+            return $response;
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -84,8 +84,8 @@ 
 		$anonPeriod = $this->reflector->getAnnotationParameter('AnonRateThrottle', 'period');
 		$userLimit = $this->reflector->getAnnotationParameter('UserRateThrottle', 'limit');
 		$userPeriod = $this->reflector->getAnnotationParameter('UserRateThrottle', 'period');
-		$rateLimitIdentifier = get_class($controller) . '::' . $methodName;
-		if($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
+		$rateLimitIdentifier = get_class($controller).'::'.$methodName;
+		if ($userLimit !== '' && $userPeriod !== '' && $this->userSession->isLoggedIn()) {
 			$this->limiter->registerUserRequest(
 				$rateLimitIdentifier,
 				$userLimit,
@@ -106,8 +106,8 @@ 
 	 * {@inheritDoc}
 	 */
 	public function afterException(Controller $controller, $methodName, \Exception $exception) {
-		if($exception instanceof RateLimitExceededException) {
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
+		if ($exception instanceof RateLimitExceededException) {
+			if (stripos($this->request->getHeader('Accept'), 'html') === false) {
 				$response = new JSONResponse(
 					[
 						'message' => $exception->getMessage(),

lib/private/AppFramework/Middleware/Security/CORSMiddleware.php

Indentation +102 added lines, -102 removed lines

@@ -45,116 +45,116 @@
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
  */
 class CORSMiddleware extends Middleware {
-	/** @var IRequest  */
-	private $request;
-	/** @var ControllerMethodReflector */
-	private $reflector;
-	/** @var Session */
-	private $session;
-	/** @var Throttler */
-	private $throttler;
+    /** @var IRequest  */
+    private $request;
+    /** @var ControllerMethodReflector */
+    private $reflector;
+    /** @var Session */
+    private $session;
+    /** @var Throttler */
+    private $throttler;
 
-	/**
-	 * @param IRequest $request
-	 * @param ControllerMethodReflector $reflector
-	 * @param Session $session
-	 * @param Throttler $throttler
-	 */
-	public function __construct(IRequest $request,
-								ControllerMethodReflector $reflector,
-								Session $session,
-								Throttler $throttler) {
-		$this->request = $request;
-		$this->reflector = $reflector;
-		$this->session = $session;
-		$this->throttler = $throttler;
-	}
+    /**
+     * @param IRequest $request
+     * @param ControllerMethodReflector $reflector
+     * @param Session $session
+     * @param Throttler $throttler
+     */
+    public function __construct(IRequest $request,
+                                ControllerMethodReflector $reflector,
+                                Session $session,
+                                Throttler $throttler) {
+        $this->request = $request;
+        $this->reflector = $reflector;
+        $this->session = $session;
+        $this->throttler = $throttler;
+    }
 
-	/**
-	 * This is being run in normal order before the controller is being
-	 * called which allows several modifications and checks
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @throws SecurityException
-	 * @since 6.0.0
-	 */
-	public function beforeController(Controller $controller, $methodName){
-		// ensure that @CORS annotated API routes are not used in conjunction
-		// with session authentication since this enables CSRF attack vectors
-		if ($this->reflector->hasAnnotation('CORS') &&
-			!$this->reflector->hasAnnotation('PublicPage'))  {
-			$user = $this->request->server['PHP_AUTH_USER'];
-			$pass = $this->request->server['PHP_AUTH_PW'];
+    /**
+     * This is being run in normal order before the controller is being
+     * called which allows several modifications and checks
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @throws SecurityException
+     * @since 6.0.0
+     */
+    public function beforeController(Controller $controller, $methodName){
+        // ensure that @CORS annotated API routes are not used in conjunction
+        // with session authentication since this enables CSRF attack vectors
+        if ($this->reflector->hasAnnotation('CORS') &&
+            !$this->reflector->hasAnnotation('PublicPage'))  {
+            $user = $this->request->server['PHP_AUTH_USER'];
+            $pass = $this->request->server['PHP_AUTH_PW'];
 
-			$this->session->logout();
-			try {
-				if (!$this->session->logClientIn($user, $pass, $this->request, $this->throttler)) {
-					throw new SecurityException('CORS requires basic auth', Http::STATUS_UNAUTHORIZED);
-				}
-			} catch (PasswordLoginForbiddenException $ex) {
-				throw new SecurityException('Password login forbidden, use token instead', Http::STATUS_UNAUTHORIZED);
-			}
-		}
-	}
+            $this->session->logout();
+            try {
+                if (!$this->session->logClientIn($user, $pass, $this->request, $this->throttler)) {
+                    throw new SecurityException('CORS requires basic auth', Http::STATUS_UNAUTHORIZED);
+                }
+            } catch (PasswordLoginForbiddenException $ex) {
+                throw new SecurityException('Password login forbidden, use token instead', Http::STATUS_UNAUTHORIZED);
+            }
+        }
+    }
 
-	/**
-	 * This is being run after a successful controllermethod call and allows
-	 * the manipulation of a Response object. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param Response $response the generated response from the controller
-	 * @return Response a Response object
-	 * @throws SecurityException
-	 */
-	public function afterController(Controller $controller, $methodName, Response $response){
-		// only react if its a CORS request and if the request sends origin and
+    /**
+     * This is being run after a successful controllermethod call and allows
+     * the manipulation of a Response object. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param Response $response the generated response from the controller
+     * @return Response a Response object
+     * @throws SecurityException
+     */
+    public function afterController(Controller $controller, $methodName, Response $response){
+        // only react if its a CORS request and if the request sends origin and
 
-		if(isset($this->request->server['HTTP_ORIGIN']) &&
-			$this->reflector->hasAnnotation('CORS')) {
+        if(isset($this->request->server['HTTP_ORIGIN']) &&
+            $this->reflector->hasAnnotation('CORS')) {
 
-			// allow credentials headers must not be true or CSRF is possible
-			// otherwise
-			foreach($response->getHeaders() as $header => $value) {
-				if(strtolower($header) === 'access-control-allow-credentials' &&
-				   strtolower(trim($value)) === 'true') {
-					$msg = 'Access-Control-Allow-Credentials must not be '.
-						   'set to true in order to prevent CSRF';
-					throw new SecurityException($msg);
-				}
-			}
+            // allow credentials headers must not be true or CSRF is possible
+            // otherwise
+            foreach($response->getHeaders() as $header => $value) {
+                if(strtolower($header) === 'access-control-allow-credentials' &&
+                   strtolower(trim($value)) === 'true') {
+                    $msg = 'Access-Control-Allow-Credentials must not be '.
+                            'set to true in order to prevent CSRF';
+                    throw new SecurityException($msg);
+                }
+            }
 
-			$origin = $this->request->server['HTTP_ORIGIN'];
-			$response->addHeader('Access-Control-Allow-Origin', $origin);
-		}
-		return $response;
-	}
+            $origin = $this->request->server['HTTP_ORIGIN'];
+            $response->addHeader('Access-Control-Allow-Origin', $origin);
+        }
+        return $response;
+    }
 
-	/**
-	 * If an SecurityException is being caught return a JSON error response
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param \Exception $exception the thrown exception
-	 * @throws \Exception the passed in exception if it can't handle it
-	 * @return Response a Response object or null in case that the exception could not be handled
-	 */
-	public function afterException(Controller $controller, $methodName, \Exception $exception){
-		if($exception instanceof SecurityException){
-			$response =  new JSONResponse(['message' => $exception->getMessage()]);
-			if($exception->getCode() !== 0) {
-				$response->setStatus($exception->getCode());
-			} else {
-				$response->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);
-			}
-			return $response;
-		}
+    /**
+     * If an SecurityException is being caught return a JSON error response
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param \Exception $exception the thrown exception
+     * @throws \Exception the passed in exception if it can't handle it
+     * @return Response a Response object or null in case that the exception could not be handled
+     */
+    public function afterException(Controller $controller, $methodName, \Exception $exception){
+        if($exception instanceof SecurityException){
+            $response =  new JSONResponse(['message' => $exception->getMessage()]);
+            if($exception->getCode() !== 0) {
+                $response->setStatus($exception->getCode());
+            } else {
+                $response->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);
+            }
+            return $response;
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 
 }

Spacing +10 added lines, -10 removed lines

@@ -80,11 +80,11 @@ 
 	 * @throws SecurityException
 	 * @since 6.0.0
 	 */
-	public function beforeController(Controller $controller, $methodName){
+	public function beforeController(Controller $controller, $methodName) {
 		// ensure that @CORS annotated API routes are not used in conjunction
 		// with session authentication since this enables CSRF attack vectors
 		if ($this->reflector->hasAnnotation('CORS') &&
-			!$this->reflector->hasAnnotation('PublicPage'))  {
+			!$this->reflector->hasAnnotation('PublicPage')) {
 			$user = $this->request->server['PHP_AUTH_USER'];
 			$pass = $this->request->server['PHP_AUTH_PW'];
 
@@ -110,16 +110,16 @@ 
 	 * @return Response a Response object
 	 * @throws SecurityException
 	 */
-	public function afterController(Controller $controller, $methodName, Response $response){
+	public function afterController(Controller $controller, $methodName, Response $response) {
 		// only react if its a CORS request and if the request sends origin and
 
-		if(isset($this->request->server['HTTP_ORIGIN']) &&
+		if (isset($this->request->server['HTTP_ORIGIN']) &&
 			$this->reflector->hasAnnotation('CORS')) {
 
 			// allow credentials headers must not be true or CSRF is possible
 			// otherwise
-			foreach($response->getHeaders() as $header => $value) {
-				if(strtolower($header) === 'access-control-allow-credentials' &&
+			foreach ($response->getHeaders() as $header => $value) {
+				if (strtolower($header) === 'access-control-allow-credentials' &&
 				   strtolower(trim($value)) === 'true') {
 					$msg = 'Access-Control-Allow-Credentials must not be '.
 						   'set to true in order to prevent CSRF';
@@ -143,10 +143,10 @@ 
 	 * @throws \Exception the passed in exception if it can't handle it
 	 * @return Response a Response object or null in case that the exception could not be handled
 	 */
-	public function afterException(Controller $controller, $methodName, \Exception $exception){
-		if($exception instanceof SecurityException){
-			$response =  new JSONResponse(['message' => $exception->getMessage()]);
-			if($exception->getCode() !== 0) {
+	public function afterException(Controller $controller, $methodName, \Exception $exception) {
+		if ($exception instanceof SecurityException) {
+			$response = new JSONResponse(['message' => $exception->getMessage()]);
+			if ($exception->getCode() !== 0) {
 				$response->setStatus($exception->getCode());
 			} else {
 				$response->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);