nextcloud / server

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;
+    }
 }

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;
+    }
 }

lib/private/Security/IdentityProof/Signer.php

Indentation +66 added lines, -66 removed lines

@@ -26,76 +26,76 @@
 use OCP\IUserManager;
 
 class Signer {
-	/** @var Manager */
-	private $keyManager;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IUserManager */
-	private $userManager;
+    /** @var Manager */
+    private $keyManager;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IUserManager */
+    private $userManager;
 
-	/**
-	 * @param Manager $keyManager
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(Manager $keyManager,
-								ITimeFactory $timeFactory,
-								IUserManager $userManager) {
-		$this->keyManager = $keyManager;
-		$this->timeFactory = $timeFactory;
-		$this->userManager = $userManager;
-	}
+    /**
+     * @param Manager $keyManager
+     * @param ITimeFactory $timeFactory
+     * @param IUserManager $userManager
+     */
+    public function __construct(Manager $keyManager,
+                                ITimeFactory $timeFactory,
+                                IUserManager $userManager) {
+        $this->keyManager = $keyManager;
+        $this->timeFactory = $timeFactory;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Returns a signed blob for $data
-	 *
-	 * @param string $type
-	 * @param array $data
-	 * @param IUser $user
-	 * @return array ['message', 'signature']
-	 */
-	public function sign($type, array $data, IUser $user) {
-		$privateKey = $this->keyManager->getKey($user)->getPrivate();
-		$data = [
-			'data' => $data,
-			'type' => $type,
-			'signer' => $user->getCloudId(),
-			'timestamp' => $this->timeFactory->getTime(),
-		];
-		openssl_sign(json_encode($data), $signature, $privateKey, OPENSSL_ALGO_SHA512);
+    /**
+     * Returns a signed blob for $data
+     *
+     * @param string $type
+     * @param array $data
+     * @param IUser $user
+     * @return array ['message', 'signature']
+     */
+    public function sign($type, array $data, IUser $user) {
+        $privateKey = $this->keyManager->getKey($user)->getPrivate();
+        $data = [
+            'data' => $data,
+            'type' => $type,
+            'signer' => $user->getCloudId(),
+            'timestamp' => $this->timeFactory->getTime(),
+        ];
+        openssl_sign(json_encode($data), $signature, $privateKey, OPENSSL_ALGO_SHA512);
 
-		return [
-			'message' => $data,
-			'signature' => base64_encode($signature),
-		];
-	}
+        return [
+            'message' => $data,
+            'signature' => base64_encode($signature),
+        ];
+    }
 
-	/**
-	 * Whether the data is signed properly
-	 *
-	 * @param array $data
-	 * @return bool
-	 */
-	public function verify(array $data) {
-		if(isset($data['message'])
-			&& isset($data['signature'])
-			&& isset($data['message']['signer'])
-		) {
-			$location = strrpos($data['message']['signer'], '@');
-			$userId = substr($data['message']['signer'], 0, $location);
+    /**
+     * Whether the data is signed properly
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function verify(array $data) {
+        if(isset($data['message'])
+            && isset($data['signature'])
+            && isset($data['message']['signer'])
+        ) {
+            $location = strrpos($data['message']['signer'], '@');
+            $userId = substr($data['message']['signer'], 0, $location);
 
-			$user = $this->userManager->get($userId);
-			if($user !== null) {
-				$key = $this->keyManager->getKey($user);
-				return (bool)openssl_verify(
-					json_encode($data['message']),
-					base64_decode($data['signature']),
-					$key->getPublic(),
-					OPENSSL_ALGO_SHA512
-				);
-			}
-		}
+            $user = $this->userManager->get($userId);
+            if($user !== null) {
+                $key = $this->keyManager->getKey($user);
+                return (bool)openssl_verify(
+                    json_encode($data['message']),
+                    base64_decode($data['signature']),
+                    $key->getPublic(),
+                    OPENSSL_ALGO_SHA512
+                );
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

lib/private/Security/IdentityProof/Key.php

Indentation +18 added lines, -18 removed lines

@@ -22,25 +22,25 @@
 namespace OC\Security\IdentityProof;
 
 class Key {
-	/** @var string */
-	private $publicKey;
-	/** @var string */
-	private $privateKey;
+    /** @var string */
+    private $publicKey;
+    /** @var string */
+    private $privateKey;
 
-	/**
-	 * @param string $publicKey
-	 * @param string $privateKey
-	 */
-	public function __construct($publicKey, $privateKey) {
-		$this->publicKey = $publicKey;
-		$this->privateKey = $privateKey;
-	}
+    /**
+     * @param string $publicKey
+     * @param string $privateKey
+     */
+    public function __construct($publicKey, $privateKey) {
+        $this->publicKey = $publicKey;
+        $this->privateKey = $privateKey;
+    }
 
-	public function getPrivate() {
-		return $this->privateKey;
-	}
+    public function getPrivate() {
+        return $this->privateKey;
+    }
 
-	public function getPublic() {
-		return $this->publicKey;
-	}
+    public function getPublic() {
+        return $this->publicKey;
+    }
 }

lib/private/Federation/CloudIdManager.php

Indentation +74 added lines, -74 removed lines

@@ -24,87 +24,87 @@
 use OCP\Federation\ICloudIdManager;
 
 class CloudIdManager implements ICloudIdManager {
-	/**
-	 * @param string $cloudId
-	 * @return ICloudId
-	 * @throws \InvalidArgumentException
-	 */
-	public function resolveCloudId($cloudId) {
-		// TODO magic here to get the url and user instead of just splitting on @
+    /**
+     * @param string $cloudId
+     * @return ICloudId
+     * @throws \InvalidArgumentException
+     */
+    public function resolveCloudId($cloudId) {
+        // TODO magic here to get the url and user instead of just splitting on @
 
-		if (!$this->isValidCloudId($cloudId)) {
-			throw new \InvalidArgumentException('Invalid cloud id');
-		}
+        if (!$this->isValidCloudId($cloudId)) {
+            throw new \InvalidArgumentException('Invalid cloud id');
+        }
 
-		// Find the first character that is not allowed in user names
-		$id = $this->fixRemoteURL($cloudId);
-		$posSlash = strpos($id, '/');
-		$posColon = strpos($id, ':');
+        // Find the first character that is not allowed in user names
+        $id = $this->fixRemoteURL($cloudId);
+        $posSlash = strpos($id, '/');
+        $posColon = strpos($id, ':');
 
-		if ($posSlash === false && $posColon === false) {
-			$invalidPos = strlen($id);
-		} else if ($posSlash === false) {
-			$invalidPos = $posColon;
-		} else if ($posColon === false) {
-			$invalidPos = $posSlash;
-		} else {
-			$invalidPos = min($posSlash, $posColon);
-		}
+        if ($posSlash === false && $posColon === false) {
+            $invalidPos = strlen($id);
+        } else if ($posSlash === false) {
+            $invalidPos = $posColon;
+        } else if ($posColon === false) {
+            $invalidPos = $posSlash;
+        } else {
+            $invalidPos = min($posSlash, $posColon);
+        }
 
-		// Find the last @ before $invalidPos
-		$pos = $lastAtPos = 0;
-		while ($lastAtPos !== false && $lastAtPos <= $invalidPos) {
-			$pos = $lastAtPos;
-			$lastAtPos = strpos($id, '@', $pos + 1);
-		}
+        // Find the last @ before $invalidPos
+        $pos = $lastAtPos = 0;
+        while ($lastAtPos !== false && $lastAtPos <= $invalidPos) {
+            $pos = $lastAtPos;
+            $lastAtPos = strpos($id, '@', $pos + 1);
+        }
 
-		if ($pos !== false) {
-			$user = substr($id, 0, $pos);
-			$remote = substr($id, $pos + 1);
-			if (!empty($user) && !empty($remote)) {
-				return new CloudId($id, $user, $remote);
-			}
-		}
-		throw new \InvalidArgumentException('Invalid cloud id');
-	}
+        if ($pos !== false) {
+            $user = substr($id, 0, $pos);
+            $remote = substr($id, $pos + 1);
+            if (!empty($user) && !empty($remote)) {
+                return new CloudId($id, $user, $remote);
+            }
+        }
+        throw new \InvalidArgumentException('Invalid cloud id');
+    }
 
-	/**
-	 * @param string $user
-	 * @param string $remote
-	 * @return CloudId
-	 */
-	public function getCloudId($user, $remote) {
-		// TODO check what the correct url is for remote (asking the remote)
-		return new CloudId($user. '@' . $remote, $user, $remote);
-	}
+    /**
+     * @param string $user
+     * @param string $remote
+     * @return CloudId
+     */
+    public function getCloudId($user, $remote) {
+        // TODO check what the correct url is for remote (asking the remote)
+        return new CloudId($user. '@' . $remote, $user, $remote);
+    }
 
-	/**
-	 * Strips away a potential file names and trailing slashes:
-	 * - http://localhost
-	 * - http://localhost/
-	 * - http://localhost/index.php
-	 * - http://localhost/index.php/s/{shareToken}
-	 *
-	 * all return: http://localhost
-	 *
-	 * @param string $remote
-	 * @return string
-	 */
-	protected function fixRemoteURL($remote) {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
+    /**
+     * Strips away a potential file names and trailing slashes:
+     * - http://localhost
+     * - http://localhost/
+     * - http://localhost/index.php
+     * - http://localhost/index.php/s/{shareToken}
+     *
+     * all return: http://localhost
+     *
+     * @param string $remote
+     * @return string
+     */
+    protected function fixRemoteURL($remote) {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
 
-		return $remote;
-	}
+        return $remote;
+    }
 
-	/**
-	 * @param string $cloudId
-	 * @return bool
-	 */
-	public function isValidCloudId($cloudId) {
-		return strpos($cloudId, '@') !== false;
-	}
+    /**
+     * @param string $cloudId
+     * @return bool
+     */
+    public function isValidCloudId($cloudId) {
+        return strpos($cloudId, '@') !== false;
+    }
 }

lib/private/Federation/CloudId.php

Indentation +45 added lines, -45 removed lines

@@ -23,54 +23,54 @@
 use OCP\Federation\ICloudId;
 
 class CloudId implements ICloudId {
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $user;
-	/** @var string */
-	private $remote;
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $user;
+    /** @var string */
+    private $remote;
 
-	/**
-	 * CloudId constructor.
-	 *
-	 * @param string $id
-	 * @param string $user
-	 * @param string $remote
-	 */
-	public function __construct($id, $user, $remote) {
-		$this->id = $id;
-		$this->user = $user;
-		$this->remote = $remote;
-	}
+    /**
+     * CloudId constructor.
+     *
+     * @param string $id
+     * @param string $user
+     * @param string $remote
+     */
+    public function __construct($id, $user, $remote) {
+        $this->id = $id;
+        $this->user = $user;
+        $this->remote = $remote;
+    }
 
-	/**
-	 * The full remote cloud id
-	 *
-	 * @return string
-	 */
-	public function getId() {
-		return $this->id;
-	}
+    /**
+     * The full remote cloud id
+     *
+     * @return string
+     */
+    public function getId() {
+        return $this->id;
+    }
 
-	public function getDisplayId() {
-		return str_replace('https://', '', str_replace('http://', '', $this->getId()));
-	}
+    public function getDisplayId() {
+        return str_replace('https://', '', str_replace('http://', '', $this->getId()));
+    }
 
-	/**
-	 * The username on the remote server
-	 *
-	 * @return string
-	 */
-	public function getUser() {
-		return $this->user;
-	}
+    /**
+     * The username on the remote server
+     *
+     * @return string
+     */
+    public function getUser() {
+        return $this->user;
+    }
 
-	/**
-	 * The base address of the remote server
-	 *
-	 * @return string
-	 */
-	public function getRemote() {
-		return $this->remote;
-	}
+    /**
+     * The base address of the remote server
+     *
+     * @return string
+     */
+    public function getRemote() {
+        return $this->remote;
+    }
 }

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);
+    }
 }

