Inspection of "Merge pull request #38274 from nextcloud/bugfix/no..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 128cd7...5e02de )

by Joas

created 2023-05-16 09:07 UTC

Status

Indentation +97 added lines, -97 removed lines patch added patch discarded remove patch

@@ -51,101 +51,101 @@
 block discarded – undo
  * @package OC\AppFramework\Middleware\Security
  */
 class BruteForceMiddleware extends Middleware {
-	public function __construct(
-		protected ControllerMethodReflector $reflector,
-		protected Throttler $throttler,
-		protected IRequest $request,
-		protected LoggerInterface $logger,
-	) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function beforeController($controller, $methodName) {
-		parent::beforeController($controller, $methodName);
-
-		if ($this->reflector->hasAnnotation('BruteForceProtection')) {
-			$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
-			$this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), $action);
-		} else {
-			$reflectionMethod = new ReflectionMethod($controller, $methodName);
-			$attributes = $reflectionMethod->getAttributes(BruteForceProtection::class);
-
-			if (!empty($attributes)) {
-				$remoteAddress = $this->request->getRemoteAddress();
-
-				foreach ($attributes as $attribute) {
-					/** @var BruteForceProtection $protection */
-					$protection = $attribute->newInstance();
-					$action = $protection->getAction();
-					$this->throttler->sleepDelayOrThrowOnMax($remoteAddress, $action);
-				}
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if ($response->isThrottled()) {
-			try {
-				if ($this->reflector->hasAnnotation('BruteForceProtection')) {
-					$action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
-					$ip = $this->request->getRemoteAddress();
-					$this->throttler->registerAttempt($action, $ip, $response->getThrottleMetadata());
-					$this->throttler->sleepDelayOrThrowOnMax($ip, $action);
-				} else {
-					$reflectionMethod = new ReflectionMethod($controller, $methodName);
-					$attributes = $reflectionMethod->getAttributes(BruteForceProtection::class);
-
-					if (!empty($attributes)) {
-						$ip = $this->request->getRemoteAddress();
-						$metaData = $response->getThrottleMetadata();
-
-						foreach ($attributes as $attribute) {
-							/** @var BruteForceProtection $protection */
-							$protection = $attribute->newInstance();
-							$action = $protection->getAction();
-
-							if (!isset($metaData['action']) || $metaData['action'] === $action) {
-								$this->throttler->registerAttempt($action, $ip, $metaData);
-								$this->throttler->sleepDelayOrThrowOnMax($ip, $action);
-							}
-						}
-					} else {
-						$this->logger->debug('Response for ' . get_class($controller) . '::' . $methodName . ' got bruteforce throttled but has no annotation nor attribute defined.');
-					}
-				}
-			} catch (MaxDelayReached $e) {
-				if ($controller instanceof OCSController) {
-					throw new OCSException($e->getMessage(), Http::STATUS_TOO_MANY_REQUESTS);
-				}
-
-				return new TooManyRequestsResponse();
-			}
-		}
-
-		return parent::afterController($controller, $methodName, $response);
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return Response
-	 */
-	public function afterException($controller, $methodName, \Exception $exception): Response {
-		if ($exception instanceof MaxDelayReached) {
-			if ($controller instanceof OCSController) {
-				throw new OCSException($exception->getMessage(), Http::STATUS_TOO_MANY_REQUESTS);
-			}
-
-			return new TooManyRequestsResponse();
-		}
-
-		throw $exception;
-	}
+    public function __construct(
+        protected ControllerMethodReflector $reflector,
+        protected Throttler $throttler,
+        protected IRequest $request,
+        protected LoggerInterface $logger,
+    ) {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function beforeController($controller, $methodName) {
+        parent::beforeController($controller, $methodName);
+
+        if ($this->reflector->hasAnnotation('BruteForceProtection')) {
+            $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
+            $this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), $action);
+        } else {
+            $reflectionMethod = new ReflectionMethod($controller, $methodName);
+            $attributes = $reflectionMethod->getAttributes(BruteForceProtection::class);
+
+            if (!empty($attributes)) {
+                $remoteAddress = $this->request->getRemoteAddress();
+
+                foreach ($attributes as $attribute) {
+                    /** @var BruteForceProtection $protection */
+                    $protection = $attribute->newInstance();
+                    $action = $protection->getAction();
+                    $this->throttler->sleepDelayOrThrowOnMax($remoteAddress, $action);
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if ($response->isThrottled()) {
+            try {
+                if ($this->reflector->hasAnnotation('BruteForceProtection')) {
+                    $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
+                    $ip = $this->request->getRemoteAddress();
+                    $this->throttler->registerAttempt($action, $ip, $response->getThrottleMetadata());
+                    $this->throttler->sleepDelayOrThrowOnMax($ip, $action);
+                } else {
+                    $reflectionMethod = new ReflectionMethod($controller, $methodName);
+                    $attributes = $reflectionMethod->getAttributes(BruteForceProtection::class);
+
+                    if (!empty($attributes)) {
+                        $ip = $this->request->getRemoteAddress();
+                        $metaData = $response->getThrottleMetadata();
+
+                        foreach ($attributes as $attribute) {
+                            /** @var BruteForceProtection $protection */
+                            $protection = $attribute->newInstance();
+                            $action = $protection->getAction();
+
+                            if (!isset($metaData['action']) || $metaData['action'] === $action) {
+                                $this->throttler->registerAttempt($action, $ip, $metaData);
+                                $this->throttler->sleepDelayOrThrowOnMax($ip, $action);
+                            }
+                        }
+                    } else {
+                        $this->logger->debug('Response for ' . get_class($controller) . '::' . $methodName . ' got bruteforce throttled but has no annotation nor attribute defined.');
+                    }
+                }
+            } catch (MaxDelayReached $e) {
+                if ($controller instanceof OCSController) {
+                    throw new OCSException($e->getMessage(), Http::STATUS_TOO_MANY_REQUESTS);
+                }
+
+                return new TooManyRequestsResponse();
+            }
+        }
+
+        return parent::afterController($controller, $methodName, $response);
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return Response
+     */
+    public function afterException($controller, $methodName, \Exception $exception): Response {
+        if ($exception instanceof MaxDelayReached) {
+            if ($controller instanceof OCSController) {
+                throw new OCSException($exception->getMessage(), Http::STATUS_TOO_MANY_REQUESTS);
+            }
+
+            return new TooManyRequestsResponse();
+        }
+
+        throw $exception;
+    }
 }

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -115,7 +115,7 @@
 block discarded – undo
 							}
 						}
 					} else {
-						$this->logger->debug('Response for ' . get_class($controller) . '::' . $methodName . ' got bruteforce throttled but has no annotation nor attribute defined.');
+						$this->logger->debug('Response for '.get_class($controller).'::'.$methodName.' got bruteforce throttled but has no annotation nor attribute defined.');
 					}
 				}
 			} catch (MaxDelayReached $e) {

Please login to merge, or discard this patch.

		@@ -51,101 +51,101 @@
		block discarded – undo
51	51	* @package OC\AppFramework\Middleware\Security
52	52	*/
53	53	class BruteForceMiddleware extends Middleware {
54		- public function __construct(
55		- protected ControllerMethodReflector $reflector,
56		- protected Throttler $throttler,
57		- protected IRequest $request,
58		- protected LoggerInterface $logger,
59		- ) {
60		- }
61		-
62		- /**
63		- * {@inheritDoc}
64		- */
65		- public function beforeController($controller, $methodName) {
66		- parent::beforeController($controller, $methodName);
67		-
68		- if ($this->reflector->hasAnnotation('BruteForceProtection')) {
69		- $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
70		- $this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), $action);
71		- } else {
72		- $reflectionMethod = new ReflectionMethod($controller, $methodName);
73		- $attributes = $reflectionMethod->getAttributes(BruteForceProtection::class);
74		-
75		- if (!empty($attributes)) {
76		- $remoteAddress = $this->request->getRemoteAddress();
77		-
78		- foreach ($attributes as $attribute) {
79		- /** @var BruteForceProtection $protection */
80		- $protection = $attribute->newInstance();
81		- $action = $protection->getAction();
82		- $this->throttler->sleepDelayOrThrowOnMax($remoteAddress, $action);
83		- }
84		- }
85		- }
86		- }
87		-
88		- /**
89		- * {@inheritDoc}
90		- */
91		- public function afterController($controller, $methodName, Response $response) {
92		- if ($response->isThrottled()) {
93		- try {
94		- if ($this->reflector->hasAnnotation('BruteForceProtection')) {
95		- $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
96		- $ip = $this->request->getRemoteAddress();
97		- $this->throttler->registerAttempt($action, $ip, $response->getThrottleMetadata());
98		- $this->throttler->sleepDelayOrThrowOnMax($ip, $action);
99		- } else {
100		- $reflectionMethod = new ReflectionMethod($controller, $methodName);
101		- $attributes = $reflectionMethod->getAttributes(BruteForceProtection::class);
102		-
103		- if (!empty($attributes)) {
104		- $ip = $this->request->getRemoteAddress();
105		- $metaData = $response->getThrottleMetadata();
106		-
107		- foreach ($attributes as $attribute) {
108		- /** @var BruteForceProtection $protection */
109		- $protection = $attribute->newInstance();
110		- $action = $protection->getAction();
111		-
112		- if (!isset($metaData['action']) \|\| $metaData['action'] === $action) {
113		- $this->throttler->registerAttempt($action, $ip, $metaData);
114		- $this->throttler->sleepDelayOrThrowOnMax($ip, $action);
115		- }
116		- }
117		- } else {
118		- $this->logger->debug('Response for ' . get_class($controller) . '::' . $methodName . ' got bruteforce throttled but has no annotation nor attribute defined.');
119		- }
120		- }
121		- } catch (MaxDelayReached $e) {
122		- if ($controller instanceof OCSController) {
123		- throw new OCSException($e->getMessage(), Http::STATUS_TOO_MANY_REQUESTS);
124		- }
125		-
126		- return new TooManyRequestsResponse();
127		- }
128		- }
129		-
130		- return parent::afterController($controller, $methodName, $response);
131		- }
132		-
133		- /**
134		- * @param Controller $controller
135		- * @param string $methodName
136		- * @param \Exception $exception
137		- * @throws \Exception
138		- * @return Response
139		- */
140		- public function afterException($controller, $methodName, \Exception $exception): Response {
141		- if ($exception instanceof MaxDelayReached) {
142		- if ($controller instanceof OCSController) {
143		- throw new OCSException($exception->getMessage(), Http::STATUS_TOO_MANY_REQUESTS);
144		- }
145		-
146		- return new TooManyRequestsResponse();
147		- }
148		-
149		- throw $exception;
150		- }
	54	+ public function __construct(
	55	+ protected ControllerMethodReflector $reflector,
	56	+ protected Throttler $throttler,
	57	+ protected IRequest $request,
	58	+ protected LoggerInterface $logger,
	59	+ ) {
	60	+ }
	61	+
	62	+ /**
	63	+ * {@inheritDoc}
	64	+ */
	65	+ public function beforeController($controller, $methodName) {
	66	+ parent::beforeController($controller, $methodName);
	67	+
	68	+ if ($this->reflector->hasAnnotation('BruteForceProtection')) {
	69	+ $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
	70	+ $this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), $action);
	71	+ } else {
	72	+ $reflectionMethod = new ReflectionMethod($controller, $methodName);
	73	+ $attributes = $reflectionMethod->getAttributes(BruteForceProtection::class);
	74	+
	75	+ if (!empty($attributes)) {
	76	+ $remoteAddress = $this->request->getRemoteAddress();
	77	+
	78	+ foreach ($attributes as $attribute) {
	79	+ /** @var BruteForceProtection $protection */
	80	+ $protection = $attribute->newInstance();
	81	+ $action = $protection->getAction();
	82	+ $this->throttler->sleepDelayOrThrowOnMax($remoteAddress, $action);
	83	+ }
	84	+ }
	85	+ }
	86	+ }
	87	+
	88	+ /**
	89	+ * {@inheritDoc}
	90	+ */
	91	+ public function afterController($controller, $methodName, Response $response) {
	92	+ if ($response->isThrottled()) {
	93	+ try {
	94	+ if ($this->reflector->hasAnnotation('BruteForceProtection')) {
	95	+ $action = $this->reflector->getAnnotationParameter('BruteForceProtection', 'action');
	96	+ $ip = $this->request->getRemoteAddress();
	97	+ $this->throttler->registerAttempt($action, $ip, $response->getThrottleMetadata());
	98	+ $this->throttler->sleepDelayOrThrowOnMax($ip, $action);
	99	+ } else {
	100	+ $reflectionMethod = new ReflectionMethod($controller, $methodName);
	101	+ $attributes = $reflectionMethod->getAttributes(BruteForceProtection::class);
	102	+
	103	+ if (!empty($attributes)) {
	104	+ $ip = $this->request->getRemoteAddress();
	105	+ $metaData = $response->getThrottleMetadata();
	106	+
	107	+ foreach ($attributes as $attribute) {
	108	+ /** @var BruteForceProtection $protection */
	109	+ $protection = $attribute->newInstance();
	110	+ $action = $protection->getAction();
	111	+
	112	+ if (!isset($metaData['action']) \|\| $metaData['action'] === $action) {
	113	+ $this->throttler->registerAttempt($action, $ip, $metaData);
	114	+ $this->throttler->sleepDelayOrThrowOnMax($ip, $action);
	115	+ }
	116	+ }
	117	+ } else {
	118	+ $this->logger->debug('Response for ' . get_class($controller) . '::' . $methodName . ' got bruteforce throttled but has no annotation nor attribute defined.');
	119	+ }
	120	+ }
	121	+ } catch (MaxDelayReached $e) {
	122	+ if ($controller instanceof OCSController) {
	123	+ throw new OCSException($e->getMessage(), Http::STATUS_TOO_MANY_REQUESTS);
	124	+ }
	125	+
	126	+ return new TooManyRequestsResponse();
	127	+ }
	128	+ }
	129	+
	130	+ return parent::afterController($controller, $methodName, $response);
	131	+ }
	132	+
	133	+ /**
	134	+ * @param Controller $controller
	135	+ * @param string $methodName
	136	+ * @param \Exception $exception
	137	+ * @throws \Exception
	138	+ * @return Response
	139	+ */
	140	+ public function afterException($controller, $methodName, \Exception $exception): Response {
	141	+ if ($exception instanceof MaxDelayReached) {
	142	+ if ($controller instanceof OCSController) {
	143	+ throw new OCSException($exception->getMessage(), Http::STATUS_TOO_MANY_REQUESTS);
	144	+ }
	145	+
	146	+ return new TooManyRequestsResponse();
	147	+ }
	148	+
	149	+ throw $exception;
	150	+ }
151	151	}

		@@ -115,7 +115,7 @@
		block discarded – undo
115	115	}
116	116	}
117	117	} else {
118		- $this->logger->debug('Response for ' . get_class($controller) . '::' . $methodName . ' got bruteforce throttled but has no annotation nor attribute defined.');
	118	+ $this->logger->debug('Response for '.get_class($controller).'::'.$methodName.' got bruteforce throttled but has no annotation nor attribute defined.');
119	119	}
120	120	}
121	121	} catch (MaxDelayReached $e) {

nextcloud / server

Push — master ( 128cd7...5e02de )

Status

Category

Indentation +97 added lines, -97 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch