nextcloud / server

lib/private/Security/RateLimiting/Backend/IBackend.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
  *

Indentation +21 added lines, -21 removed lines

@@ -33,26 +33,26 @@
  * @package OC\Security\RateLimiting\Backend
  */
 interface IBackend {
-	/**
-	 * Gets the amount of attempts within the last specified seconds
-	 *
-	 * @param string $methodIdentifier Identifier for the method
-	 * @param string $userIdentifier Identifier for the user
-	 * @param int $seconds Seconds to look back at
-	 * @return int
-	 */
-	public function getAttempts(string $methodIdentifier,
-								string $userIdentifier,
-								int $seconds): int;
+    /**
+     * Gets the amount of attempts within the last specified seconds
+     *
+     * @param string $methodIdentifier Identifier for the method
+     * @param string $userIdentifier Identifier for the user
+     * @param int $seconds Seconds to look back at
+     * @return int
+     */
+    public function getAttempts(string $methodIdentifier,
+                                string $userIdentifier,
+                                int $seconds): int;
 
-	/**
-	 * Registers an attempt
-	 *
-	 * @param string $methodIdentifier Identifier for the method
-	 * @param string $userIdentifier Identifier for the user
-	 * @param int $period Period in seconds how long this attempt should be stored
-	 */
-	public function registerAttempt(string $methodIdentifier,
-									string $userIdentifier,
-									int $period);
+    /**
+     * Registers an attempt
+     *
+     * @param string $methodIdentifier Identifier for the method
+     * @param string $userIdentifier Identifier for the user
+     * @param int $period Period in seconds how long this attempt should be stored
+     */
+    public function registerAttempt(string $methodIdentifier,
+                                    string $userIdentifier,
+                                    int $period);
 }

lib/private/Security/RateLimiting/Limiter.php

Indentation +67 added lines, -67 removed lines