lib/private/Log/ErrorHandler.php

Indentation +59 added lines, -59 removed lines

@@ -28,74 +28,74 @@
 use OCP\ILogger;
 
 class ErrorHandler {
-	/** @var ILogger */
-	private static $logger;
+    /** @var ILogger */
+    private static $logger;
 
-	/**
-	 * remove password in URLs
-	 * @param string $msg
-	 * @return string
-	 */
-	protected static function removePassword($msg) {
-		return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg);
-	}
+    /**
+     * remove password in URLs
+     * @param string $msg
+     * @return string
+     */
+    protected static function removePassword($msg) {
+        return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg);
+    }
 
-	public static function register($debug=false) {
-		$handler = new ErrorHandler();
+    public static function register($debug=false) {
+        $handler = new ErrorHandler();
 
-		if ($debug) {
-			set_error_handler(array($handler, 'onAll'), E_ALL);
-			if (\OC::$CLI) {
-				set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
-			}
-		} else {
-			set_error_handler(array($handler, 'onError'));
-		}
-		register_shutdown_function(array($handler, 'onShutdown'));
-		set_exception_handler(array($handler, 'onException'));
-	}
+        if ($debug) {
+            set_error_handler(array($handler, 'onAll'), E_ALL);
+            if (\OC::$CLI) {
+                set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
+            }
+        } else {
+            set_error_handler(array($handler, 'onError'));
+        }
+        register_shutdown_function(array($handler, 'onShutdown'));
+        set_exception_handler(array($handler, 'onException'));
+    }
 
