nextcloud / server

lib/public/Encryption/IManager.php

Indentation +55 added lines, -55 removed lines

@@ -34,67 +34,67 @@
  */
 interface IManager {
 
-	/**
-	 * Check if encryption is available (at least one encryption module needs to be enabled)
-	 *
-	 * @return bool true if enabled, false if not
-	 * @since 8.1.0
-	 */
-	public function isEnabled();
+    /**
+     * Check if encryption is available (at least one encryption module needs to be enabled)
+     *
+     * @return bool true if enabled, false if not
+     * @since 8.1.0
+     */
+    public function isEnabled();
 
-	/**
-	 * Registers an callback function which must return an encryption module instance
-	 *
-	 * @param string $id
-	 * @param string $displayName
-	 * @param callable $callback
-	 * @throws ModuleAlreadyExistsException
-	 * @since 8.1.0
-	 */
-	public function registerEncryptionModule($id, $displayName, callable $callback);
+    /**
+     * Registers an callback function which must return an encryption module instance
+     *
+     * @param string $id
+     * @param string $displayName
+     * @param callable $callback
+     * @throws ModuleAlreadyExistsException
+     * @since 8.1.0
+     */
+    public function registerEncryptionModule($id, $displayName, callable $callback);
 
-	/**
-	 * Unregisters an encryption module
-	 *
-	 * @param string $moduleId
-	 * @since 8.1.0
-	 */
-	public function unregisterEncryptionModule($moduleId);
+    /**
+     * Unregisters an encryption module
+     *
+     * @param string $moduleId
+     * @since 8.1.0
+     */
+    public function unregisterEncryptionModule($moduleId);
 
-	/**
-	 * get a list of all encryption modules
-	 *
-	 * @return array [id => ['id' => $id, 'displayName' => $displayName, 'callback' => callback]]
-	 * @since 8.1.0
-	 */
-	public function getEncryptionModules();
+    /**
+     * get a list of all encryption modules
+     *
+     * @return array [id => ['id' => $id, 'displayName' => $displayName, 'callback' => callback]]
+     * @since 8.1.0
+     */
+    public function getEncryptionModules();
 
 
-	/**
-	 * get a specific encryption module
-	 *
-	 * @param string $moduleId Empty to get the default module
-	 * @return IEncryptionModule
-	 * @throws ModuleDoesNotExistsException
-	 * @since 8.1.0
-	 */
-	public function getEncryptionModule($moduleId = '');
+    /**
+     * get a specific encryption module
+     *
+     * @param string $moduleId Empty to get the default module
+     * @return IEncryptionModule
+     * @throws ModuleDoesNotExistsException
+     * @since 8.1.0
+     */
+    public function getEncryptionModule($moduleId = '');
 
-	/**
-	 * get default encryption module Id
-	 *
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getDefaultEncryptionModuleId();
+    /**
+     * get default encryption module Id
+     *
+     * @return string
+     * @since 8.1.0
+     */
+    public function getDefaultEncryptionModuleId();
 
-	/**
-	 * set default encryption module Id
-	 *
-	 * @param string $moduleId
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function setDefaultEncryptionModule($moduleId);
+    /**
+     * set default encryption module Id
+     *
+     * @param string $moduleId
+     * @return string
+     * @since 8.1.0
+     */
+    public function setDefaultEncryptionModule($moduleId);
 
 }

lib/public/Encryption/Keys/IStorage.php

Indentation +135 added lines, -135 removed lines