@@ -34,77 +34,77 @@
 use OCP\IUserSession;
 
 class Limiter {
-	/** @var IBackend */
-	private $backend;
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var IBackend */
+    private $backend;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * @param IUserSession $userSession
-	 * @param IRequest $request
-	 * @param ITimeFactory $timeFactory
-	 * @param IBackend $backend
-	 */
-	public function __construct(IUserSession $userSession,
-								IRequest $request,
-								ITimeFactory $timeFactory,
-								IBackend $backend) {
-		$this->backend = $backend;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * @param IUserSession $userSession
+     * @param IRequest $request
+     * @param ITimeFactory $timeFactory
+     * @param IBackend $backend
+     */
+    public function __construct(IUserSession $userSession,
+                                IRequest $request,
+                                ITimeFactory $timeFactory,
+                                IBackend $backend) {
+        $this->backend = $backend;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param string $methodIdentifier
-	 * @param string $userIdentifier
-	 * @param int $period
-	 * @param int $limit
-	 * @throws RateLimitExceededException
-	 */
-	private function register(string $methodIdentifier,
-							  string $userIdentifier,
-							  int $period,
-							  int $limit) {
-		$existingAttempts = $this->backend->getAttempts($methodIdentifier, $userIdentifier, $period);
-		if ($existingAttempts >= $limit) {
-			throw new RateLimitExceededException();
-		}
+    /**
+     * @param string $methodIdentifier
+     * @param string $userIdentifier
+     * @param int $period
+     * @param int $limit
+     * @throws RateLimitExceededException
+     */
+    private function register(string $methodIdentifier,
+                                string $userIdentifier,
+                                int $period,
+                                int $limit) {
+        $existingAttempts = $this->backend->getAttempts($methodIdentifier, $userIdentifier, $period);
+        if ($existingAttempts >= $limit) {
+            throw new RateLimitExceededException();
+        }
 
-		$this->backend->registerAttempt($methodIdentifier, $userIdentifier, $this->timeFactory->getTime());
-	}
+        $this->backend->registerAttempt($methodIdentifier, $userIdentifier, $this->timeFactory->getTime());
+    }
 
-	/**
-	 * Registers attempt for an anonymous request
-	 *
-	 * @param string $identifier
-	 * @param int $anonLimit
-	 * @param int $anonPeriod
-	 * @param string $ip
-	 * @throws RateLimitExceededException
-	 */
-	public function registerAnonRequest(string $identifier,
-										int $anonLimit,
-										int $anonPeriod,
-										string $ip) {
-		$ipSubnet = (new IpAddress($ip))->getSubnet();
+    /**
+     * Registers attempt for an anonymous request
+     *
+     * @param string $identifier
+     * @param int $anonLimit
+     * @param int $anonPeriod
+     * @param string $ip
+     * @throws RateLimitExceededException
+     */
+    public function registerAnonRequest(string $identifier,
+                                        int $anonLimit,
+                                        int $anonPeriod,
+                                        string $ip) {
+        $ipSubnet = (new IpAddress($ip))->getSubnet();
 
-		$anonHashIdentifier = hash('sha512', 'anon::' . $identifier . $ipSubnet);
-		$this->register($identifier, $anonHashIdentifier, $anonPeriod, $anonLimit);
-	}
+        $anonHashIdentifier = hash('sha512', 'anon::' . $identifier . $ipSubnet);
+        $this->register($identifier, $anonHashIdentifier, $anonPeriod, $anonLimit);
+    }
 
-	/**
-	 * Registers attempt for an authenticated request
-	 *
-	 * @param string $identifier
-	 * @param int $userLimit
-	 * @param int $userPeriod
-	 * @param IUser $user
-	 * @throws RateLimitExceededException
-	 */
-	public function registerUserRequest(string $identifier,
-										int $userLimit,
-										int $userPeriod,
-										IUser $user) {
-		$userHashIdentifier = hash('sha512', 'user::' . $identifier . $user->getUID());
-		$this->register($identifier, $userHashIdentifier, $userPeriod, $userLimit);
-	}
+    /**
+     * Registers attempt for an authenticated request
+     *
+     * @param string $identifier
+     * @param int $userLimit
+     * @param int $userPeriod
+     * @param IUser $user
+     * @throws RateLimitExceededException
+     */
+    public function registerUserRequest(string $identifier,
+                                        int $userLimit,
+                                        int $userPeriod,
+                                        IUser $user) {
+        $userHashIdentifier = hash('sha512', 'user::' . $identifier . $user->getUID());
+        $this->register($identifier, $userHashIdentifier, $userPeriod, $userLimit);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
  *
@@ -86,7 +86,7 @@ 
 										string $ip) {
 		$ipSubnet = (new IpAddress($ip))->getSubnet();
 
-		$anonHashIdentifier = hash('sha512', 'anon::' . $identifier . $ipSubnet);
+		$anonHashIdentifier = hash('sha512', 'anon::'.$identifier.$ipSubnet);
 		$this->register($identifier, $anonHashIdentifier, $anonPeriod, $anonLimit);
 	}
 
@@ -103,7 +103,7 @@ 
 										int $userLimit,
 										int $userPeriod,
 										IUser $user) {
-		$userHashIdentifier = hash('sha512', 'user::' . $identifier . $user->getUID());
+		$userHashIdentifier = hash('sha512', 'user::'.$identifier.$user->getUID());
 		$this->register($identifier, $userHashIdentifier, $userPeriod, $userLimit);
 	}
 }

lib/private/Security/RateLimiting/Backend/MemoryCache.php

Indentation +75 added lines, -75 removed lines

@@ -36,90 +36,90 @@
  * @package OC\Security\RateLimiting\Backend
  */
 class MemoryCache implements IBackend {
-	/** @var ICache */
-	private $cache;
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ICache */
+    private $cache;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * @param ICacheFactory $cacheFactory
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ICacheFactory $cacheFactory,
-								ITimeFactory $timeFactory) {
-		$this->cache = $cacheFactory->createDistributed(__CLASS__);
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * @param ICacheFactory $cacheFactory
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ICacheFactory $cacheFactory,
+                                ITimeFactory $timeFactory) {
+        $this->cache = $cacheFactory->createDistributed(__CLASS__);
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param string $methodIdentifier
-	 * @param string $userIdentifier
-	 * @return string
-	 */
-	private function hash(string $methodIdentifier,
-						  string $userIdentifier): string {
-		return hash('sha512', $methodIdentifier . $userIdentifier);
-	}
+    /**
+     * @param string $methodIdentifier
+     * @param string $userIdentifier
+     * @return string
+     */
+    private function hash(string $methodIdentifier,
+                            string $userIdentifier): string {
+        return hash('sha512', $methodIdentifier . $userIdentifier);
+    }
 
-	/**
-	 * @param string $identifier
-	 * @return array
-	 */
-	private function getExistingAttempts(string $identifier): array {
-		$cachedAttempts = $this->cache->get($identifier);
-		if ($cachedAttempts === null) {
-			return [];
-		}
+    /**
+     * @param string $identifier
+     * @return array
+     */
+    private function getExistingAttempts(string $identifier): array {
+        $cachedAttempts = $this->cache->get($identifier);
+        if ($cachedAttempts === null) {
+            return [];
+        }
 
-		$cachedAttempts = json_decode($cachedAttempts, true);
-		if(\is_array($cachedAttempts)) {
-			return $cachedAttempts;
-		}
+        $cachedAttempts = json_decode($cachedAttempts, true);
+        if(\is_array($cachedAttempts)) {
+            return $cachedAttempts;
+        }
 
-		return [];
-	}
+        return [];
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAttempts(string $methodIdentifier,
-								string $userIdentifier,
-								int $seconds): int {
-		$identifier = $this->hash($methodIdentifier, $userIdentifier);
-		$existingAttempts = $this->getExistingAttempts($identifier);
+    /**
+     * {@inheritDoc}
+     */
+    public function getAttempts(string $methodIdentifier,
+                                string $userIdentifier,
+                                int $seconds): int {
+        $identifier = $this->hash($methodIdentifier, $userIdentifier);
+        $existingAttempts = $this->getExistingAttempts($identifier);
 
-		$count = 0;
-		$currentTime = $this->timeFactory->getTime();
-		/** @var array $existingAttempts */
-		foreach ($existingAttempts as $attempt) {
-			if(($attempt + $seconds) > $currentTime) {
-				$count++;
-			}
-		}
+        $count = 0;
+        $currentTime = $this->timeFactory->getTime();
+        /** @var array $existingAttempts */
+        foreach ($existingAttempts as $attempt) {
+            if(($attempt + $seconds) > $currentTime) {
+                $count++;
+            }
+        }
 
-		return $count;
-	}
+        return $count;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function registerAttempt(string $methodIdentifier,
-									string $userIdentifier,
-									int $period) {
-		$identifier = $this->hash($methodIdentifier, $userIdentifier);
-		$existingAttempts = $this->getExistingAttempts($identifier);
-		$currentTime = $this->timeFactory->getTime();
+    /**
+     * {@inheritDoc}
+     */
+    public function registerAttempt(string $methodIdentifier,
+                                    string $userIdentifier,
+                                    int $period) {
+        $identifier = $this->hash($methodIdentifier, $userIdentifier);
+        $existingAttempts = $this->getExistingAttempts($identifier);
+        $currentTime = $this->timeFactory->getTime();
 
-		// Unset all attempts older than $period
-		foreach ($existingAttempts as $key => $attempt) {
-			if(($attempt + $period) < $currentTime) {
-				unset($existingAttempts[$key]);
-			}
-		}
-		$existingAttempts = array_values($existingAttempts);
+        // Unset all attempts older than $period
+        foreach ($existingAttempts as $key => $attempt) {
+            if(($attempt + $period) < $currentTime) {
+                unset($existingAttempts[$key]);
+            }
+        }
+        $existingAttempts = array_values($existingAttempts);
 
-		// Store the new attempt
-		$existingAttempts[] = (string)$currentTime;
-		$this->cache->set($identifier, json_encode($existingAttempts));
-	}
+        // Store the new attempt
+        $existingAttempts[] = (string)$currentTime;
+        $this->cache->set($identifier, json_encode($existingAttempts));
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
  *
@@ -57,7 +57,7 @@ 
 	 */
 	private function hash(string $methodIdentifier,
 						  string $userIdentifier): string {
-		return hash('sha512', $methodIdentifier . $userIdentifier);
+		return hash('sha512', $methodIdentifier.$userIdentifier);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 		}
 
 		$cachedAttempts = json_decode($cachedAttempts, true);
-		if(\is_array($cachedAttempts)) {
+		if (\is_array($cachedAttempts)) {
 			return $cachedAttempts;
 		}
 
@@ -91,7 +91,7 @@ 
 		$currentTime = $this->timeFactory->getTime();
 		/** @var array $existingAttempts */
 		foreach ($existingAttempts as $attempt) {
-			if(($attempt + $seconds) > $currentTime) {
+			if (($attempt + $seconds) > $currentTime) {
 				$count++;
 			}
 		}
@@ -111,14 +111,14 @@ 
 
 		// Unset all attempts older than $period
 		foreach ($existingAttempts as $key => $attempt) {
-			if(($attempt + $period) < $currentTime) {
+			if (($attempt + $period) < $currentTime) {
 				unset($existingAttempts[$key]);
 			}
 		}
 		$existingAttempts = array_values($existingAttempts);
 
 		// Store the new attempt
-		$existingAttempts[] = (string)$currentTime;
+		$existingAttempts[] = (string) $currentTime;
 		$this->cache->set($identifier, json_encode($existingAttempts));
 	}
 }

lib/private/Security/RateLimiting/Exception/RateLimitExceededException.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
  *