-	public static function setLogger(ILogger $logger) {
-		self::$logger = $logger;
-	}
+    public static function setLogger(ILogger $logger) {
+        self::$logger = $logger;
+    }
 
-	//Fatal errors handler
-	public static function onShutdown() {
-		$error = error_get_last();
-		if($error && self::$logger) {
-			//ob_end_clean();
-			$msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
-			self::$logger->critical(self::removePassword($msg), array('app' => 'PHP'));
-		}
-	}
+    //Fatal errors handler
+    public static function onShutdown() {
+        $error = error_get_last();
+        if($error && self::$logger) {
+            //ob_end_clean();
+            $msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
+            self::$logger->critical(self::removePassword($msg), array('app' => 'PHP'));
+        }
+    }
 
-	/**
-	 * 	Uncaught exception handler
-	 *
-	 * @param \Exception $exception
-	 */
-	public static function onException($exception) {
-		$class = get_class($exception);
-		$msg = $exception->getMessage();
-		$msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
-		self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']);
-	}
+    /**
+     * 	Uncaught exception handler
+     *
+     * @param \Exception $exception
+     */
+    public static function onException($exception) {
+        $class = get_class($exception);
+        $msg = $exception->getMessage();
+        $msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine();
+        self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']);
+    }
 
-	//Recoverable errors handler
-	public static function onError($number, $message, $file, $line) {
-		if (error_reporting() === 0) {
-			return;
-		}
-		$msg = $message . ' at ' . $file . '#' . $line;
-		self::$logger->error(self::removePassword($msg), array('app' => 'PHP'));
+    //Recoverable errors handler
+    public static function onError($number, $message, $file, $line) {
+        if (error_reporting() === 0) {
+            return;
+        }
+        $msg = $message . ' at ' . $file . '#' . $line;
+        self::$logger->error(self::removePassword($msg), array('app' => 'PHP'));
 
-	}
+    }
 
-	//Recoverable handler which catch all errors, warnings and notices
-	public static function onAll($number, $message, $file, $line) {
-		$msg = $message . ' at ' . $file . '#' . $line;
-		self::$logger->debug(self::removePassword($msg), array('app' => 'PHP'));
+    //Recoverable handler which catch all errors, warnings and notices
+    public static function onAll($number, $message, $file, $line) {
+        $msg = $message . ' at ' . $file . '#' . $line;
+        self::$logger->debug(self::removePassword($msg), array('app' => 'PHP'));
 
-	}
+    }
 
 }