@@ -33,151 +33,151 @@
  */
 interface IStorage {
 
-	/**
-	 * get user specific key
-	 *
-	 * @param string $uid ID if the user for whom we want the key
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return mixed key
-	 * @since 8.1.0
-	 */
-	public function getUserKey($uid, $keyId, $encryptionModuleId);
+    /**
+     * get user specific key
+     *
+     * @param string $uid ID if the user for whom we want the key
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return mixed key
+     * @since 8.1.0
+     */
+    public function getUserKey($uid, $keyId, $encryptionModuleId);
 
-	/**
-	 * get file specific key
-	 *
-	 * @param string $path path to file
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return mixed key
-	 * @since 8.1.0
-	 */
-	public function getFileKey($path, $keyId, $encryptionModuleId);
+    /**
+     * get file specific key
+     *
+     * @param string $path path to file
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return mixed key
+     * @since 8.1.0
+     */
+    public function getFileKey($path, $keyId, $encryptionModuleId);
 
-	/**
-	 * get system-wide encryption keys not related to a specific user,
-	 * e.g something like a key for public link shares
-	 *
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return mixed key
-	 * @since 8.1.0
-	 */
-	public function getSystemUserKey($keyId, $encryptionModuleId);
+    /**
+     * get system-wide encryption keys not related to a specific user,
+     * e.g something like a key for public link shares
+     *
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return mixed key
+     * @since 8.1.0
+     */
+    public function getSystemUserKey($keyId, $encryptionModuleId);
 
-	/**
-	 * set user specific key
-	 *
-	 * @param string $uid ID if the user for whom we want the key
-	 * @param string $keyId id of the key
-	 * @param mixed $key
-	 * @param string $encryptionModuleId
-	 * @since 8.1.0
-	 */
-	public function setUserKey($uid, $keyId, $key, $encryptionModuleId);
+    /**
+     * set user specific key
+     *
+     * @param string $uid ID if the user for whom we want the key
+     * @param string $keyId id of the key
+     * @param mixed $key
+     * @param string $encryptionModuleId
+     * @since 8.1.0
+     */
+    public function setUserKey($uid, $keyId, $key, $encryptionModuleId);
 
-	/**
-	 * set file specific key
-	 *
-	 * @param string $path path to file
-	 * @param string $keyId id of the key
-	 * @param mixed $key
-	 * @param string $encryptionModuleId
-	 * @since 8.1.0
-	 */
-	public function setFileKey($path, $keyId, $key, $encryptionModuleId);
+    /**
+     * set file specific key
+     *
+     * @param string $path path to file
+     * @param string $keyId id of the key
+     * @param mixed $key
+     * @param string $encryptionModuleId
+     * @since 8.1.0
+     */
+    public function setFileKey($path, $keyId, $key, $encryptionModuleId);
 
-	/**
-	 * set system-wide encryption keys not related to a specific user,
-	 * e.g something like a key for public link shares
-	 *
-	 * @param string $keyId id of the key
-	 * @param mixed $key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return mixed key
-	 * @since 8.1.0
-	 */
-	public function setSystemUserKey($keyId, $key, $encryptionModuleId);
+    /**
+     * set system-wide encryption keys not related to a specific user,
+     * e.g something like a key for public link shares
+     *
+     * @param string $keyId id of the key
+     * @param mixed $key
+     * @param string $encryptionModuleId
+     *
+     * @return mixed key
+     * @since 8.1.0
+     */
+    public function setSystemUserKey($keyId, $key, $encryptionModuleId);
 
-	/**
-	 * delete user specific key
-	 *
-	 * @param string $uid ID if the user for whom we want to delete the key
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return boolean False when the key could not be deleted
-	 * @since 8.1.0
-	 */
-	public function deleteUserKey($uid, $keyId, $encryptionModuleId);
+    /**
+     * delete user specific key
+     *
+     * @param string $uid ID if the user for whom we want to delete the key
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return boolean False when the key could not be deleted
+     * @since 8.1.0
+     */
+    public function deleteUserKey($uid, $keyId, $encryptionModuleId);
 
-	/**
-	 * delete file specific key
-	 *
-	 * @param string $path path to file
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return boolean False when the key could not be deleted
-	 * @since 8.1.0
-	 */
-	public function deleteFileKey($path, $keyId, $encryptionModuleId);
+    /**
+     * delete file specific key
+     *
+     * @param string $path path to file
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return boolean False when the key could not be deleted
+     * @since 8.1.0
+     */
+    public function deleteFileKey($path, $keyId, $encryptionModuleId);
 
-	/**
-	 * delete all file keys for a given file
-	 *
-	 * @param string $path to the file
-	 *
-	 * @return boolean False when the keys could not be deleted
-	 * @since 8.1.0
-	 */
-	public function deleteAllFileKeys($path);
+    /**
+     * delete all file keys for a given file
+     *
+     * @param string $path to the file
+     *
+     * @return boolean False when the keys could not be deleted
+     * @since 8.1.0
+     */
+    public function deleteAllFileKeys($path);
 
-	/**
-	 * delete system-wide encryption keys not related to a specific user,
-	 * e.g something like a key for public link shares
-	 *
-	 * @param string $keyId id of the key
-	 * @param string $encryptionModuleId
-	 *
-	 * @return boolean False when the key could not be deleted
-	 * @since 8.1.0
-	 */
-	public function deleteSystemUserKey($keyId, $encryptionModuleId);
+    /**
+     * delete system-wide encryption keys not related to a specific user,
+     * e.g something like a key for public link shares
+     *
+     * @param string $keyId id of the key
+     * @param string $encryptionModuleId
+     *
+     * @return boolean False when the key could not be deleted
+     * @since 8.1.0
+     */
+    public function deleteSystemUserKey($keyId, $encryptionModuleId);
 
-	/**
-	 * copy keys if a file was renamed
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @return boolean
-	 * @since 8.1.0
-	 */
-	public function renameKeys($source, $target);
+    /**
+     * copy keys if a file was renamed
+     *
+     * @param string $source
+     * @param string $target
+     * @return boolean
+     * @since 8.1.0
+     */
+    public function renameKeys($source, $target);
 
-	/**
-	 * move keys if a file was renamed
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @return boolean
-	 * @since 8.1.0
-	 */
-	public function copyKeys($source, $target);
+    /**
+     * move keys if a file was renamed
+     *
+     * @param string $source
+     * @param string $target
+     * @return boolean
+     * @since 8.1.0
+     */
+    public function copyKeys($source, $target);
 
-	/**
-	 * backup keys of a given encryption module
-	 *
-	 * @param string $encryptionModuleId
-	 * @param string $purpose
-	 * @param string $uid
-	 * @return bool
-	 * @since 12.0.0
-	 */
-	public function backupUserKeys($encryptionModuleId, $purpose, $uid);
+    /**
+     * backup keys of a given encryption module
+     *
+     * @param string $encryptionModuleId
+     * @param string $purpose
+     * @param string $uid
+     * @return bool
+     * @since 12.0.0
+     */
+    public function backupUserKeys($encryptionModuleId, $purpose, $uid);
 }

lib/private/Authentication/LoginCredentials/Credentials.php

Indentation +34 added lines, -34 removed lines

