Use typed password events

Requires nextcloud/server#18019 Requires nextcloud/password_policy#90 Signed-off-by: Christoph Wurst <[email protected]>
nextcloud · Nov 19, 2019 · 2e3f923 · 2e3f923
1 parent 7beca45
commit 2e3f923
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/GuestManager.php b/lib/GuestManager.php
@@ -32,6 +32,7 @@
 use OCP\IUserBackend;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use OCP\Security\Events\GenerateSecurePasswordEvent;
 use OCP\Security\ICrypto;
 use OCP\Security\ISecureRandom;
 use OCP\Share\IManager;
@@ -97,11 +98,11 @@ public function isGuest($user = null) {
 	}
 
 	public function createGuest(IUser $createdBy, $userId, $email, $displayName = '', $language = '') {
-		$passwordEvent = new Event(null, ['password' => $this->secureRandom->generate(20)]);
-		$this->eventDispatcher->dispatch('OCP\PasswordPolicy::generate', $passwordEvent);
+		$passwordEvent = new GenerateSecurePasswordEvent();
+		$this->eventDispatcher->dispatchTyped($passwordEvent);
 		$this->userBackend->createUser(
 			$userId,
-			$passwordEvent->getArgument('password')
+			$passwordEvent->getPassword() ?? $this->secureRandom->generate(20)
 		);
 
 		$this->config->setUserValue($userId, 'settings', 'email', $email);

diff --git a/lib/UserBackend.php b/lib/UserBackend.php
@@ -23,7 +23,9 @@
 namespace OCA\Guests;
 
 use OC\Cache\CappedMemoryCache;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
+use OCP\Security\Events\ValidatePasswordPolicyEvent;
 use OCP\Security\IHasher;
 use OCP\User\Backend\ABackend;
 use OCP\User\Backend\ICheckPasswordBackend;
@@ -32,8 +34,6 @@
 use OCP\User\Backend\IGetHomeBackend;
 use OCP\User\Backend\ISetDisplayNameBackend;
 use OCP\User\Backend\ISetPasswordBackend;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
@@ -54,7 +54,7 @@ class UserBackend extends ABackend
 	private $allowListing = true;
 
 	public function __construct(
-		EventDispatcherInterface $eventDispatcher,
+		IEventDispatcher $eventDispatcher,
 		IDBConnection $connection,
 		Config $config,
 		IHasher $hasher
@@ -82,8 +82,7 @@ public function setAllowListing(bool $allow) {
 	 */
 	public function createUser(string $uid, string $password): bool {
 		if (!$this->userExists($uid)) {
-			$event = new GenericEvent($password);
-			$this->eventDispatcher->dispatch('OCP\PasswordPolicy::validate', $event);
+			$this->eventDispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
 
 			$qb = $this->dbConn->getQueryBuilder();
 			$qb->insert('guests_users')
@@ -137,8 +136,7 @@ public function deleteUser($uid) {
 	 */
 	public function setPassword(string $uid, string $password): bool {
 		if ($this->userExists($uid)) {
-			$event = new GenericEvent($password);
-			$this->eventDispatcher->dispatch('OCP\PasswordPolicy::validate', $event);
+			$this->eventDispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
 
 			$hashedPassword = $this->hasher->hash($password);