nextcloud / server

lib/private/Security/CSRF/CsrfTokenGenerator.php

Indentation +17 added lines, -17 removed lines

@@ -31,23 +31,23 @@
  * @package OC\Security\CSRF
  */
 class CsrfTokenGenerator {
-	/** @var ISecureRandom  */
-	private $random;
+    /** @var ISecureRandom  */
+    private $random;
 
-	/**
-	 * @param ISecureRandom $random
-	 */
-	public function __construct(ISecureRandom $random) {
-		$this->random = $random;
-	}
+    /**
+     * @param ISecureRandom $random
+     */
+    public function __construct(ISecureRandom $random) {
+        $this->random = $random;
+    }
 
-	/**
-	 * Generate a new CSRF token.
-	 *
-	 * @param int $length Length of the token in characters.
-	 * @return string
-	 */
-	public function generateToken($length = 32) {
-		return $this->random->generate($length);
-	}
+    /**
+     * Generate a new CSRF token.
+     *
+     * @param int $length Length of the token in characters.
+     * @return string
+     */
+    public function generateToken($length = 32) {
+        return $this->random->generate($length);
+    }
 }

lib/private/Security/Crypto.php

Indentation +88 added lines, -88 removed lines

@@ -43,93 +43,93 @@
  * @package OC\Security
  */
 class Crypto implements ICrypto {
-	/** @var AES $cipher */
-	private $cipher;
-	/** @var int */
-	private $ivLength = 16;
-	/** @var IConfig */
-	private $config;
-	/** @var ISecureRandom */
-	private $random;
-
-	/**
-	 * @param IConfig $config
-	 * @param ISecureRandom $random
-	 */
-	function __construct(IConfig $config, ISecureRandom $random) {
-		$this->cipher = new AES();
-		$this->config = $config;
-		$this->random = $random;
-	}
-
-	/**
-	 * @param string $message The message to authenticate
-	 * @param string $password Password to use (defaults to `secret` in config.php)
-	 * @return string Calculated HMAC
-	 */
-	public function calculateHMAC($message, $password = '') {
-		if($password === '') {
-			$password = $this->config->getSystemValue('secret');
-		}
-
-		// Append an "a" behind the password and hash it to prevent reusing the same password as for encryption
-		$password = hash('sha512', $password . 'a');
-
-		$hash = new Hash('sha512');
-		$hash->setKey($password);
-		return $hash->hash($message);
-	}
-
-	/**
-	 * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
-	 * @param string $plaintext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string Authenticated ciphertext
-	 */
-	public function encrypt($plaintext, $password = '') {
-		if($password === '') {
-			$password = $this->config->getSystemValue('secret');
-		}
-		$this->cipher->setPassword($password);
-
-		$iv = $this->random->generate($this->ivLength);
-		$this->cipher->setIV($iv);
-
-		$ciphertext = bin2hex($this->cipher->encrypt($plaintext));
-		$hmac = bin2hex($this->calculateHMAC($ciphertext.$iv, $password));
-
-		return $ciphertext.'|'.$iv.'|'.$hmac;
-	}
-
-	/**
-	 * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
-	 * @param string $authenticatedCiphertext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string plaintext
-	 * @throws \Exception If the HMAC does not match
-	 */
-	public function decrypt($authenticatedCiphertext, $password = '') {
-		if($password === '') {
-			$password = $this->config->getSystemValue('secret');
-		}
-		$this->cipher->setPassword($password);
-
-		$parts = explode('|', $authenticatedCiphertext);
-		if(sizeof($parts) !== 3) {
-			throw new \Exception('Authenticated ciphertext could not be decoded.');
-		}
-
-		$ciphertext = hex2bin($parts[0]);
-		$iv = $parts[1];
-		$hmac = hex2bin($parts[2]);
-
-		$this->cipher->setIV($iv);
-
-		if(!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
-			throw new \Exception('HMAC does not match.');
-		}
-
-		return $this->cipher->decrypt($ciphertext);
-	}
+    /** @var AES $cipher */
+    private $cipher;
+    /** @var int */
+    private $ivLength = 16;
+    /** @var IConfig */
+    private $config;
+    /** @var ISecureRandom */
+    private $random;
+
+    /**
+     * @param IConfig $config
+     * @param ISecureRandom $random
+     */
+    function __construct(IConfig $config, ISecureRandom $random) {
+        $this->cipher = new AES();
+        $this->config = $config;
+        $this->random = $random;
+    }
+
+    /**
+     * @param string $message The message to authenticate
+     * @param string $password Password to use (defaults to `secret` in config.php)
+     * @return string Calculated HMAC
+     */
+    public function calculateHMAC($message, $password = '') {
+        if($password === '') {
+            $password = $this->config->getSystemValue('secret');
+        }
+
+        // Append an "a" behind the password and hash it to prevent reusing the same password as for encryption
+        $password = hash('sha512', $password . 'a');
+
+        $hash = new Hash('sha512');
+        $hash->setKey($password);
+        return $hash->hash($message);
+    }
+
+    /**
+     * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
+     * @param string $plaintext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string Authenticated ciphertext
+     */
+    public function encrypt($plaintext, $password = '') {
+        if($password === '') {
+            $password = $this->config->getSystemValue('secret');
+        }
+        $this->cipher->setPassword($password);
+
+        $iv = $this->random->generate($this->ivLength);
+        $this->cipher->setIV($iv);
+
+        $ciphertext = bin2hex($this->cipher->encrypt($plaintext));
+        $hmac = bin2hex($this->calculateHMAC($ciphertext.$iv, $password));
+
+        return $ciphertext.'|'.$iv.'|'.$hmac;
+    }
+
+    /**
+     * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
+     * @param string $authenticatedCiphertext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string plaintext
+     * @throws \Exception If the HMAC does not match
+     */
+    public function decrypt($authenticatedCiphertext, $password = '') {
+        if($password === '') {
+            $password = $this->config->getSystemValue('secret');
+        }
+        $this->cipher->setPassword($password);
+
+        $parts = explode('|', $authenticatedCiphertext);
+        if(sizeof($parts) !== 3) {
+            throw new \Exception('Authenticated ciphertext could not be decoded.');
+        }
+
+        $ciphertext = hex2bin($parts[0]);
+        $iv = $parts[1];
+        $hmac = hex2bin($parts[2]);
+
+        $this->cipher->setIV($iv);
+
+        if(!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
+            throw new \Exception('HMAC does not match.');
+        }
+
+        return $this->cipher->decrypt($ciphertext);
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -68,12 +68,12 @@ 
 	 * @return string Calculated HMAC
 	 */
 	public function calculateHMAC($message, $password = '') {
-		if($password === '') {
+		if ($password === '') {
 			$password = $this->config->getSystemValue('secret');
 		}
 
 		// Append an "a" behind the password and hash it to prevent reusing the same password as for encryption
-		$password = hash('sha512', $password . 'a');
+		$password = hash('sha512', $password.'a');
 
 		$hash = new Hash('sha512');
 		$hash->setKey($password);
@@ -87,7 +87,7 @@ 
 	 * @return string Authenticated ciphertext
 	 */
 	public function encrypt($plaintext, $password = '') {
-		if($password === '') {
+		if ($password === '') {
 			$password = $this->config->getSystemValue('secret');
 		}
 		$this->cipher->setPassword($password);
@@ -109,13 +109,13 @@ 
 	 * @throws \Exception If the HMAC does not match
 	 */
 	public function decrypt($authenticatedCiphertext, $password = '') {
-		if($password === '') {
+		if ($password === '') {
 			$password = $this->config->getSystemValue('secret');
 		}
 		$this->cipher->setPassword($password);
 
 		$parts = explode('|', $authenticatedCiphertext);
-		if(sizeof($parts) !== 3) {
+		if (sizeof($parts) !== 3) {
 			throw new \Exception('Authenticated ciphertext could not be decoded.');
 		}
 
@@ -125,7 +125,7 @@ 
 
 		$this->cipher->setIV($iv);
 
-		if(!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
+		if (!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
 			throw new \Exception('HMAC does not match.');
 		}
 

lib/private/Security/SecureRandom.php

Indentation +44 added lines, -44 removed lines

@@ -37,51 +37,51 @@
  * @package OC\Security
  */
 class SecureRandom implements ISecureRandom {
-	/**
-	 * Convenience method to get a low strength random number generator.
-	 *
-	 * Low Strength should be used anywhere that random strings are needed
-	 * in a non-cryptographical setting. They are not strong enough to be
-	 * used as keys or salts. They are however useful for one-time use tokens.
-	 *
-	 * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
-	 * @return $this
-	 */
-	public function getLowStrengthGenerator() {
-		return $this;
-	}
+    /**
+     * Convenience method to get a low strength random number generator.
+     *
+     * Low Strength should be used anywhere that random strings are needed
+     * in a non-cryptographical setting. They are not strong enough to be
+     * used as keys or salts. They are however useful for one-time use tokens.
+     *
+     * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
+     * @return $this
+     */
+    public function getLowStrengthGenerator() {
+        return $this;
+    }
 
-	/**
-	 * Convenience method to get a medium strength random number generator.
-	 *
-	 * Medium Strength should be used for most needs of a cryptographic nature.
-	 * They are strong enough to be used as keys and salts. However, they do
-	 * take some time and resources to generate, so they should not be over-used
-	 *
-	 * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
-	 * @return $this
-	 */
-	public function getMediumStrengthGenerator() {
-		return $this;
-	}
+    /**
+     * Convenience method to get a medium strength random number generator.
+     *
+     * Medium Strength should be used for most needs of a cryptographic nature.
+     * They are strong enough to be used as keys and salts. However, they do
+     * take some time and resources to generate, so they should not be over-used
+     *
+     * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
+     * @return $this
+     */
+    public function getMediumStrengthGenerator() {
+        return $this;
+    }
 
-	/**
-	 * Generate a random string of specified length.
-	 * @param int $length The length of the generated string
-	 * @param string $characters An optional list of characters to use if no character list is
-	 * 							specified all valid base64 characters are used.
-	 * @return string
-	 */
-	public function generate($length,
-							 $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') {
-		$maxCharIndex = strlen($characters) - 1;
-		$randomString = '';
+    /**
+     * Generate a random string of specified length.
+     * @param int $length The length of the generated string
+     * @param string $characters An optional list of characters to use if no character list is
+     * 							specified all valid base64 characters are used.
+     * @return string
+     */
+    public function generate($length,
+                                $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') {
+        $maxCharIndex = strlen($characters) - 1;
+        $randomString = '';
 
-		while($length > 0) {
-			$randomNumber = \random_int(0, $maxCharIndex);
-			$randomString .= $characters[$randomNumber];
-			$length--;
-		}
-		return $randomString;
-	}
+        while($length > 0) {
+            $randomNumber = \random_int(0, $maxCharIndex);
+            $randomString .= $characters[$randomNumber];
+            $length--;
+        }
+        return $randomString;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		$maxCharIndex = strlen($characters) - 1;
 		$randomString = '';
 
-		while($length > 0) {
+		while ($length > 0) {
 			$randomNumber = \random_int(0, $maxCharIndex);
 			$randomString .= $characters[$randomNumber];
 			$length--;

lib/private/Security/Certificate.php

Indentation +100 added lines, -100 removed lines

@@ -27,104 +27,104 @@
 use OCP\ICertificate;
 
 class Certificate implements ICertificate {
-	protected $name;
-
-	protected $commonName;
-
-	protected $organization;
-
-	protected $serial;
-
-	protected $issueDate;
-
-	protected $expireDate;
-
-	protected $issuerName;
-
-	protected $issuerOrganization;
-
-	/**
-	 * @param string $data base64 encoded certificate
-	 * @param string $name
-	 * @throws \Exception If the certificate could not get parsed
-	 */
-	public function __construct($data, $name) {
-		$this->name = $name;
-		$gmt = new \DateTimeZone('GMT');
-
-		// If string starts with "file://" ignore the certificate
-		$query = 'file://';
-		if(strtolower(substr($data, 0, strlen($query))) === $query) {
-			throw new \Exception('Certificate could not get parsed.');
-		}
-
-		$info = openssl_x509_parse($data);
-		if(!is_array($info)) {
-			throw new \Exception('Certificate could not get parsed.');
-		}
-
-		$this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null;
-		$this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null;
-		$this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt);
-		$this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt);
-		$this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
-		$this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getCommonName() {
-		return $this->commonName;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getOrganization() {
-		return $this->organization;
-	}
-
-	/**
-	 * @return \DateTime
-	 */
-	public function getIssueDate() {
-		return $this->issueDate;
-	}
-
-	/**
-	 * @return \DateTime
-	 */
-	public function getExpireDate() {
-		return $this->expireDate;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isExpired() {
-		$now = new \DateTime();
-		return $this->issueDate > $now or $now > $this->expireDate;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getIssuerName() {
-		return $this->issuerName;
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getIssuerOrganization() {
-		return $this->issuerOrganization;
-	}
+    protected $name;
+
+    protected $commonName;
+
+    protected $organization;
+
+    protected $serial;
+
+    protected $issueDate;
+
+    protected $expireDate;
+
+    protected $issuerName;
+
+    protected $issuerOrganization;
+
+    /**
+     * @param string $data base64 encoded certificate
+     * @param string $name
+     * @throws \Exception If the certificate could not get parsed
+     */
+    public function __construct($data, $name) {
+        $this->name = $name;
+        $gmt = new \DateTimeZone('GMT');
+
+        // If string starts with "file://" ignore the certificate
+        $query = 'file://';
+        if(strtolower(substr($data, 0, strlen($query))) === $query) {
+            throw new \Exception('Certificate could not get parsed.');
+        }
+
+        $info = openssl_x509_parse($data);
+        if(!is_array($info)) {
+            throw new \Exception('Certificate could not get parsed.');
+        }
+
+        $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null;
+        $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null;
+        $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt);
+        $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt);
+        $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
+        $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getCommonName() {
+        return $this->commonName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOrganization() {
+        return $this->organization;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getIssueDate() {
+        return $this->issueDate;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getExpireDate() {
+        return $this->expireDate;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isExpired() {
+        $now = new \DateTime();
+        return $this->issueDate > $now or $now > $this->expireDate;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getIssuerName() {
+        return $this->issuerName;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getIssuerOrganization() {
+        return $this->issuerOrganization;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -54,19 +54,19 @@
 
 		// If string starts with "file://" ignore the certificate
 		$query = 'file://';
-		if(strtolower(substr($data, 0, strlen($query))) === $query) {
+		if (strtolower(substr($data, 0, strlen($query))) === $query) {
 			throw new \Exception('Certificate could not get parsed.');
 		}
 
 		$info = openssl_x509_parse($data);
-		if(!is_array($info)) {
+		if (!is_array($info)) {
 			throw new \Exception('Certificate could not get parsed.');
 		}
 
 		$this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null;
 		$this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null;
-		$this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt);
-		$this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt);
+		$this->issueDate = new \DateTime('@'.$info['validFrom_time_t'], $gmt);
+		$this->expireDate = new \DateTime('@'.$info['validTo_time_t'], $gmt);
 		$this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null;
 		$this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null;
 	}

lib/private/Security/Bruteforce/Throttler.php

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 	private function getCutoff($expire) {
 		$d1 = new \DateTime();
 		$d2 = clone $d1;
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
+		$d2->sub(new \DateInterval('PT'.$expire.'S'));
 		return $d2->diff($d1);
 	}
 
@@ -154,7 +154,7 @@ 
 									$ip,
 									array $metadata = []) {
 		// No need to log if the bruteforce protection is disabled
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
+		if ($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
 			return;
 		}
 
@@ -179,7 +179,7 @@ 
 
 		$qb = $this->db->getQueryBuilder();
 		$qb->insert('bruteforce_attempts');
-		foreach($values as $column => $value) {
+		foreach ($values as $column => $value) {
 			$qb->setValue($column, $qb->createNamedParameter($value));
 		}
 		$qb->execute();
@@ -215,7 +215,7 @@ 
 
 		$maxDelay = 30;
 		$firstDelay = 0.1;
-		if ($attempts > (8 * PHP_INT_SIZE - 1))  {
+		if ($attempts > (8 * PHP_INT_SIZE - 1)) {
 			// Don't ever overflow. Just assume the maxDelay time:s
 			$firstDelay = $maxDelay;
 		} else {

Indentation +187 added lines, -187 removed lines

@@ -42,191 +42,191 @@
  * @package OC\Security\Bruteforce
  */
 class Throttler {
-	const LOGIN_ACTION = 'login';
-
-	/** @var IDBConnection */
-	private $db;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var ILogger */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param ITimeFactory $timeFactory
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db,
-								ITimeFactory $timeFactory,
-								ILogger $logger,
-								IConfig $config) {
-		$this->db = $db;
-		$this->timeFactory = $timeFactory;
-		$this->logger = $logger;
-		$this->config = $config;
-	}
-
-	/**
-	 * Convert a number of seconds into the appropriate DateInterval
-	 *
-	 * @param int $expire
-	 * @return \DateInterval
-	 */
-	private function getCutoff($expire) {
-		$d1 = new \DateTime();
-		$d2 = clone $d1;
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
-		return $d2->diff($d1);
-	}
-
-	/**
-	 * Return the given subnet for an IPv4 address and mask bits
-	 *
-	 * @param string $ip
-	 * @param int $maskBits
-	 * @return string
-	 */
-	private function getIPv4Subnet($ip,
-								  $maskBits = 32) {
-		$binary = \inet_pton($ip);
-		for ($i = 32; $i > $maskBits; $i -= 8) {
-			$j = \intdiv($i, 8) - 1;
-			$k = (int) \min(8, $i - $maskBits);
-			$mask = (0xff - ((pow(2, $k)) - 1));
-			$int = \unpack('C', $binary[$j]);
-			$binary[$j] = \pack('C', $int[1] & $mask);
-		}
-		return \inet_ntop($binary).'/'.$maskBits;
-	}
-
-	/**
-	 * Return the given subnet for an IPv6 address and mask bits
-	 *
-	 * @param string $ip
-	 * @param int $maskBits
-	 * @return string
-	 */
-	private function getIPv6Subnet($ip, $maskBits = 48) {
-		$binary = \inet_pton($ip);
-		for ($i = 128; $i > $maskBits; $i -= 8) {
-			$j = \intdiv($i, 8) - 1;
-			$k = (int) \min(8, $i - $maskBits);
-			$mask = (0xff - ((pow(2, $k)) - 1));
-			$int = \unpack('C', $binary[$j]);
-			$binary[$j] = \pack('C', $int[1] & $mask);
-		}
-		return \inet_ntop($binary).'/'.$maskBits;
-	}
-
-	/**
-	 * Return the given subnet for an IP and the configured mask bits
-	 *
-	 * Determine if the IP is an IPv4 or IPv6 address, then pass to the correct
-	 * method for handling that specific type.
-	 *
-	 * @param string $ip
-	 * @return string
-	 */
-	private function getSubnet($ip) {
-		if (\preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $ip)) {
-			return $this->getIPv4Subnet(
-				$ip,
-				32
-			);
-		}
-		return $this->getIPv6Subnet(
-			$ip,
-			128
-		);
-	}
-
-	/**
-	 * Register a failed attempt to bruteforce a security control
-	 *
-	 * @param string $action
-	 * @param string $ip
-	 * @param array $metadata Optional metadata logged to the database
-	 */
-	public function registerAttempt($action,
-									$ip,
-									array $metadata = []) {
-		// No need to log if the bruteforce protection is disabled
-		if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
-			return;
-		}
-
-		$values = [
-			'action' => $action,
-			'occurred' => $this->timeFactory->getTime(),
-			'ip' => $ip,
-			'subnet' => $this->getSubnet($ip),
-			'metadata' => json_encode($metadata),
-		];
-
-		$this->logger->notice(
-			sprintf(
-				'Bruteforce attempt from "%s" detected for action "%s".',
-				$ip,
-				$action
-			),
-			[
-				'app' => 'core',
-			]
-		);
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->insert('bruteforce_attempts');
-		foreach($values as $column => $value) {
-			$qb->setValue($column, $qb->createNamedParameter($value));
-		}
-		$qb->execute();
-	}
-
-	/**
-	 * Get the throttling delay (in milliseconds)
-	 *
-	 * @param string $ip
-	 * @return int
-	 */
-	public function getDelay($ip) {
-		$cutoffTime = (new \DateTime())
-			->sub($this->getCutoff(43200))
-			->getTimestamp();
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from('bruteforce_attempts')
-			->where($qb->expr()->gt('occurred', $qb->createNamedParameter($cutoffTime)))
-			->andWhere($qb->expr()->eq('subnet', $qb->createNamedParameter($this->getSubnet($ip))));
-		$attempts = count($qb->execute()->fetchAll());
-
-		if ($attempts === 0) {
-			return 0;
-		}
-
-		$maxDelay = 30;
-		$firstDelay = 0.1;
-		if ($attempts > (8 * PHP_INT_SIZE - 1))  {
-			// Don't ever overflow. Just assume the maxDelay time:s
-			$firstDelay = $maxDelay;
-		} else {
-			$firstDelay *= pow(2, $attempts);
-			if ($firstDelay > $maxDelay) {
-				$firstDelay = $maxDelay;
-			}
-		}
-		return (int) \ceil($firstDelay * 1000);
-	}
-
-	/**
-	 * Will sleep for the defined amount of time
-	 *
-	 * @param string $ip
-	 */
-	public function sleepDelay($ip) {
-		usleep($this->getDelay($ip) * 1000);
-	}
+    const LOGIN_ACTION = 'login';
+
+    /** @var IDBConnection */
+    private $db;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var ILogger */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param IDBConnection $db
+     * @param ITimeFactory $timeFactory
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db,
+                                ITimeFactory $timeFactory,
+                                ILogger $logger,
+                                IConfig $config) {
+        $this->db = $db;
+        $this->timeFactory = $timeFactory;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    /**
+     * Convert a number of seconds into the appropriate DateInterval
+     *
+     * @param int $expire
+     * @return \DateInterval
+     */
+    private function getCutoff($expire) {
+        $d1 = new \DateTime();
+        $d2 = clone $d1;
+        $d2->sub(new \DateInterval('PT' . $expire . 'S'));
+        return $d2->diff($d1);
+    }
+
+    /**
+     * Return the given subnet for an IPv4 address and mask bits
+     *
+     * @param string $ip
+     * @param int $maskBits
+     * @return string
+     */
+    private function getIPv4Subnet($ip,
+                                    $maskBits = 32) {
+        $binary = \inet_pton($ip);
+        for ($i = 32; $i > $maskBits; $i -= 8) {
+            $j = \intdiv($i, 8) - 1;
+            $k = (int) \min(8, $i - $maskBits);
+            $mask = (0xff - ((pow(2, $k)) - 1));
+            $int = \unpack('C', $binary[$j]);
+            $binary[$j] = \pack('C', $int[1] & $mask);
+        }
+        return \inet_ntop($binary).'/'.$maskBits;
+    }
+
+    /**
+     * Return the given subnet for an IPv6 address and mask bits
+     *
+     * @param string $ip
+     * @param int $maskBits
+     * @return string
+     */
+    private function getIPv6Subnet($ip, $maskBits = 48) {
+        $binary = \inet_pton($ip);
+        for ($i = 128; $i > $maskBits; $i -= 8) {
+            $j = \intdiv($i, 8) - 1;
+            $k = (int) \min(8, $i - $maskBits);
+            $mask = (0xff - ((pow(2, $k)) - 1));
+            $int = \unpack('C', $binary[$j]);
+            $binary[$j] = \pack('C', $int[1] & $mask);
+        }
+        return \inet_ntop($binary).'/'.$maskBits;
+    }
+
+    /**
+     * Return the given subnet for an IP and the configured mask bits
+     *
+     * Determine if the IP is an IPv4 or IPv6 address, then pass to the correct
+     * method for handling that specific type.
+     *
+     * @param string $ip
+     * @return string
+     */
+    private function getSubnet($ip) {
+        if (\preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $ip)) {
+            return $this->getIPv4Subnet(
+                $ip,
+                32
+            );
+        }
+        return $this->getIPv6Subnet(
+            $ip,
+            128
+        );
+    }
+
+    /**
+     * Register a failed attempt to bruteforce a security control
+     *
+     * @param string $action
+     * @param string $ip
+     * @param array $metadata Optional metadata logged to the database
+     */
+    public function registerAttempt($action,
+                                    $ip,
+                                    array $metadata = []) {
+        // No need to log if the bruteforce protection is disabled
+        if($this->config->getSystemValue('auth.bruteforce.protection.enabled', true) === false) {
+            return;
+        }
+
+        $values = [
+            'action' => $action,
+            'occurred' => $this->timeFactory->getTime(),
+            'ip' => $ip,
+            'subnet' => $this->getSubnet($ip),
+            'metadata' => json_encode($metadata),
+        ];
+
+        $this->logger->notice(
+            sprintf(
+                'Bruteforce attempt from "%s" detected for action "%s".',
+                $ip,
+                $action
+            ),
+            [
+                'app' => 'core',
+            ]
+        );
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->insert('bruteforce_attempts');
+        foreach($values as $column => $value) {
+            $qb->setValue($column, $qb->createNamedParameter($value));
+        }
+        $qb->execute();
+    }
+
+    /**
+     * Get the throttling delay (in milliseconds)
+     *
+     * @param string $ip
+     * @return int
+     */
+    public function getDelay($ip) {
+        $cutoffTime = (new \DateTime())
+            ->sub($this->getCutoff(43200))
+            ->getTimestamp();
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from('bruteforce_attempts')
+            ->where($qb->expr()->gt('occurred', $qb->createNamedParameter($cutoffTime)))
+            ->andWhere($qb->expr()->eq('subnet', $qb->createNamedParameter($this->getSubnet($ip))));
+        $attempts = count($qb->execute()->fetchAll());
+
+        if ($attempts === 0) {
+            return 0;
+        }
+
+        $maxDelay = 30;
+        $firstDelay = 0.1;
+        if ($attempts > (8 * PHP_INT_SIZE - 1))  {
+            // Don't ever overflow. Just assume the maxDelay time:s
+            $firstDelay = $maxDelay;
+        } else {
+            $firstDelay *= pow(2, $attempts);
+            if ($firstDelay > $maxDelay) {
+                $firstDelay = $maxDelay;
+            }
+        }
+        return (int) \ceil($firstDelay * 1000);
+    }
+
+    /**
+     * Will sleep for the defined amount of time
+     *
+     * @param string $ip
+     */
+    public function sleepDelay($ip) {
+        usleep($this->getDelay($ip) * 1000);
+    }
 }

lib/private/TempManager.php

Indentation +221 added lines, -221 removed lines

@@ -34,246 +34,246 @@
 use OCP\ITempManager;
 
 class TempManager implements ITempManager {
-	/** @var string[] Current temporary files and folders, used for cleanup */
-	protected $current = [];
-	/** @var string i.e. /tmp on linux systems */
-	protected $tmpBaseDir;
-	/** @var ILogger */
-	protected $log;
-	/** @var IConfig */
-	protected $config;
+    /** @var string[] Current temporary files and folders, used for cleanup */
+    protected $current = [];
+    /** @var string i.e. /tmp on linux systems */
+    protected $tmpBaseDir;
+    /** @var ILogger */
+    protected $log;
+    /** @var IConfig */
+    protected $config;
 
-	/** Prefix */
-	const TMP_PREFIX = 'oc_tmp_';
+    /** Prefix */
+    const TMP_PREFIX = 'oc_tmp_';
 
-	/**
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(ILogger $logger, IConfig $config) {
-		$this->log = $logger;
-		$this->config = $config;
-		$this->tmpBaseDir = $this->getTempBaseDir();
-	}
+    /**
+     * @param \OCP\ILogger $logger
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(ILogger $logger, IConfig $config) {
+        $this->log = $logger;
+        $this->config = $config;
+        $this->tmpBaseDir = $this->getTempBaseDir();
+    }
 
-	/**
-	 * Builds the filename with suffix and removes potential dangerous characters
-	 * such as directory separators.
-	 *
-	 * @param string $absolutePath Absolute path to the file / folder
-	 * @param string $postFix Postfix appended to the temporary file name, may be user controlled
-	 * @return string
-	 */
-	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
-		if($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
-			$postFix = str_replace(['\\', '/'], '', $postFix);
-			$absolutePath .= '-';
-		}
+    /**
+     * Builds the filename with suffix and removes potential dangerous characters
+     * such as directory separators.
+     *
+     * @param string $absolutePath Absolute path to the file / folder
+     * @param string $postFix Postfix appended to the temporary file name, may be user controlled
+     * @return string
+     */
+    private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
+        if($postFix !== '') {
+            $postFix = '.' . ltrim($postFix, '.');
+            $postFix = str_replace(['\\', '/'], '', $postFix);
+            $absolutePath .= '-';
+        }
 
-		return $absolutePath . $postFix;
-	}
+        return $absolutePath . $postFix;
+    }
 
-	/**
-	 * Create a temporary file and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary file name
-	 * @return string
-	 */
-	public function getTemporaryFile($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique file and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $file;
+    /**
+     * Create a temporary file and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary file name
+     * @return string
+     */
+    public function getTemporaryFile($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique file and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $file;
 
-			// If a postfix got specified sanitize it and create a postfixed
-			// temporary file
-			if($postFix !== '') {
-				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
-				touch($fileNameWithPostfix);
-				chmod($fileNameWithPostfix, 0600);
-				$this->current[] = $fileNameWithPostfix;
-				return $fileNameWithPostfix;
-			}
+            // If a postfix got specified sanitize it and create a postfixed
+            // temporary file
+            if($postFix !== '') {
+                $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
+                touch($fileNameWithPostfix);
+                chmod($fileNameWithPostfix, 0600);
+                $this->current[] = $fileNameWithPostfix;
+                return $fileNameWithPostfix;
+            }
 
-			return $file;
-		} else {
-			$this->log->warning(
-				'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $file;
+        } else {
+            $this->log->warning(
+                'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Create a temporary folder and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary folder name
-	 * @return string
-	 */
-	public function getTemporaryFolder($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique directory and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $uniqueFileName;
+    /**
+     * Create a temporary folder and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary folder name
+     * @return string
+     */
+    public function getTemporaryFolder($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique directory and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $uniqueFileName;
 
-			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
-			mkdir($path, 0700);
-			$this->current[] = $path;
+            // Build a name without postfix
+            $path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+            mkdir($path, 0700);
+            $this->current[] = $path;
 
-			return $path . '/';
-		} else {
-			$this->log->warning(
-				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $path . '/';
+        } else {
+            $this->log->warning(
+                'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Remove the temporary files and folders generated during this request
-	 */
-	public function clean() {
-		$this->cleanFiles($this->current);
-	}
+    /**
+     * Remove the temporary files and folders generated during this request
+     */
+    public function clean() {
+        $this->cleanFiles($this->current);
+    }
 
-	/**
-	 * @param string[] $files
-	 */
-	protected function cleanFiles($files) {
-		foreach ($files as $file) {
-			if (file_exists($file)) {
-				try {
-					\OC_Helper::rmdirr($file);
-				} catch (\UnexpectedValueException $ex) {
-					$this->log->warning(
-						"Error deleting temporary file/folder: {file} - Reason: {error}",
-						[
-							'file' => $file,
-							'error' => $ex->getMessage(),
-						]
-					);
-				}
-			}
-		}
-	}
+    /**
+     * @param string[] $files
+     */
+    protected function cleanFiles($files) {
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                try {
+                    \OC_Helper::rmdirr($file);
+                } catch (\UnexpectedValueException $ex) {
+                    $this->log->warning(
+                        "Error deleting temporary file/folder: {file} - Reason: {error}",
+                        [
+                            'file' => $file,
+                            'error' => $ex->getMessage(),
+                        ]
+                    );
+                }
+            }
+        }
+    }
 
-	/**
-	 * Remove old temporary files and folders that were failed to be cleaned
-	 */
-	public function cleanOld() {
-		$this->cleanFiles($this->getOldFiles());
-	}
+    /**
+     * Remove old temporary files and folders that were failed to be cleaned
+     */
+    public function cleanOld() {
+        $this->cleanFiles($this->getOldFiles());
+    }
 
-	/**
-	 * Get all temporary files and folders generated by oc older than an hour
-	 *
-	 * @return string[]
-	 */
-	protected function getOldFiles() {
-		$cutOfTime = time() - 3600;
-		$files = [];
-		$dh = opendir($this->tmpBaseDir);
-		if ($dh) {
-			while (($file = readdir($dh)) !== false) {
-				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
-					$mtime = filemtime($path);
-					if ($mtime < $cutOfTime) {
-						$files[] = $path;
-					}
-				}
-			}
-		}
-		return $files;
-	}
+    /**
+     * Get all temporary files and folders generated by oc older than an hour
+     *
+     * @return string[]
+     */
+    protected function getOldFiles() {
+        $cutOfTime = time() - 3600;
+        $files = [];
+        $dh = opendir($this->tmpBaseDir);
+        if ($dh) {
+            while (($file = readdir($dh)) !== false) {
+                if (substr($file, 0, 7) === self::TMP_PREFIX) {
+                    $path = $this->tmpBaseDir . '/' . $file;
+                    $mtime = filemtime($path);
+                    if ($mtime < $cutOfTime) {
+                        $files[] = $path;
+                    }
+                }
+            }
+        }
+        return $files;
+    }
 
-	/**
-	 * Get the temporary base directory configured on the server
-	 *
-	 * @return string Path to the temporary directory or null
-	 * @throws \UnexpectedValueException
-	 */
-	public function getTempBaseDir() {
-		if ($this->tmpBaseDir) {
-			return $this->tmpBaseDir;
-		}
+    /**
+     * Get the temporary base directory configured on the server
+     *
+     * @return string Path to the temporary directory or null
+     * @throws \UnexpectedValueException
+     */
+    public function getTempBaseDir() {
+        if ($this->tmpBaseDir) {
+            return $this->tmpBaseDir;
+        }
 
-		$directories = [];
-		if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
-			$directories[] = $temp;
-		}
-		if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TEMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMPDIR')) {
-			$directories[] = $temp;
-		}
-		if ($temp = sys_get_temp_dir()) {
-			$directories[] = $temp;
-		}
+        $directories = [];
+        if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
+            $directories[] = $temp;
+        }
+        if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TEMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMPDIR')) {
+            $directories[] = $temp;
+        }
+        if ($temp = sys_get_temp_dir()) {
+            $directories[] = $temp;
+        }
 
-		foreach ($directories as $dir) {
-			if ($this->checkTemporaryDirectory($dir)) {
-				return $dir;
-			}
-		}
+        foreach ($directories as $dir) {
+            if ($this->checkTemporaryDirectory($dir)) {
+                return $dir;
+            }
+        }
 
-		$temp = tempnam(dirname(__FILE__), '');
-		if (file_exists($temp)) {
-			unlink($temp);
-			return dirname($temp);
-		}
-		throw new \UnexpectedValueException('Unable to detect system temporary directory');
-	}
+        $temp = tempnam(dirname(__FILE__), '');
+        if (file_exists($temp)) {
+            unlink($temp);
+            return dirname($temp);
+        }
+        throw new \UnexpectedValueException('Unable to detect system temporary directory');
+    }
 
-	/**
-	 * Check if a temporary directory is ready for use
-	 *
-	 * @param mixed $directory
-	 * @return bool
-	 */
-	private function checkTemporaryDirectory($directory) {
-		// suppress any possible errors caused by is_writable
-		// checks missing or invalid path or characters, wrong permissions etc
-		try {
-			if (is_writeable($directory)) {
-				return true;
-			}
-		} catch (\Exception $e) {
-		}
-		$this->log->warning('Temporary directory {dir} is not present or writable',
-			['dir' => $directory]
-		);
-		return false;
-	}
+    /**
+     * Check if a temporary directory is ready for use
+     *
+     * @param mixed $directory
+     * @return bool
+     */
+    private function checkTemporaryDirectory($directory) {
+        // suppress any possible errors caused by is_writable
+        // checks missing or invalid path or characters, wrong permissions etc
+        try {
+            if (is_writeable($directory)) {
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+        $this->log->warning('Temporary directory {dir} is not present or writable',
+            ['dir' => $directory]
+        );
+        return false;
+    }
 
-	/**
-	 * Override the temporary base directory
-	 *
-	 * @param string $directory
-	 */
-	public function overrideTempBaseDir($directory) {
-		$this->tmpBaseDir = $directory;
-	}
+    /**
+     * Override the temporary base directory
+     *
+     * @param string $directory
+     */
+    public function overrideTempBaseDir($directory) {
+        $this->tmpBaseDir = $directory;
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -65,13 +65,13 @@ 
 	 * @return string
 	 */
 	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
-		if($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
+		if ($postFix !== '') {
+			$postFix = '.'.ltrim($postFix, '.');
 			$postFix = str_replace(['\\', '/'], '', $postFix);
 			$absolutePath .= '-';
 		}
 
-		return $absolutePath . $postFix;
+		return $absolutePath.$postFix;
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 
 			// If a postfix got specified sanitize it and create a postfixed
 			// temporary file
-			if($postFix !== '') {
+			if ($postFix !== '') {
 				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
 				touch($fileNameWithPostfix);
 				chmod($fileNameWithPostfix, 0600);
@@ -127,11 +127,11 @@ 
 			$this->current[] = $uniqueFileName;
 
 			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+			$path = $this->buildFileNameWithSuffix($uniqueFileName.'-folder', $postFix);
 			mkdir($path, 0700);
 			$this->current[] = $path;
 
-			return $path . '/';
+			return $path.'/';
 		} else {
 			$this->log->warning(
 				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
@@ -190,7 +190,7 @@ 
 		if ($dh) {
 			while (($file = readdir($dh)) !== false) {
 				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
+					$path = $this->tmpBaseDir.'/'.$file;
 					$mtime = filemtime($path);
 					if ($mtime < $cutOfTime) {
 						$files[] = $path;

lib/private/DatabaseException.php

Indentation +9 added lines, -9 removed lines

@@ -24,15 +24,15 @@
 namespace OC;
 
 class DatabaseException extends \Exception {
-	private $query;
+    private $query;
 
-	//FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
-	public function __construct($message, $query = null){
-		parent::__construct($message);
-		$this->query = $query;
-	}
+    //FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
+    public function __construct($message, $query = null){
+        parent::__construct($message);
+        $this->query = $query;
+    }
 
-	public function getQuery() {
-		return $this->query;
-	}
+    public function getQuery() {
+        return $this->query;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	private $query;
 
 	//FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
-	public function __construct($message, $query = null){
+	public function __construct($message, $query = null) {
 		parent::__construct($message);
 		$this->query = $query;
 	}

lib/private/Log/Errorlog.php

Indentation +14 added lines, -14 removed lines

@@ -28,20 +28,20 @@
 class Errorlog {
 
 
-	/**
-	 * Init class data
-	 */
-	public static function init() {
-	}
+    /**
+     * Init class data
+     */
+    public static function init() {
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public static function write($app, $message, $level) {
-		error_log('[owncloud]['.$app.']['.$level.'] '.$message);
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public static function write($app, $message, $level) {
+        error_log('[owncloud]['.$app.']['.$level.'] '.$message);
+    }
 }
 

lib/private/Log/Syslog.php

Indentation +25 added lines, -25 removed lines

@@ -26,31 +26,31 @@
 namespace OC\Log;
 
 class Syslog {
-	static protected $levels = array(
-		\OCP\Util::DEBUG => LOG_DEBUG,
-		\OCP\Util::INFO => LOG_INFO,
-		\OCP\Util::WARN => LOG_WARNING,
-		\OCP\Util::ERROR => LOG_ERR,
-		\OCP\Util::FATAL => LOG_CRIT,
-	);
+    static protected $levels = array(
+        \OCP\Util::DEBUG => LOG_DEBUG,
+        \OCP\Util::INFO => LOG_INFO,
+        \OCP\Util::WARN => LOG_WARNING,
+        \OCP\Util::ERROR => LOG_ERR,
+        \OCP\Util::FATAL => LOG_CRIT,
+    );
 
-	/**
-	 * Init class data
-	 */
-	public static function init() {
-		openlog(\OC::$server->getSystemConfig()->getValue("syslog_tag", "ownCloud"), LOG_PID | LOG_CONS, LOG_USER);
-		// Close at shutdown
-		register_shutdown_function('closelog');
-	}
+    /**
+     * Init class data
+     */
+    public static function init() {
+        openlog(\OC::$server->getSystemConfig()->getValue("syslog_tag", "ownCloud"), LOG_PID | LOG_CONS, LOG_USER);
+        // Close at shutdown
+        register_shutdown_function('closelog');
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public static function write($app, $message, $level) {
-		$syslog_level = self::$levels[$level];
-		syslog($syslog_level, '{'.$app.'} '.$message);
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public static function write($app, $message, $level) {
+        $syslog_level = self::$levels[$level];
+        syslog($syslog_level, '{'.$app.'} '.$message);
+    }
 }