@@ -28,45 +28,45 @@
 
 class Credentials implements ICredentials {
 
-	/** @var string */
-	private $uid;
+    /** @var string */
+    private $uid;
 
-	/** @var string */
-	private $loginName;
+    /** @var string */
+    private $loginName;
 
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @param string $uid
-	 * @param string $loginName
-	 * @param string $password
-	 */
-	public function __construct($uid, $loginName, $password) {
-		$this->uid = $uid;
-		$this->loginName = $loginName;
-		$this->password = $password;
-	}
+    /**
+     * @param string $uid
+     * @param string $loginName
+     * @param string $password
+     */
+    public function __construct($uid, $loginName, $password) {
+        $this->uid = $uid;
+        $this->loginName = $loginName;
+        $this->password = $password;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getUID() {
-		return $this->uid;
-	}
+    /**
+     * @return string
+     */
+    public function getUID() {
+        return $this->uid;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLoginName() {
-		return $this->loginName;
-	}
+    /**
+     * @return string
+     */
+    public function getLoginName() {
+        return $this->loginName;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
+    /**
+     * @return string
+     */
+    public function getPassword() {
+        return $this->password;
+    }
 
 }

lib/private/Authentication/LoginCredentials/Store.php

Indentation +79 added lines, -79 removed lines

@@ -37,84 +37,84 @@
 
 class Store implements IStore {
 
-	/** @var ISession */
-	private $session;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IProvider|null */
-	private $tokenProvider;
-
-	/**
-	 * @param ISession $session
-	 * @param ILogger $logger
-	 * @param IProvider $tokenProvider
-	 */
-	public function __construct(ISession $session, ILogger $logger, IProvider $tokenProvider = null) {
-		$this->session = $session;
-		$this->logger = $logger;
-		$this->tokenProvider = $tokenProvider;
-
-		Util::connectHook('OC_User', 'post_login', $this, 'authenticate');
-	}
-
-	/**
-	 * Hook listener on post login
-	 *
-	 * @param array $params
-	 */
-	public function authenticate(array $params) {
-		$this->session->set('login_credentials', json_encode($params));
-	}
-
-	/**
-	 * Replace the session implementation
-	 *
-	 * @param ISession $session
-	 */
-	public function setSession(ISession $session) {
-		$this->session = $session;
-	}
-
-	/**
-	 * @since 12
-	 *
-	 * @return ICredentials the login credentials of the current user
-	 * @throws CredentialsUnavailableException
-	 */
-	public function getLoginCredentials() {
-		if (is_null($this->tokenProvider)) {
-			throw new CredentialsUnavailableException();
-		}
-
-		$trySession = false;
-		try {
-			$sessionId = $this->session->getId();
-			$token = $this->tokenProvider->getToken($sessionId);
-
-			$uid = $token->getUID();
-			$user = $token->getLoginName();
-			$password = $this->tokenProvider->getPassword($token, $sessionId);
-
-			return new Credentials($uid, $user, $password);
-		} catch (SessionNotAvailableException $ex) {
-			$this->logger->debug('could not get login credentials because session is unavailable', ['app' => 'core']);
-		} catch (InvalidTokenException $ex) {
-			$this->logger->debug('could not get login credentials because the token is invalid', ['app' => 'core']);
-			$trySession = true;
-		} catch (PasswordlessTokenException $ex) {
-			$this->logger->debug('could not get login credentials because the token has no password', ['app' => 'core']);
-			$trySession = true;
-		}
-
-		if ($trySession && $this->session->exists('login_credentials')) {
-			$creds = json_decode($this->session->get('login_credentials'));
-			return new Credentials($creds->uid, $creds->uid, $creds->password);
-		}
-
-		// If we reach this line, an exception was thrown.
-		throw new CredentialsUnavailableException();
-	}
+    /** @var ISession */
+    private $session;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IProvider|null */
+    private $tokenProvider;
+
+    /**
+     * @param ISession $session
+     * @param ILogger $logger
+     * @param IProvider $tokenProvider
+     */
+    public function __construct(ISession $session, ILogger $logger, IProvider $tokenProvider = null) {
+        $this->session = $session;
+        $this->logger = $logger;
+        $this->tokenProvider = $tokenProvider;
+
+        Util::connectHook('OC_User', 'post_login', $this, 'authenticate');
+    }
+
+    /**
+     * Hook listener on post login
+     *
+     * @param array $params
+     */
+    public function authenticate(array $params) {
+        $this->session->set('login_credentials', json_encode($params));
+    }
+
+    /**
+     * Replace the session implementation
+     *
+     * @param ISession $session
+     */
+    public function setSession(ISession $session) {
+        $this->session = $session;
+    }
+
+    /**
+     * @since 12
+     *
+     * @return ICredentials the login credentials of the current user
+     * @throws CredentialsUnavailableException
+     */
+    public function getLoginCredentials() {
+        if (is_null($this->tokenProvider)) {
+            throw new CredentialsUnavailableException();
+        }
+
+        $trySession = false;
+        try {
+            $sessionId = $this->session->getId();
+            $token = $this->tokenProvider->getToken($sessionId);
+
+            $uid = $token->getUID();
+            $user = $token->getLoginName();
+            $password = $this->tokenProvider->getPassword($token, $sessionId);
+
+            return new Credentials($uid, $user, $password);
+        } catch (SessionNotAvailableException $ex) {
+            $this->logger->debug('could not get login credentials because session is unavailable', ['app' => 'core']);
+        } catch (InvalidTokenException $ex) {
+            $this->logger->debug('could not get login credentials because the token is invalid', ['app' => 'core']);
+            $trySession = true;
+        } catch (PasswordlessTokenException $ex) {
+            $this->logger->debug('could not get login credentials because the token has no password', ['app' => 'core']);
+            $trySession = true;
+        }
+
+        if ($trySession && $this->session->exists('login_credentials')) {
+            $creds = json_decode($this->session->get('login_credentials'));
+            return new Credentials($creds->uid, $creds->uid, $creds->password);
+        }
+
+        // If we reach this line, an exception was thrown.
+        throw new CredentialsUnavailableException();
+    }
 
 }

lib/private/Security/CredentialsManager.php

Indentation +78 added lines, -78 removed lines

@@ -34,93 +34,93 @@
  */
 class CredentialsManager implements ICredentialsManager {
 
-	const DB_TABLE = 'credentials';
+    const DB_TABLE = 'credentials';
 
-	/** @var ICrypto */
-	protected $crypto;
+    /** @var ICrypto */
+    protected $crypto;
 
-	/** @var IDBConnection */
-	protected $dbConnection;
+    /** @var IDBConnection */
+    protected $dbConnection;
 
-	/**
-	 * @param ICrypto $crypto
-	 * @param IDBConnection $dbConnection
-	 */
-	public function __construct(ICrypto $crypto, IDBConnection $dbConnection) {
-		$this->crypto = $crypto;
-		$this->dbConnection = $dbConnection;
-	}
+    /**
+     * @param ICrypto $crypto
+     * @param IDBConnection $dbConnection
+     */
+    public function __construct(ICrypto $crypto, IDBConnection $dbConnection) {
+        $this->crypto = $crypto;
+        $this->dbConnection = $dbConnection;
+    }
 
-	/**
-	 * Store a set of credentials
-	 *
-	 * @param string|null $userId Null for system-wide credentials
-	 * @param string $identifier
-	 * @param mixed $credentials
-	 */
-	public function store($userId, $identifier, $credentials) {
-		$value = $this->crypto->encrypt(json_encode($credentials));
+    /**
+     * Store a set of credentials
+     *
+     * @param string|null $userId Null for system-wide credentials
+     * @param string $identifier
+     * @param mixed $credentials
+     */
+    public function store($userId, $identifier, $credentials) {
+        $value = $this->crypto->encrypt(json_encode($credentials));
 
-		$this->dbConnection->setValues(self::DB_TABLE, [
-			'user' => $userId,
-			'identifier' => $identifier,
-		], [
-			'credentials' => $value,
-		]);
-	}
+        $this->dbConnection->setValues(self::DB_TABLE, [
+            'user' => $userId,
+            'identifier' => $identifier,
+        ], [
+            'credentials' => $value,
+        ]);
+    }
 
-	/**
-	 * Retrieve a set of credentials
-	 *
-	 * @param string|null $userId Null for system-wide credentials
-	 * @param string $identifier
-	 * @return mixed
-	 */
-	public function retrieve($userId, $identifier) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('credentials')
-			->from(self::DB_TABLE)
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
-			->andWhere($qb->expr()->eq('identifier', $qb->createNamedParameter($identifier)))
-		;
-		$result = $qb->execute()->fetch();
+    /**
+     * Retrieve a set of credentials
+     *
+     * @param string|null $userId Null for system-wide credentials
+     * @param string $identifier
+     * @return mixed
+     */
+    public function retrieve($userId, $identifier) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('credentials')
+            ->from(self::DB_TABLE)
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
+            ->andWhere($qb->expr()->eq('identifier', $qb->createNamedParameter($identifier)))
+        ;
+        $result = $qb->execute()->fetch();
 
-		if (!$result) {
-			return null;
-		}
-		$value = $result['credentials'];
+        if (!$result) {
+            return null;
+        }
+        $value = $result['credentials'];
 
-		return json_decode($this->crypto->decrypt($value), true);
-	}
+        return json_decode($this->crypto->decrypt($value), true);
+    }
 
-	/**
-	 * Delete a set of credentials
-	 *
-	 * @param string|null $userId Null for system-wide credentials
-	 * @param string $identifier
-	 * @return int rows removed
-	 */
-	public function delete($userId, $identifier) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete(self::DB_TABLE)
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
-			->andWhere($qb->expr()->eq('identifier', $qb->createNamedParameter($identifier)))
-		;
-		return $qb->execute();
-	}
+    /**
+     * Delete a set of credentials
+     *
+     * @param string|null $userId Null for system-wide credentials
+     * @param string $identifier
+     * @return int rows removed
+     */
+    public function delete($userId, $identifier) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete(self::DB_TABLE)
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
+            ->andWhere($qb->expr()->eq('identifier', $qb->createNamedParameter($identifier)))
+        ;
+        return $qb->execute();
+    }
 
