Dolibarr / dolibarr

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/BackendInterface.php

Indentation +45 added lines, -45 removed lines

@@ -16,50 +16,50 @@
  */
 interface BackendInterface
 {
-    /**
-     * When this method is called, the backend must check if authentication was
-     * successful.
-     *
-     * The returned value must be one of the following
-     *
-     * [true, "principals/username"]
-     * [false, "reason for failure"]
-     *
-     * If authentication was successful, it's expected that the authentication
-     * backend returns a so-called principal url.
-     *
-     * Examples of a principal url:
-     *
-     * principals/admin
-     * principals/user1
-     * principals/users/joe
-     * principals/uid/123457
-     *
-     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-     * return a string such as:
-     *
-     * principals/users/[username]
-     *
-     * @return array
-     */
-    public function check(RequestInterface $request, ResponseInterface $response);
+	/**
+	 * When this method is called, the backend must check if authentication was
+	 * successful.
+	 *
+	 * The returned value must be one of the following
+	 *
+	 * [true, "principals/username"]
+	 * [false, "reason for failure"]
+	 *
+	 * If authentication was successful, it's expected that the authentication
+	 * backend returns a so-called principal url.
+	 *
+	 * Examples of a principal url:
+	 *
+	 * principals/admin
+	 * principals/user1
+	 * principals/users/joe
+	 * principals/uid/123457
+	 *
+	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+	 * return a string such as:
+	 *
+	 * principals/users/[username]
+	 *
+	 * @return array
+	 */
+	public function check(RequestInterface $request, ResponseInterface $response);
 
-    /**
-     * This method is called when a user could not be authenticated, and
-     * authentication was required for the current request.
-     *
-     * This gives you the opportunity to set authentication headers. The 401
-     * status code will already be set.
-     *
-     * In this case of Basic Auth, this would for example mean that the
-     * following header needs to be set:
-     *
-     * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
-     *
-     * Keep in mind that in the case of multiple authentication backends, other
-     * WWW-Authenticate headers may already have been set, and you'll want to
-     * append your own WWW-Authenticate header instead of overwriting the
-     * existing one.
-     */
-    public function challenge(RequestInterface $request, ResponseInterface $response);
+	/**
+	 * This method is called when a user could not be authenticated, and
+	 * authentication was required for the current request.
+	 *
+	 * This gives you the opportunity to set authentication headers. The 401
+	 * status code will already be set.
+	 *
+	 * In this case of Basic Auth, this would for example mean that the
+	 * following header needs to be set:
+	 *
+	 * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
+	 *
+	 * Keep in mind that in the case of multiple authentication backends, other
+	 * WWW-Authenticate headers may already have been set, and you'll want to
+	 * append your own WWW-Authenticate header instead of overwriting the
+	 * existing one.
+	 */
+	public function challenge(RequestInterface $request, ResponseInterface $response);
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/BasicCallBack.php

Indentation +32 added lines, -32 removed lines

@@ -18,39 +18,39 @@
  */
 class BasicCallBack extends AbstractBasic
 {
-    /**
-     * Callback.
-     *
-     * @var callable
-     */
-    protected $callBack;
+	/**
+	 * Callback.
+	 *
+	 * @var callable
+	 */
+	protected $callBack;
 
-    /**
-     * Creates the backend.
-     *
-     * A callback must be provided to handle checking the username and
-     * password.
-     */
-    public function __construct(callable $callBack)
-    {
-        $this->callBack = $callBack;
-    }
+	/**
+	 * Creates the backend.
+	 *
+	 * A callback must be provided to handle checking the username and
+	 * password.
+	 */
+	public function __construct(callable $callBack)
+	{
+		$this->callBack = $callBack;
+	}
 
-    /**
-     * Validates a username and password.
-     *
-     * This method should return true or false depending on if login
-     * succeeded.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return bool
-     */
-    protected function validateUserPass($username, $password)
-    {
-        $cb = $this->callBack;
+	/**
+	 * Validates a username and password.
+	 *
+	 * This method should return true or false depending on if login
+	 * succeeded.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	protected function validateUserPass($username, $password)
+	{
+		$cb = $this->callBack;
 
-        return $cb($username, $password);
-    }
+		return $cb($username, $password);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/AbstractBasic.php

Indentation +104 added lines, -104 removed lines

@@ -22,115 +22,115 @@
  */
 abstract class AbstractBasic implements BackendInterface
 {
-    /**
-     * Authentication Realm.
-     *
-     * The realm is often displayed by browser clients when showing the
-     * authentication dialog.
-     *
-     * @var string
-     */
-    protected $realm = 'sabre/dav';
+	/**
+	 * Authentication Realm.
+	 *
+	 * The realm is often displayed by browser clients when showing the
+	 * authentication dialog.
+	 *
+	 * @var string
+	 */
+	protected $realm = 'sabre/dav';
 
-    /**
-     * This is the prefix that will be used to generate principal urls.
-     *
-     * @var string
-     */
-    protected $principalPrefix = 'principals/';
+	/**
+	 * This is the prefix that will be used to generate principal urls.
+	 *
+	 * @var string
+	 */
+	protected $principalPrefix = 'principals/';
 
-    /**
-     * Validates a username and password.
-     *
-     * This method should return true or false depending on if login
-     * succeeded.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return bool
-     */
-    abstract protected function validateUserPass($username, $password);
+	/**
+	 * Validates a username and password.
+	 *
+	 * This method should return true or false depending on if login
+	 * succeeded.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	abstract protected function validateUserPass($username, $password);
 
-    /**
-     * Sets the authentication realm for this backend.
-     *
-     * @param string $realm
-     */
-    public function setRealm($realm)
-    {
-        $this->realm = $realm;
-    }
+	/**
+	 * Sets the authentication realm for this backend.
+	 *
+	 * @param string $realm
+	 */
+	public function setRealm($realm)
+	{
+		$this->realm = $realm;
+	}
 
-    /**
-     * When this method is called, the backend must check if authentication was
-     * successful.
-     *
-     * The returned value must be one of the following
-     *
-     * [true, "principals/username"]
-     * [false, "reason for failure"]
-     *
-     * If authentication was successful, it's expected that the authentication
-     * backend returns a so-called principal url.
-     *
-     * Examples of a principal url:
-     *
-     * principals/admin
-     * principals/user1
-     * principals/users/joe
-     * principals/uid/123457
-     *
-     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-     * return a string such as:
-     *
-     * principals/users/[username]
-     *
-     * @return array
-     */
-    public function check(RequestInterface $request, ResponseInterface $response)
-    {
-        $auth = new HTTP\Auth\Basic(
-            $this->realm,
-            $request,
-            $response
-        );
+	/**
+	 * When this method is called, the backend must check if authentication was
+	 * successful.
+	 *
+	 * The returned value must be one of the following
+	 *
+	 * [true, "principals/username"]
+	 * [false, "reason for failure"]
+	 *
+	 * If authentication was successful, it's expected that the authentication
+	 * backend returns a so-called principal url.
+	 *
+	 * Examples of a principal url:
+	 *
+	 * principals/admin
+	 * principals/user1
+	 * principals/users/joe
+	 * principals/uid/123457
+	 *
+	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+	 * return a string such as:
+	 *
+	 * principals/users/[username]
+	 *
+	 * @return array
+	 */
+	public function check(RequestInterface $request, ResponseInterface $response)
+	{
+		$auth = new HTTP\Auth\Basic(
+			$this->realm,
+			$request,
+			$response
+		);
 
-        $userpass = $auth->getCredentials();
-        if (!$userpass) {
-            return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
-        }
-        if (!$this->validateUserPass($userpass[0], $userpass[1])) {
-            return [false, 'Username or password was incorrect'];
-        }
+		$userpass = $auth->getCredentials();
+		if (!$userpass) {
+			return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
+		}
+		if (!$this->validateUserPass($userpass[0], $userpass[1])) {
+			return [false, 'Username or password was incorrect'];
+		}
 
-        return [true, $this->principalPrefix.$userpass[0]];
-    }
+		return [true, $this->principalPrefix.$userpass[0]];
+	}
 
-    /**
-     * This method is called when a user could not be authenticated, and
-     * authentication was required for the current request.
-     *
-     * This gives you the opportunity to set authentication headers. The 401
-     * status code will already be set.
-     *
-     * In this case of Basic Auth, this would for example mean that the
-     * following header needs to be set:
-     *
-     * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
-     *
-     * Keep in mind that in the case of multiple authentication backends, other
-     * WWW-Authenticate headers may already have been set, and you'll want to
-     * append your own WWW-Authenticate header instead of overwriting the
-     * existing one.
-     */
-    public function challenge(RequestInterface $request, ResponseInterface $response)
-    {
-        $auth = new HTTP\Auth\Basic(
-            $this->realm,
-            $request,
-            $response
-        );
-        $auth->requireLogin();
-    }
+	/**
+	 * This method is called when a user could not be authenticated, and
+	 * authentication was required for the current request.
+	 *
+	 * This gives you the opportunity to set authentication headers. The 401
+	 * status code will already be set.
+	 *
+	 * In this case of Basic Auth, this would for example mean that the
+	 * following header needs to be set:
+	 *
+	 * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
+	 *
+	 * Keep in mind that in the case of multiple authentication backends, other
+	 * WWW-Authenticate headers may already have been set, and you'll want to
+	 * append your own WWW-Authenticate header instead of overwriting the
+	 * existing one.
+	 */
+	public function challenge(RequestInterface $request, ResponseInterface $response)
+	{
+		$auth = new HTTP\Auth\Basic(
+			$this->realm,
+			$request,
+			$response
+		);
+		$auth->requireLogin();
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php

Indentation +135 added lines, -135 removed lines

@@ -22,139 +22,139 @@
  */
 abstract class AbstractDigest implements BackendInterface
 {
-    /**
-     * Authentication Realm.
-     *
-     * The realm is often displayed by browser clients when showing the
-     * authentication dialog.
-     *
-     * @var string
-     */
-    protected $realm = 'SabreDAV';
-
-    /**
-     * This is the prefix that will be used to generate principal urls.
-     *
-     * @var string
-     */
-    protected $principalPrefix = 'principals/';
-
-    /**
-     * Sets the authentication realm for this backend.
-     *
-     * Be aware that for Digest authentication, the realm influences the digest
-     * hash. Choose the realm wisely, because if you change it later, all the
-     * existing hashes will break and nobody can authenticate.
-     *
-     * @param string $realm
-     */
-    public function setRealm($realm)
-    {
-        $this->realm = $realm;
-    }
-
-    /**
-     * Returns a users digest hash based on the username and realm.
-     *
-     * If the user was not known, null must be returned.
-     *
-     * @param string $realm
-     * @param string $username
-     *
-     * @return string|null
-     */
-    abstract public function getDigestHash($realm, $username);
-
-    /**
-     * When this method is called, the backend must check if authentication was
-     * successful.
-     *
-     * The returned value must be one of the following
-     *
-     * [true, "principals/username"]
-     * [false, "reason for failure"]
-     *
-     * If authentication was successful, it's expected that the authentication
-     * backend returns a so-called principal url.
-     *
-     * Examples of a principal url:
-     *
-     * principals/admin
-     * principals/user1
-     * principals/users/joe
-     * principals/uid/123457
-     *
-     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-     * return a string such as:
-     *
-     * principals/users/[username]
-     *
-     * @return array
-     */
-    public function check(RequestInterface $request, ResponseInterface $response)
-    {
-        $digest = new HTTP\Auth\Digest(
-            $this->realm,
-            $request,
-            $response
-        );
-        $digest->init();
-
-        $username = $digest->getUsername();
-
-        // No username was given
-        if (!$username) {
-            return [false, "No 'Authorization: Digest' header found. Either the client didn't send one, or the server is misconfigured"];
-        }
-
-        $hash = $this->getDigestHash($this->realm, $username);
-        // If this was false, the user account didn't exist
-        if (false === $hash || is_null($hash)) {
-            return [false, 'Username or password was incorrect'];
-        }
-        if (!is_string($hash)) {
-            throw new DAV\Exception('The returned value from getDigestHash must be a string or null');
-        }
-
-        // If this was false, the password or part of the hash was incorrect.
-        if (!$digest->validateA1($hash)) {
-            return [false, 'Username or password was incorrect'];
-        }
-
-        return [true, $this->principalPrefix.$username];
-    }
-
-    /**
-     * This method is called when a user could not be authenticated, and
-     * authentication was required for the current request.
-     *
-     * This gives you the opportunity to set authentication headers. The 401
-     * status code will already be set.
-     *
-     * In this case of Basic Auth, this would for example mean that the
-     * following header needs to be set:
-     *
-     * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
-     *
-     * Keep in mind that in the case of multiple authentication backends, other
-     * WWW-Authenticate headers may already have been set, and you'll want to
-     * append your own WWW-Authenticate header instead of overwriting the
-     * existing one.
-     */
-    public function challenge(RequestInterface $request, ResponseInterface $response)
-    {
-        $auth = new HTTP\Auth\Digest(
-            $this->realm,
-            $request,
-            $response
-        );
-        $auth->init();
-
-        $oldStatus = $response->getStatus() ?: 200;
-        $auth->requireLogin();
-
-        // Preventing the digest utility from modifying the http status code,
-        // this should be handled by the main plugin.
-        $response->setStatus($oldStatus);
-    }
+	/**
+	 * Authentication Realm.
+	 *
+	 * The realm is often displayed by browser clients when showing the
+	 * authentication dialog.
+	 *
+	 * @var string
+	 */
+	protected $realm = 'SabreDAV';
+
+	/**
+	 * This is the prefix that will be used to generate principal urls.
+	 *
+	 * @var string
+	 */
+	protected $principalPrefix = 'principals/';
+
+	/**
+	 * Sets the authentication realm for this backend.
+	 *
+	 * Be aware that for Digest authentication, the realm influences the digest
+	 * hash. Choose the realm wisely, because if you change it later, all the
+	 * existing hashes will break and nobody can authenticate.
+	 *
+	 * @param string $realm
+	 */
+	public function setRealm($realm)
+	{
+		$this->realm = $realm;
+	}
+
+	/**
+	 * Returns a users digest hash based on the username and realm.
+	 *
+	 * If the user was not known, null must be returned.
+	 *
+	 * @param string $realm
+	 * @param string $username
+	 *
+	 * @return string|null
+	 */
+	abstract public function getDigestHash($realm, $username);
+
+	/**
+	 * When this method is called, the backend must check if authentication was
+	 * successful.
+	 *
+	 * The returned value must be one of the following
+	 *
+	 * [true, "principals/username"]
+	 * [false, "reason for failure"]
+	 *
+	 * If authentication was successful, it's expected that the authentication
+	 * backend returns a so-called principal url.
+	 *
+	 * Examples of a principal url:
+	 *
+	 * principals/admin
+	 * principals/user1
+	 * principals/users/joe
+	 * principals/uid/123457
+	 *
+	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+	 * return a string such as:
+	 *
+	 * principals/users/[username]
+	 *
+	 * @return array
+	 */
+	public function check(RequestInterface $request, ResponseInterface $response)
+	{
+		$digest = new HTTP\Auth\Digest(
+			$this->realm,
+			$request,
+			$response
+		);
+		$digest->init();
+
+		$username = $digest->getUsername();
+
+		// No username was given
+		if (!$username) {
+			return [false, "No 'Authorization: Digest' header found. Either the client didn't send one, or the server is misconfigured"];
+		}
+
+		$hash = $this->getDigestHash($this->realm, $username);
+		// If this was false, the user account didn't exist
+		if (false === $hash || is_null($hash)) {
+			return [false, 'Username or password was incorrect'];
+		}
+		if (!is_string($hash)) {
+			throw new DAV\Exception('The returned value from getDigestHash must be a string or null');
+		}
+
+		// If this was false, the password or part of the hash was incorrect.
+		if (!$digest->validateA1($hash)) {
+			return [false, 'Username or password was incorrect'];
+		}
+
+		return [true, $this->principalPrefix.$username];
+	}
+
+	/**
+	 * This method is called when a user could not be authenticated, and
+	 * authentication was required for the current request.
+	 *
+	 * This gives you the opportunity to set authentication headers. The 401
+	 * status code will already be set.
+	 *
+	 * In this case of Basic Auth, this would for example mean that the
+	 * following header needs to be set:
+	 *
+	 * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
+	 *
+	 * Keep in mind that in the case of multiple authentication backends, other
+	 * WWW-Authenticate headers may already have been set, and you'll want to
+	 * append your own WWW-Authenticate header instead of overwriting the
+	 * existing one.
+	 */
+	public function challenge(RequestInterface $request, ResponseInterface $response)
+	{
+		$auth = new HTTP\Auth\Digest(
+			$this->realm,
+			$request,
+			$response
+		);
+		$auth->init();
+
+		$oldStatus = $response->getStatus() ?: 200;
+		$auth->requireLogin();
+
+		// Preventing the digest utility from modifying the http status code,
+		// this should be handled by the main plugin.
+		$response->setStatus($oldStatus);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/File.php

Indentation +50 added lines, -50 removed lines

@@ -17,58 +17,58 @@
  */
 class File extends AbstractDigest
 {
-    /**
-     * List of users.
-     *
-     * @var array
-     */
-    protected $users = [];
+	/**
+	 * List of users.
+	 *
+	 * @var array
+	 */
+	protected $users = [];
 
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file first.
-     *
-     * @param string|null $filename
-     */
-    public function __construct($filename = null)
-    {
-        if (!is_null($filename)) {
-            $this->loadFile($filename);
-        }
-    }
+	/**
+	 * Creates the backend object.
+	 *
+	 * If the filename argument is passed in, it will parse out the specified file first.
+	 *
+	 * @param string|null $filename
+	 */
+	public function __construct($filename = null)
+	{
+		if (!is_null($filename)) {
+			$this->loadFile($filename);
+		}
+	}
 
-    /**
-     * Loads an htdigest-formatted file. This method can be called multiple times if
-     * more than 1 file is used.
-     *
-     * @param string $filename
-     */
-    public function loadFile($filename)
-    {
-        foreach (file($filename, FILE_IGNORE_NEW_LINES) as $line) {
-            if (2 !== substr_count($line, ':')) {
-                throw new DAV\Exception('Malformed htdigest file. Every line should contain 2 colons');
-            }
-            list($username, $realm, $A1) = explode(':', $line);
+	/**
+	 * Loads an htdigest-formatted file. This method can be called multiple times if
+	 * more than 1 file is used.
+	 *
+	 * @param string $filename
+	 */
+	public function loadFile($filename)
+	{
+		foreach (file($filename, FILE_IGNORE_NEW_LINES) as $line) {
+			if (2 !== substr_count($line, ':')) {
+				throw new DAV\Exception('Malformed htdigest file. Every line should contain 2 colons');
+			}
+			list($username, $realm, $A1) = explode(':', $line);
 
-            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1)) {
-                throw new DAV\Exception('Malformed htdigest file. Invalid md5 hash');
-            }
-            $this->users[$realm.':'.$username] = $A1;
-        }
-    }
+			if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1)) {
+				throw new DAV\Exception('Malformed htdigest file. Invalid md5 hash');
+			}
+			$this->users[$realm.':'.$username] = $A1;
+		}
+	}
 
-    /**
-     * Returns a users' information.
-     *
-     * @param string $realm
-     * @param string $username
-     *
-     * @return string
-     */
-    public function getDigestHash($realm, $username)
-    {
-        return isset($this->users[$realm.':'.$username]) ? $this->users[$realm.':'.$username] : false;
-    }
+	/**
+	 * Returns a users' information.
+	 *
+	 * @param string $realm
+	 * @param string $username
+	 *
+	 * @return string
+	 */
+	public function getDigestHash($realm, $username)
+	{
+		return isset($this->users[$realm.':'.$username]) ? $this->users[$realm.':'.$username] : false;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/AbstractBearer.php

Indentation +98 added lines, -98 removed lines

@@ -23,108 +23,108 @@
  */
 abstract class AbstractBearer implements BackendInterface
 {
-    /**
-     * Authentication Realm.
-     *
-     * The realm is often displayed by browser clients when showing the
-     * authentication dialog.
-     *
-     * @var string
-     */
-    protected $realm = 'sabre/dav';
+	/**
+	 * Authentication Realm.
+	 *
+	 * The realm is often displayed by browser clients when showing the
+	 * authentication dialog.
+	 *
+	 * @var string
+	 */
+	protected $realm = 'sabre/dav';
 
-    /**
-     * Validates a Bearer token.
-     *
-     * This method should return the full principal url, or false if the
-     * token was incorrect.
-     *
-     * @param string $bearerToken
-     *
-     * @return string|false
-     */
-    abstract protected function validateBearerToken($bearerToken);
+	/**
+	 * Validates a Bearer token.
+	 *
+	 * This method should return the full principal url, or false if the
+	 * token was incorrect.
+	 *
+	 * @param string $bearerToken
+	 *
+	 * @return string|false
+	 */
+	abstract protected function validateBearerToken($bearerToken);
 
-    /**
-     * Sets the authentication realm for this backend.
-     *
-     * @param string $realm
-     */
-    public function setRealm($realm)
-    {
-        $this->realm = $realm;
-    }
+	/**
+	 * Sets the authentication realm for this backend.
+	 *
+	 * @param string $realm
+	 */
+	public function setRealm($realm)
+	{
+		$this->realm = $realm;
+	}
 
-    /**
-     * When this method is called, the backend must check if authentication was
-     * successful.
-     *
-     * The returned value must be one of the following
-     *
-     * [true, "principals/username"]
-     * [false, "reason for failure"]
-     *
-     * If authentication was successful, it's expected that the authentication
-     * backend returns a so-called principal url.
-     *
-     * Examples of a principal url:
-     *
-     * principals/admin
-     * principals/user1
-     * principals/users/joe
-     * principals/uid/123457
-     *
-     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-     * return a string such as:
-     *
-     * principals/users/[username]
-     *
-     * @return array
-     */
-    public function check(RequestInterface $request, ResponseInterface $response)
-    {
-        $auth = new HTTP\Auth\Bearer(
-            $this->realm,
-            $request,
-            $response
-        );
+	/**
+	 * When this method is called, the backend must check if authentication was
+	 * successful.
+	 *
+	 * The returned value must be one of the following
+	 *
+	 * [true, "principals/username"]
+	 * [false, "reason for failure"]
+	 *
+	 * If authentication was successful, it's expected that the authentication
+	 * backend returns a so-called principal url.
+	 *
+	 * Examples of a principal url:
+	 *
+	 * principals/admin
+	 * principals/user1
+	 * principals/users/joe
+	 * principals/uid/123457
+	 *
+	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+	 * return a string such as:
+	 *
+	 * principals/users/[username]
+	 *
+	 * @return array
+	 */
+	public function check(RequestInterface $request, ResponseInterface $response)
+	{
+		$auth = new HTTP\Auth\Bearer(
+			$this->realm,
+			$request,
+			$response
+		);
 
-        $bearerToken = $auth->getToken($request);
-        if (!$bearerToken) {
-            return [false, "No 'Authorization: Bearer' header found. Either the client didn't send one, or the server is mis-configured"];
-        }
-        $principalUrl = $this->validateBearerToken($bearerToken);
-        if (!$principalUrl) {
-            return [false, 'Bearer token was incorrect'];
-        }
+		$bearerToken = $auth->getToken($request);
+		if (!$bearerToken) {
+			return [false, "No 'Authorization: Bearer' header found. Either the client didn't send one, or the server is mis-configured"];
+		}
+		$principalUrl = $this->validateBearerToken($bearerToken);
+		if (!$principalUrl) {
+			return [false, 'Bearer token was incorrect'];
+		}
 
-        return [true, $principalUrl];
-    }
+		return [true, $principalUrl];
+	}
 
-    /**
-     * This method is called when a user could not be authenticated, and
-     * authentication was required for the current request.
-     *
-     * This gives you the opportunity to set authentication headers. The 401
-     * status code will already be set.
-     *
-     * In this case of Bearer Auth, this would for example mean that the
-     * following header needs to be set:
-     *
-     * $response->addHeader('WWW-Authenticate', 'Bearer realm=SabreDAV');
-     *
-     * Keep in mind that in the case of multiple authentication backends, other
-     * WWW-Authenticate headers may already have been set, and you'll want to
-     * append your own WWW-Authenticate header instead of overwriting the
-     * existing one.
-     */
-    public function challenge(RequestInterface $request, ResponseInterface $response)
-    {
-        $auth = new HTTP\Auth\Bearer(
-            $this->realm,
-            $request,
-            $response
-        );
-        $auth->requireLogin();
-    }
+	/**
+	 * This method is called when a user could not be authenticated, and
+	 * authentication was required for the current request.
+	 *
+	 * This gives you the opportunity to set authentication headers. The 401
+	 * status code will already be set.
+	 *
+	 * In this case of Bearer Auth, this would for example mean that the
+	 * following header needs to be set:
+	 *
+	 * $response->addHeader('WWW-Authenticate', 'Bearer realm=SabreDAV');
+	 *
+	 * Keep in mind that in the case of multiple authentication backends, other
+	 * WWW-Authenticate headers may already have been set, and you'll want to
+	 * append your own WWW-Authenticate header instead of overwriting the
+	 * existing one.
+	 */
+	public function challenge(RequestInterface $request, ResponseInterface $response)
+	{
+		$auth = new HTTP\Auth\Bearer(
+			$this->realm,
+			$request,
+			$response
+		);
+		$auth->requireLogin();
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/PDOBasicAuth.php

Indentation +91 added lines, -91 removed lines

@@ -10,105 +10,105 @@
  */
 class PDOBasicAuth extends AbstractBasic
 {
-    /**
-     * Reference to PDO connection.
-     *
-     * @var PDO
-     */
-    protected $pdo;
+	/**
+	 * Reference to PDO connection.
+	 *
+	 * @var PDO
+	 */
+	protected $pdo;
 
-    /**
-     * PDO table name we'll be using.
-     *
-     * @var string
-     */
-    protected $tableName;
+	/**
+	 * PDO table name we'll be using.
+	 *
+	 * @var string
+	 */
+	protected $tableName;
 
-    /**
-     * PDO digest column name we'll be using
-     * (i.e. digest, password, password_hash).
-     *
-     * @var string
-     */
-    protected $digestColumn;
+	/**
+	 * PDO digest column name we'll be using
+	 * (i.e. digest, password, password_hash).
+	 *
+	 * @var string
+	 */
+	protected $digestColumn;
 
-    /**
-     * PDO uuid(unique user identifier) column name we'll be using
-     * (i.e. username, email).
-     *
-     * @var string
-     */
-    protected $uuidColumn;
+	/**
+	 * PDO uuid(unique user identifier) column name we'll be using
+	 * (i.e. username, email).
+	 *
+	 * @var string
+	 */
+	protected $uuidColumn;
 
-    /**
-     * Digest prefix:
-     * if the backend you are using for is prefixing
-     * your password hashes set this option to your prefix to
-     * cut it off before verfiying.
-     *
-     * @var string
-     */
-    protected $digestPrefix;
+	/**
+	 * Digest prefix:
+	 * if the backend you are using for is prefixing
+	 * your password hashes set this option to your prefix to
+	 * cut it off before verfiying.
+	 *
+	 * @var string
+	 */
+	protected $digestPrefix;
 
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     */
-    public function __construct(\PDO $pdo, array $options = [])
-    {
-        $this->pdo = $pdo;
-        if (isset($options['tableName'])) {
-            $this->tableName = $options['tableName'];
-        } else {
-            $this->tableName = 'users';
-        }
-        if (isset($options['digestColumn'])) {
-            $this->digestColumn = $options['digestColumn'];
-        } else {
-            $this->digestColumn = 'digest';
-        }
-        if (isset($options['uuidColumn'])) {
-            $this->uuidColumn = $options['uuidColumn'];
-        } else {
-            $this->uuidColumn = 'username';
-        }
-        if (isset($options['digestPrefix'])) {
-            $this->digestPrefix = $options['digestPrefix'];
-        }
-    }
+	/**
+	 * Creates the backend object.
+	 *
+	 * If the filename argument is passed in, it will parse out the specified file fist.
+	 */
+	public function __construct(\PDO $pdo, array $options = [])
+	{
+		$this->pdo = $pdo;
+		if (isset($options['tableName'])) {
+			$this->tableName = $options['tableName'];
+		} else {
+			$this->tableName = 'users';
+		}
+		if (isset($options['digestColumn'])) {
+			$this->digestColumn = $options['digestColumn'];
+		} else {
+			$this->digestColumn = 'digest';
+		}
+		if (isset($options['uuidColumn'])) {
+			$this->uuidColumn = $options['uuidColumn'];
+		} else {
+			$this->uuidColumn = 'username';
+		}
+		if (isset($options['digestPrefix'])) {
+			$this->digestPrefix = $options['digestPrefix'];
+		}
+	}
 
-    /**
-     * Validates a username and password.
-     *
-     * This method should return true or false depending on if login
-     * succeeded.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return bool
-     */
-    public function validateUserPass($username, $password)
-    {
-        $stmt = $this->pdo->prepare('SELECT '.$this->digestColumn.' FROM '.$this->tableName.' WHERE '.$this->uuidColumn.' = ?');
-        $stmt->execute([$username]);
-        $result = $stmt->fetchAll();
+	/**
+	 * Validates a username and password.
+	 *
+	 * This method should return true or false depending on if login
+	 * succeeded.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	public function validateUserPass($username, $password)
+	{
+		$stmt = $this->pdo->prepare('SELECT '.$this->digestColumn.' FROM '.$this->tableName.' WHERE '.$this->uuidColumn.' = ?');
+		$stmt->execute([$username]);
+		$result = $stmt->fetchAll();
 
-        if (!count($result)) {
-            return false;
-        } else {
-            $digest = $result[0][$this->digestColumn];
+		if (!count($result)) {
+			return false;
+		} else {
+			$digest = $result[0][$this->digestColumn];
 
-            if (isset($this->digestPrefix)) {
-                $digest = substr($digest, strlen($this->digestPrefix));
-            }
+			if (isset($this->digestPrefix)) {
+				$digest = substr($digest, strlen($this->digestPrefix));
+			}
 
-            if (password_verify($password, $digest)) {
-                return true;
-            }
+			if (password_verify($password, $digest)) {
+				return true;
+			}
 
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/PDO.php

Indentation +35 added lines, -35 removed lines

@@ -13,43 +13,43 @@
  */
 class PDO extends AbstractDigest
 {
-    /**
-     * Reference to PDO connection.
-     *
-     * @var PDO
-     */
-    protected $pdo;
+	/**
+	 * Reference to PDO connection.
+	 *
+	 * @var PDO
+	 */
+	protected $pdo;
 
-    /**
-     * PDO table name we'll be using.
-     *
-     * @var string
-     */
-    public $tableName = 'users';
+	/**
+	 * PDO table name we'll be using.
+	 *
+	 * @var string
+	 */
+	public $tableName = 'users';
 
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     */
-    public function __construct(\PDO $pdo)
-    {
-        $this->pdo = $pdo;
-    }
+	/**
+	 * Creates the backend object.
+	 *
+	 * If the filename argument is passed in, it will parse out the specified file fist.
+	 */
+	public function __construct(\PDO $pdo)
+	{
+		$this->pdo = $pdo;
+	}
 
-    /**
-     * Returns the digest hash for a user.
-     *
-     * @param string $realm
-     * @param string $username
-     *
-     * @return string|null
-     */
-    public function getDigestHash($realm, $username)
-    {
-        $stmt = $this->pdo->prepare('SELECT digesta1 FROM '.$this->tableName.' WHERE username = ?');
-        $stmt->execute([$username]);
+	/**
+	 * Returns the digest hash for a user.
+	 *
+	 * @param string $realm
+	 * @param string $username
+	 *
+	 * @return string|null
+	 */
+	public function getDigestHash($realm, $username)
+	{
+		$stmt = $this->pdo->prepare('SELECT digesta1 FROM '.$this->tableName.' WHERE username = ?');
+		$stmt->execute([$username]);
 
-        return $stmt->fetchColumn() ?: null;
-    }
+		return $stmt->fetchColumn() ?: null;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/IMAP.php

Indentation +59 added lines, -59 removed lines

@@ -13,70 +13,70 @@
  */
 class IMAP extends AbstractBasic
 {
-    /**
-     * IMAP server in the form {host[:port][/flag1/flag2...]}.
-     *
-     * @see http://php.net/manual/en/function.imap-open.php
-     *
-     * @var string
-     */
-    protected $mailbox;
+	/**
+	 * IMAP server in the form {host[:port][/flag1/flag2...]}.
+	 *
+	 * @see http://php.net/manual/en/function.imap-open.php
+	 *
+	 * @var string
+	 */
+	protected $mailbox;
 
-    /**
-     * Creates the backend object.
-     *
-     * @param string $mailbox
-     */
-    public function __construct($mailbox)
-    {
-        $this->mailbox = $mailbox;
-    }
+	/**
+	 * Creates the backend object.
+	 *
+	 * @param string $mailbox
+	 */
+	public function __construct($mailbox)
+	{
+		$this->mailbox = $mailbox;
+	}
 
-    /**
-     * Connects to an IMAP server and tries to authenticate.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return bool
-     */
-    protected function imapOpen($username, $password)
-    {
-        $success = false;
+	/**
+	 * Connects to an IMAP server and tries to authenticate.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	protected function imapOpen($username, $password)
+	{
+		$success = false;
 
-        try {
-            $imap = imap_open($this->mailbox, $username, $password, OP_HALFOPEN | OP_READONLY, 1);
-            if ($imap) {
-                $success = true;
-            }
-        } catch (\ErrorException $e) {
-            error_log($e->getMessage());
-        }
+		try {
+			$imap = imap_open($this->mailbox, $username, $password, OP_HALFOPEN | OP_READONLY, 1);
+			if ($imap) {
+				$success = true;
+			}
+		} catch (\ErrorException $e) {
+			error_log($e->getMessage());
+		}
 
-        $errors = imap_errors();
-        if ($errors) {
-            foreach ($errors as $error) {
-                error_log($error);
-            }
-        }
+		$errors = imap_errors();
+		if ($errors) {
+			foreach ($errors as $error) {
+				error_log($error);
+			}
+		}
 
-        if (isset($imap) && $imap) {
-            imap_close($imap);
-        }
+		if (isset($imap) && $imap) {
+			imap_close($imap);
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     * Validates a username and password by trying to authenticate against IMAP.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return bool
-     */
-    protected function validateUserPass($username, $password)
-    {
-        return $this->imapOpen($username, $password);
-    }
+	/**
+	 * Validates a username and password by trying to authenticate against IMAP.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	protected function validateUserPass($username, $password)
+	{
+		return $this->imapOpen($username, $password);
+	}
 }