Completed
Push — stable13 ( 61f20e...fb2de4 )
by Roeland
11:34 queued 10s
created
lib/private/Security/Bruteforce/Throttler.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	private function getCutoff($expire) {
83 83
 		$d1 = new \DateTime();
84 84
 		$d2 = clone $d1;
85
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
85
+		$d2->sub(new \DateInterval('PT'.$expire.'S'));
86 86
 		return $d2->diff($d1);
87 87
 	}
88 88
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 									$ip,
99 99
 									array $metadata = []) {
100 100
 		// No need to log if the bruteforce protection is disabled
101
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
101
+		if ($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
102 102
 			return;
103 103
 		}
104 104
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 		$values = [
107 107
 			'action' => $action,
108 108
 			'occurred' => $this->timeFactory->getTime(),
109
-			'ip' => (string)$ipAddress,
109
+			'ip' => (string) $ipAddress,
110 110
 			'subnet' => $ipAddress->getSubnet(),
111 111
 			'metadata' => json_encode($metadata),
112 112
 		];
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 
125 125
 		$qb = $this->db->getQueryBuilder();
126 126
 		$qb->insert('bruteforce_attempts');
127
-		foreach($values as $column => $value) {
127
+		foreach ($values as $column => $value) {
128 128
 			$qb->setValue($column, $qb->createNamedParameter($value));
129 129
 		}
130 130
 		$qb->execute();
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	 * @return bool
138 138
 	 */
139 139
 	private function isIPWhitelisted($ip) {
140
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
140
+		if ($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
141 141
 			return true;
142 142
 		}
143 143
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 
163 163
 			$cx = explode('/', $cidr);
164 164
 			$addr = $cx[0];
165
-			$mask = (int)$cx[1];
165
+			$mask = (int) $cx[1];
166 166
 
167 167
 			// Do not compare ipv4 to ipv6
168 168
 			if (($type === 4 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ||
@@ -173,9 +173,9 @@  discard block
 block discarded – undo
173 173
 			$addr = inet_pton($addr);
174 174
 
175 175
 			$valid = true;
176
-			for($i = 0; $i < $mask; $i++) {
177
-				$part = ord($addr[(int)($i/8)]);
178
-				$orig = ord($ip[(int)($i/8)]);
176
+			for ($i = 0; $i < $mask; $i++) {
177
+				$part = ord($addr[(int) ($i / 8)]);
178
+				$orig = ord($ip[(int) ($i / 8)]);
179 179
 
180 180
 				$part = $part & (15 << (1 - ($i % 2)));
181 181
 				$orig = $orig & (15 << (1 - ($i % 2)));
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 	 */
205 205
 	public function getDelay($ip, $action = '') {
206 206
 		$ipAddress = new IpAddress($ip);
207
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
207
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
208 208
 			return 0;
209 209
 		}
210 210
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 
231 231
 		$maxDelay = 25;
232 232
 		$firstDelay = 0.1;
233
-		if ($attempts > (8 * PHP_INT_SIZE - 1))  {
233
+		if ($attempts > (8 * PHP_INT_SIZE - 1)) {
234 234
 			// Don't ever overflow. Just assume the maxDelay time:s
235 235
 			$firstDelay = $maxDelay;
236 236
 		} else {
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	 */
252 252
 	public function resetDelay($ip, $action, $metadata) {
253 253
 		$ipAddress = new IpAddress($ip);
254
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
254
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
255 255
 			return;
256 256
 		}
257 257
 
Please login to merge, or discard this patch.