-	/**
-	 * Erase all credentials stored for a user
-	 *
-	 * @param string $userId
-	 * @return int rows removed
-	 */
-	public function erase($userId) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete(self::DB_TABLE)
-			->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
-		;
-		return $qb->execute();
-	}
+    /**
+     * Erase all credentials stored for a user
+     *
+     * @param string $userId
+     * @return int rows removed
+     */
+    public function erase($userId) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete(self::DB_TABLE)
+            ->where($qb->expr()->eq('user', $qb->createNamedParameter($userId)))
+        ;
+        return $qb->execute();
+    }
 
 }

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

lib/private/Notification/Notification.php

Indentation +551 added lines, -551 removed lines

@@ -31,555 +31,555 @@
 
 class Notification implements INotification {
 
-	/** @var IValidator */
-	protected $richValidator;
-
-	/** @var string */
-	protected $app;
-
-	/** @var string */
-	protected $user;
-
-	/** @var \DateTime */
-	protected $dateTime;
-
-	/** @var string */
-	protected $objectType;
-
-	/** @var string */
-	protected $objectId;
-
-	/** @var string */
-	protected $subject;
-
-	/** @var array */
-	protected $subjectParameters;
-
-	/** @var string */
-	protected $subjectParsed;
-
-	/** @var string */
-	protected $subjectRich;
-
-	/** @var array */
-	protected $subjectRichParameters;
-
-	/** @var string */
-	protected $message;
-
-	/** @var array */
-	protected $messageParameters;
-
-	/** @var string */
-	protected $messageParsed;
-
-	/** @var string */
-	protected $messageRich;
-
-	/** @var array */
-	protected $messageRichParameters;
-
-	/** @var string */
-	protected $link;
-
-	/** @var string */
-	protected $icon;
-
-	/** @var array */
-	protected $actions;
-
-	/** @var array */
-	protected $actionsParsed;
-
-	/** @var bool */
-	protected $hasPrimaryAction;
-
-	/** @var bool */
-	protected $hasPrimaryParsedAction;
-
-	/**
-	 * Constructor
-	 *
-	 * @param IValidator $richValidator
-	 */
-	public function __construct(IValidator $richValidator) {
-		$this->richValidator = $richValidator;
-		$this->app = '';
-		$this->user = '';
-		$this->dateTime = new \DateTime();
-		$this->dateTime->setTimestamp(0);
-		$this->objectType = '';
-		$this->objectId = '';
-		$this->subject = '';
-		$this->subjectParameters = [];
-		$this->subjectParsed = '';
-		$this->subjectRich = '';
-		$this->subjectRichParameters = [];
-		$this->message = '';
-		$this->messageParameters = [];
-		$this->messageParsed = '';
-		$this->messageRich = '';
-		$this->messageRichParameters = [];
-		$this->link = '';
-		$this->icon = '';
-		$this->actions = [];
-		$this->actionsParsed = [];
-	}
-
-	/**
-	 * @param string $app
-	 * @return $this
-	 * @throws \InvalidArgumentException if the app id is invalid
-	 * @since 8.2.0
-	 */
-	public function setApp($app) {
-		if (!is_string($app) || $app === '' || isset($app[32])) {
-			throw new \InvalidArgumentException('The given app name is invalid');
-		}
-		$this->app = $app;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getApp() {
-		return $this->app;
-	}
-
-	/**
-	 * @param string $user
-	 * @return $this
-	 * @throws \InvalidArgumentException if the user id is invalid
-	 * @since 8.2.0
-	 */
-	public function setUser($user) {
-		if (!is_string($user) || $user === '' || isset($user[64])) {
-			throw new \InvalidArgumentException('The given user id is invalid');
-		}
-		$this->user = $user;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	/**
-	 * @param \DateTime $dateTime
-	 * @return $this
-	 * @throws \InvalidArgumentException if the $dateTime is invalid
-	 * @since 9.0.0
-	 */
-	public function setDateTime(\DateTime $dateTime) {
-		if ($dateTime->getTimestamp() === 0) {
-			throw new \InvalidArgumentException('The given date time is invalid');
-		}
-		$this->dateTime = $dateTime;
-		return $this;
-	}
-
-	/**
-	 * @return \DateTime
-	 * @since 9.0.0
-	 */
-	public function getDateTime() {
-		return $this->dateTime;
-	}
-
-	/**
-	 * @param string $type
-	 * @param string $id
-	 * @return $this
-	 * @throws \InvalidArgumentException if the object type or id is invalid
-	 * @since 8.2.0 - 9.0.0: Type of $id changed to string
-	 */
-	public function setObject($type, $id) {
-		if (!is_string($type) || $type === '' || isset($type[64])) {
-			throw new \InvalidArgumentException('The given object type is invalid');
-		}
-		$this->objectType = $type;
-
-		if (!is_int($id) && (!is_string($id) || $id === '' || isset($id[64]))) {
-			throw new \InvalidArgumentException('The given object id is invalid');
-		}
-		$this->objectId = (string) $id;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getObjectType() {
-		return $this->objectType;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0 - 9.0.0: Return type changed to string
-	 */
-	public function getObjectId() {
-		return $this->objectId;
-	}
-
-	/**
-	 * @param string $subject
-	 * @param array $parameters
-	 * @return $this
-	 * @throws \InvalidArgumentException if the subject or parameters are invalid
-	 * @since 8.2.0
-	 */
-	public function setSubject($subject, array $parameters = []) {
-		if (!is_string($subject) || $subject === '' || isset($subject[64])) {
-			throw new \InvalidArgumentException('The given subject is invalid');
-		}
-
-		$this->subject = $subject;
-		$this->subjectParameters = $parameters;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getSubject() {
-		return $this->subject;
-	}
-
-	/**
-	 * @return string[]
-	 * @since 8.2.0
-	 */
-	public function getSubjectParameters() {
-		return $this->subjectParameters;
-	}
-
-	/**
-	 * @param string $subject
-	 * @return $this
-	 * @throws \InvalidArgumentException if the subject is invalid
-	 * @since 8.2.0
-	 */
-	public function setParsedSubject($subject) {
-		if (!is_string($subject) || $subject === '') {
-			throw new \InvalidArgumentException('The given parsed subject is invalid');
-		}
-		$this->subjectParsed = $subject;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getParsedSubject() {
-		return $this->subjectParsed;
-	}
-
-	/**
-	 * @param string $subject
-	 * @param array $parameters
-	 * @return $this
-	 * @throws \InvalidArgumentException if the subject or parameters are invalid
-	 * @since 11.0.0
-	 */
-	public function setRichSubject($subject, array $parameters = []) {
-		if (!is_string($subject) || $subject === '') {
-			throw new \InvalidArgumentException('The given parsed subject is invalid');
-		}
-
-		$this->subjectRich = $subject;
-		$this->subjectRichParameters = $parameters;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getRichSubject() {
-		return $this->subjectRich;
-	}
-
-	/**
-	 * @return array[]
-	 * @since 11.0.0
-	 */
-	public function getRichSubjectParameters() {
-		return $this->subjectRichParameters;
-	}
-
-	/**
-	 * @param string $message
-	 * @param array $parameters
-	 * @return $this
-	 * @throws \InvalidArgumentException if the message or parameters are invalid
-	 * @since 8.2.0
-	 */
-	public function setMessage($message, array $parameters = []) {
-		if (!is_string($message) || $message === '' || isset($message[64])) {
-			throw new \InvalidArgumentException('The given message is invalid');
-		}
-
-		$this->message = $message;
-		$this->messageParameters = $parameters;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
-
-	/**
-	 * @return string[]
-	 * @since 8.2.0
-	 */
-	public function getMessageParameters() {
-		return $this->messageParameters;
-	}
-
-	/**
-	 * @param string $message
-	 * @return $this
-	 * @throws \InvalidArgumentException if the message is invalid
-	 * @since 8.2.0
-	 */
-	public function setParsedMessage($message) {
-		if (!is_string($message) || $message === '') {
-			throw new \InvalidArgumentException('The given parsed message is invalid');
-		}
-		$this->messageParsed = $message;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getParsedMessage() {
-		return $this->messageParsed;
-	}
-
-	/**
-	 * @param string $message
-	 * @param array $parameters
-	 * @return $this
-	 * @throws \InvalidArgumentException if the message or parameters are invalid
-	 * @since 11.0.0
-	 */
-	public function setRichMessage($message, array $parameters = []) {
-		if (!is_string($message) || $message === '') {
-			throw new \InvalidArgumentException('The given parsed message is invalid');
-		}
-
-		$this->messageRich = $message;
-		$this->messageRichParameters = $parameters;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getRichMessage() {
-		return $this->messageRich;
-	}
-
-	/**
-	 * @return array[]
-	 * @since 11.0.0
-	 */
-	public function getRichMessageParameters() {
-		return $this->messageRichParameters;
-	}
-
-	/**
-	 * @param string $link
-	 * @return $this
-	 * @throws \InvalidArgumentException if the link is invalid
-	 * @since 8.2.0
-	 */
-	public function setLink($link) {
-		if (!is_string($link) || $link === '' || isset($link[4000])) {
-			throw new \InvalidArgumentException('The given link is invalid');
-		}
-		$this->link = $link;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLink() {
-		return $this->link;
-	}
-
-	/**
-	 * @param string $icon
-	 * @return $this
-	 * @throws \InvalidArgumentException if the icon is invalid
-	 * @since 11.0.0
-	 */
-	public function setIcon($icon) {
-		if (!is_string($icon) || $icon === '' || isset($icon[4000])) {
-			throw new \InvalidArgumentException('The given icon is invalid');
-		}
-		$this->icon = $icon;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
-
-	/**
-	 * @return IAction
-	 * @since 8.2.0
-	 */
-	public function createAction() {
-		return new Action();
-	}
-
-	/**
-	 * @param IAction $action
-	 * @return $this
-	 * @throws \InvalidArgumentException if the action is invalid
-	 * @since 8.2.0
-	 */
-	public function addAction(IAction $action) {
-		if (!$action->isValid()) {
-			throw new \InvalidArgumentException('The given action is invalid');
-		}
-
-		if ($action->isPrimary()) {
-			if ($this->hasPrimaryAction) {
-				throw new \InvalidArgumentException('The notification already has a primary action');
-			}
-
-			$this->hasPrimaryAction = true;
-		}
-
-		$this->actions[] = $action;
-		return $this;
-	}
-
-	/**
-	 * @return IAction[]
-	 * @since 8.2.0
-	 */
-	public function getActions() {
-		return $this->actions;
-	}
-
-	/**
-	 * @param IAction $action
-	 * @return $this
-	 * @throws \InvalidArgumentException if the action is invalid
-	 * @since 8.2.0
-	 */
-	public function addParsedAction(IAction $action) {
-		if (!$action->isValidParsed()) {
-			throw new \InvalidArgumentException('The given parsed action is invalid');
-		}
-
-		if ($action->isPrimary()) {
-			if ($this->hasPrimaryParsedAction) {
-				throw new \InvalidArgumentException('The notification already has a primary action');
-			}
-
-			$this->hasPrimaryParsedAction = true;
-
-			// Make sure the primary action is always the first one
-			array_unshift($this->actionsParsed, $action);
-		} else {
-			$this->actionsParsed[] = $action;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @return IAction[]
-	 * @since 8.2.0
-	 */
-	public function getParsedActions() {
-		return $this->actionsParsed;
-	}
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function isValid() {
-		return
-			$this->isValidCommon()
-			&&
-			$this->getSubject() !== ''
-		;
-	}
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function isValidParsed() {
-		if ($this->getRichSubject() !== '' || !empty($this->getRichSubjectParameters())) {
-			try {
-				$this->richValidator->validate($this->getRichSubject(), $this->getRichSubjectParameters());
-			} catch (InvalidObjectExeption $e) {
-				return false;
-			}
-		}
-
-		if ($this->getRichMessage() !== '' || !empty($this->getRichMessageParameters())) {
-			try {
-				$this->richValidator->validate($this->getRichMessage(), $this->getRichMessageParameters());
-			} catch (InvalidObjectExeption $e) {
-				return false;
-			}
-		}
-
-		return
-			$this->isValidCommon()
-			&&
-			$this->getParsedSubject() !== ''
-		;
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isValidCommon() {
-		return
-			$this->getApp() !== ''
-			&&
-			$this->getUser() !== ''
-			&&
-			$this->getDateTime()->getTimestamp() !== 0
-			&&
-			$this->getObjectType() !== ''
-			&&
-			$this->getObjectId() !== ''
-		;
-	}
+    /** @var IValidator */
+    protected $richValidator;
+
+    /** @var string */
+    protected $app;
+
+    /** @var string */
+    protected $user;
+
+    /** @var \DateTime */
+    protected $dateTime;
+
+    /** @var string */
+    protected $objectType;
+
+    /** @var string */
+    protected $objectId;
+
+    /** @var string */
+    protected $subject;
+
+    /** @var array */
+    protected $subjectParameters;
+
+    /** @var string */
+    protected $subjectParsed;
+
+    /** @var string */
+    protected $subjectRich;
+
+    /** @var array */
+    protected $subjectRichParameters;
+
+    /** @var string */
+    protected $message;
+
+    /** @var array */
+    protected $messageParameters;
+
+    /** @var string */
+    protected $messageParsed;
+
+    /** @var string */
+    protected $messageRich;
+
+    /** @var array */
+    protected $messageRichParameters;
+
+    /** @var string */
+    protected $link;
+
+    /** @var string */
+    protected $icon;
+
+    /** @var array */
+    protected $actions;
+
+    /** @var array */
+    protected $actionsParsed;
+
+    /** @var bool */
+    protected $hasPrimaryAction;
+
+    /** @var bool */
+    protected $hasPrimaryParsedAction;
+
+    /**
+     * Constructor
+     *
+     * @param IValidator $richValidator
+     */
+    public function __construct(IValidator $richValidator) {
+        $this->richValidator = $richValidator;
+        $this->app = '';
+        $this->user = '';
+        $this->dateTime = new \DateTime();
+        $this->dateTime->setTimestamp(0);
+        $this->objectType = '';
+        $this->objectId = '';
+        $this->subject = '';
+        $this->subjectParameters = [];
+        $this->subjectParsed = '';
+        $this->subjectRich = '';
+        $this->subjectRichParameters = [];
+        $this->message = '';
+        $this->messageParameters = [];
+        $this->messageParsed = '';
+        $this->messageRich = '';
+        $this->messageRichParameters = [];
+        $this->link = '';
+        $this->icon = '';
+        $this->actions = [];
+        $this->actionsParsed = [];
+    }
+
+    /**
+     * @param string $app
+     * @return $this
+     * @throws \InvalidArgumentException if the app id is invalid
+     * @since 8.2.0
+     */
+    public function setApp($app) {
+        if (!is_string($app) || $app === '' || isset($app[32])) {
+            throw new \InvalidArgumentException('The given app name is invalid');
+        }
+        $this->app = $app;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getApp() {
+        return $this->app;
+    }
+
+    /**
+     * @param string $user
+     * @return $this
+     * @throws \InvalidArgumentException if the user id is invalid
+     * @since 8.2.0
+     */
+    public function setUser($user) {
+        if (!is_string($user) || $user === '' || isset($user[64])) {
+            throw new \InvalidArgumentException('The given user id is invalid');
+        }
+        $this->user = $user;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    /**
+     * @param \DateTime $dateTime
+     * @return $this
+     * @throws \InvalidArgumentException if the $dateTime is invalid
+     * @since 9.0.0
+     */
+    public function setDateTime(\DateTime $dateTime) {
+        if ($dateTime->getTimestamp() === 0) {
+            throw new \InvalidArgumentException('The given date time is invalid');
+        }
+        $this->dateTime = $dateTime;
+        return $this;
+    }
+
+    /**
+     * @return \DateTime
+     * @since 9.0.0
+     */
+    public function getDateTime() {
+        return $this->dateTime;
+    }
+
+    /**
+     * @param string $type
+     * @param string $id
+     * @return $this
+     * @throws \InvalidArgumentException if the object type or id is invalid
+     * @since 8.2.0 - 9.0.0: Type of $id changed to string
+     */
+    public function setObject($type, $id) {
+        if (!is_string($type) || $type === '' || isset($type[64])) {
+            throw new \InvalidArgumentException('The given object type is invalid');
+        }
+        $this->objectType = $type;
+
+        if (!is_int($id) && (!is_string($id) || $id === '' || isset($id[64]))) {
+            throw new \InvalidArgumentException('The given object id is invalid');
+        }
+        $this->objectId = (string) $id;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getObjectType() {
+        return $this->objectType;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0 - 9.0.0: Return type changed to string
+     */
+    public function getObjectId() {
+        return $this->objectId;
+    }
+
+    /**
+     * @param string $subject
+     * @param array $parameters
+     * @return $this
+     * @throws \InvalidArgumentException if the subject or parameters are invalid
+     * @since 8.2.0
+     */
+    public function setSubject($subject, array $parameters = []) {
+        if (!is_string($subject) || $subject === '' || isset($subject[64])) {
+            throw new \InvalidArgumentException('The given subject is invalid');
+        }
+
+        $this->subject = $subject;
+        $this->subjectParameters = $parameters;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getSubject() {
+        return $this->subject;
+    }
+
+    /**
+     * @return string[]
+     * @since 8.2.0
+     */
+    public function getSubjectParameters() {
+        return $this->subjectParameters;
+    }
+
+    /**
+     * @param string $subject
+     * @return $this
+     * @throws \InvalidArgumentException if the subject is invalid
+     * @since 8.2.0
+     */
+    public function setParsedSubject($subject) {
+        if (!is_string($subject) || $subject === '') {
+            throw new \InvalidArgumentException('The given parsed subject is invalid');
+        }
+        $this->subjectParsed = $subject;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getParsedSubject() {
+        return $this->subjectParsed;
+    }
+
+    /**
+     * @param string $subject
+     * @param array $parameters
+     * @return $this
+     * @throws \InvalidArgumentException if the subject or parameters are invalid
+     * @since 11.0.0
+     */
+    public function setRichSubject($subject, array $parameters = []) {
+        if (!is_string($subject) || $subject === '') {
+            throw new \InvalidArgumentException('The given parsed subject is invalid');
+        }
+
+        $this->subjectRich = $subject;
+        $this->subjectRichParameters = $parameters;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getRichSubject() {
+        return $this->subjectRich;
+    }
+
+    /**
+     * @return array[]
+     * @since 11.0.0
+     */
+    public function getRichSubjectParameters() {
+        return $this->subjectRichParameters;
+    }
+
+    /**
+     * @param string $message
+     * @param array $parameters
+     * @return $this
+     * @throws \InvalidArgumentException if the message or parameters are invalid
+     * @since 8.2.0
+     */
+    public function setMessage($message, array $parameters = []) {
+        if (!is_string($message) || $message === '' || isset($message[64])) {
+            throw new \InvalidArgumentException('The given message is invalid');
+        }
+
+        $this->message = $message;
+        $this->messageParameters = $parameters;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getMessage() {
+        return $this->message;
+    }
+
+    /**
+     * @return string[]
+     * @since 8.2.0
+     */
+    public function getMessageParameters() {
+        return $this->messageParameters;
+    }
+
+    /**
+     * @param string $message
+     * @return $this
+     * @throws \InvalidArgumentException if the message is invalid
+     * @since 8.2.0
+     */
+    public function setParsedMessage($message) {
+        if (!is_string($message) || $message === '') {
+            throw new \InvalidArgumentException('The given parsed message is invalid');
+        }
+        $this->messageParsed = $message;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getParsedMessage() {
+        return $this->messageParsed;
+    }
+
+    /**
+     * @param string $message
+     * @param array $parameters
+     * @return $this
+     * @throws \InvalidArgumentException if the message or parameters are invalid
+     * @since 11.0.0
+     */
+    public function setRichMessage($message, array $parameters = []) {
+        if (!is_string($message) || $message === '') {
+            throw new \InvalidArgumentException('The given parsed message is invalid');
+        }
+
+        $this->messageRich = $message;
+        $this->messageRichParameters = $parameters;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getRichMessage() {
+        return $this->messageRich;
+    }
+
+    /**
+     * @return array[]
+     * @since 11.0.0
+     */
+    public function getRichMessageParameters() {
+        return $this->messageRichParameters;
+    }
+
+    /**
+     * @param string $link
+     * @return $this
+     * @throws \InvalidArgumentException if the link is invalid
+     * @since 8.2.0
+     */
+    public function setLink($link) {
+        if (!is_string($link) || $link === '' || isset($link[4000])) {
+            throw new \InvalidArgumentException('The given link is invalid');
+        }
+        $this->link = $link;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLink() {
+        return $this->link;
+    }
+
+    /**
+     * @param string $icon
+     * @return $this
+     * @throws \InvalidArgumentException if the icon is invalid
+     * @since 11.0.0
+     */
+    public function setIcon($icon) {
+        if (!is_string($icon) || $icon === '' || isset($icon[4000])) {
+            throw new \InvalidArgumentException('The given icon is invalid');
+        }
+        $this->icon = $icon;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->icon;
+    }
+
+    /**
+     * @return IAction
+     * @since 8.2.0
+     */
+    public function createAction() {
+        return new Action();
+    }
+
+    /**
+     * @param IAction $action
+     * @return $this
+     * @throws \InvalidArgumentException if the action is invalid
+     * @since 8.2.0
+     */
+    public function addAction(IAction $action) {
+        if (!$action->isValid()) {
+            throw new \InvalidArgumentException('The given action is invalid');
+        }
+
+        if ($action->isPrimary()) {
+            if ($this->hasPrimaryAction) {
+                throw new \InvalidArgumentException('The notification already has a primary action');
+            }
+
+            $this->hasPrimaryAction = true;
+        }
+
+        $this->actions[] = $action;
+        return $this;
+    }
+
+    /**
+     * @return IAction[]
+     * @since 8.2.0
+     */
+    public function getActions() {
+        return $this->actions;
+    }
+
+    /**
+     * @param IAction $action
+     * @return $this
+     * @throws \InvalidArgumentException if the action is invalid
+     * @since 8.2.0
+     */
+    public function addParsedAction(IAction $action) {
+        if (!$action->isValidParsed()) {
+            throw new \InvalidArgumentException('The given parsed action is invalid');
+        }
+
+        if ($action->isPrimary()) {
+            if ($this->hasPrimaryParsedAction) {
+                throw new \InvalidArgumentException('The notification already has a primary action');
+            }
+
+            $this->hasPrimaryParsedAction = true;
+
+            // Make sure the primary action is always the first one
+            array_unshift($this->actionsParsed, $action);
+        } else {
+            $this->actionsParsed[] = $action;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return IAction[]
+     * @since 8.2.0
+     */
+    public function getParsedActions() {
+        return $this->actionsParsed;
+    }
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function isValid() {
+        return
+            $this->isValidCommon()
+            &&
+            $this->getSubject() !== ''
+        ;
+    }
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function isValidParsed() {
+        if ($this->getRichSubject() !== '' || !empty($this->getRichSubjectParameters())) {
+            try {
+                $this->richValidator->validate($this->getRichSubject(), $this->getRichSubjectParameters());
+            } catch (InvalidObjectExeption $e) {
+                return false;
+            }
+        }
+
+        if ($this->getRichMessage() !== '' || !empty($this->getRichMessageParameters())) {
+            try {
+                $this->richValidator->validate($this->getRichMessage(), $this->getRichMessageParameters());
+            } catch (InvalidObjectExeption $e) {
+                return false;
+            }
+        }
+
+        return
+            $this->isValidCommon()
+            &&
+            $this->getParsedSubject() !== ''
+        ;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isValidCommon() {
+        return
+            $this->getApp() !== ''
+            &&
+            $this->getUser() !== ''
+            &&
+            $this->getDateTime()->getTimestamp() !== 0
+            &&
+            $this->getObjectType() !== ''
+            &&
+            $this->getObjectId() !== ''
+        ;
+    }
 }

lib/private/Notification/Action.php

Indentation +144 added lines, -144 removed lines

@@ -27,148 +27,148 @@
 
 class Action implements IAction {
 
-	/** @var string */
-	protected $label;
-
-	/** @var string */
-	protected $labelParsed;
-
-	/** @var string */
-	protected $link;
-
-	/** @var string */
-	protected $requestType;
-
-	/** @var string */
-	protected $icon;
-
-	/** @var bool */
-	protected $primary;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->label = '';
-		$this->labelParsed = '';
-		$this->link = '';
-		$this->requestType = '';
-		$this->primary = false;
-	}
-
-	/**
-	 * @param string $label
-	 * @return $this
-	 * @throws \InvalidArgumentException if the label is invalid
-	 * @since 8.2.0
-	 */
-	public function setLabel($label) {
-		if (!is_string($label) || $label === '' || isset($label[32])) {
-			throw new \InvalidArgumentException('The given label is invalid');
-		}
-		$this->label = $label;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
-	/**
-	 * @param string $label
-	 * @return $this
-	 * @throws \InvalidArgumentException if the label is invalid
-	 * @since 8.2.0
-	 */
-	public function setParsedLabel($label) {
-		if (!is_string($label) || $label === '') {
-			throw new \InvalidArgumentException('The given parsed label is invalid');
-		}
-		$this->labelParsed = $label;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getParsedLabel() {
-		return $this->labelParsed;
-	}
-
-	/**
-	 * @param $primary bool
-	 * @return $this
-	 * @throws \InvalidArgumentException if $primary is invalid
-	 * @since 9.0.0
-	 */
-	public function setPrimary($primary) {
-		if (!is_bool($primary)) {
-			throw new \InvalidArgumentException('The given primary option is invalid');
-		}
-
-		$this->primary = $primary;
-		return $this;
-	}
-
-	/**
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isPrimary() {
-		return $this->primary;
-	}
-
-	/**
-	 * @param string $link
-	 * @param string $requestType
-	 * @return $this
-	 * @throws \InvalidArgumentException if the link is invalid
-	 * @since 8.2.0
-	 */
-	public function setLink($link, $requestType) {
-		if (!is_string($link) || $link === '' || isset($link[256])) {
-			throw new \InvalidArgumentException('The given link is invalid');
-		}
-		if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'], true)) {
-			throw new \InvalidArgumentException('The given request type is invalid');
-		}
-		$this->link = $link;
-		$this->requestType = $requestType;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLink() {
-		return $this->link;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getRequestType() {
-		return $this->requestType;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isValid() {
-		return $this->label !== '' && $this->link !== '';
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isValidParsed() {
-		return $this->labelParsed !== '' && $this->link !== '';
-	}
+    /** @var string */
+    protected $label;
+
+    /** @var string */
+    protected $labelParsed;
+
+    /** @var string */
+    protected $link;
+
+    /** @var string */
+    protected $requestType;
+
+    /** @var string */
+    protected $icon;
+
+    /** @var bool */
+    protected $primary;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->label = '';
+        $this->labelParsed = '';
+        $this->link = '';
+        $this->requestType = '';
+        $this->primary = false;
+    }
+
+    /**
+     * @param string $label
+     * @return $this
+     * @throws \InvalidArgumentException if the label is invalid
+     * @since 8.2.0
+     */
+    public function setLabel($label) {
+        if (!is_string($label) || $label === '' || isset($label[32])) {
+            throw new \InvalidArgumentException('The given label is invalid');
+        }
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     * @param string $label
+     * @return $this
+     * @throws \InvalidArgumentException if the label is invalid
+     * @since 8.2.0
+     */
+    public function setParsedLabel($label) {
+        if (!is_string($label) || $label === '') {
+            throw new \InvalidArgumentException('The given parsed label is invalid');
+        }
+        $this->labelParsed = $label;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getParsedLabel() {
+        return $this->labelParsed;
+    }
+
+    /**
+     * @param $primary bool
+     * @return $this
+     * @throws \InvalidArgumentException if $primary is invalid
+     * @since 9.0.0
+     */
+    public function setPrimary($primary) {
+        if (!is_bool($primary)) {
+            throw new \InvalidArgumentException('The given primary option is invalid');
+        }
+
+        $this->primary = $primary;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isPrimary() {
+        return $this->primary;
+    }
+
+    /**
+     * @param string $link
+     * @param string $requestType
+     * @return $this
+     * @throws \InvalidArgumentException if the link is invalid
+     * @since 8.2.0
+     */
+    public function setLink($link, $requestType) {
+        if (!is_string($link) || $link === '' || isset($link[256])) {
+            throw new \InvalidArgumentException('The given link is invalid');
+        }
+        if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'], true)) {
+            throw new \InvalidArgumentException('The given request type is invalid');
+        }
+        $this->link = $link;
+        $this->requestType = $requestType;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLink() {
+        return $this->link;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getRequestType() {
+        return $this->requestType;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid() {
+        return $this->label !== '' && $this->link !== '';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValidParsed() {
+        return $this->labelParsed !== '' && $this->link !== '';
+    }
 }