nextcloud / server

lib/public/WorkflowEngine/IEntityEvent.php

Indentation +16 added lines, -16 removed lines

@@ -34,21 +34,21 @@
  * @since 18.0.0
  */
 interface IEntityEvent {
-	/**
-	 * returns a translated name to be presented in the web interface.
-	 *
-	 * Example: "created" (en), "kreita" (eo)
-	 *
-	 * @since 18.0.0
-	 */
-	public function getDisplayName(): string;
+    /**
+     * returns a translated name to be presented in the web interface.
+     *
+     * Example: "created" (en), "kreita" (eo)
+     *
+     * @since 18.0.0
+     */
+    public function getDisplayName(): string;
 
-	/**
-	 * returns the event name that is emitted by the EventDispatcher, e.g.:
-	 *
-	 * Example: "OCA\MyApp\Factory\Cats::postCreated"
-	 *
-	 * @since 18.0.0
-	 */
-	public function getEventName(): string;
+    /**
+     * returns the event name that is emitted by the EventDispatcher, e.g.:
+     *
+     * Example: "OCA\MyApp\Factory\Cats::postCreated"
+     *
+     * @since 18.0.0
+     */
+    public function getEventName(): string;
 }

lib/public/WorkflowEngine/ISpecificOperation.php

Indentation +8 added lines, -8 removed lines

@@ -39,12 +39,12 @@
  */
 interface ISpecificOperation extends IOperation {
 
-	/**
-	 * returns the id of the entity the operator is designed for
-	 *
-	 * Example: 'WorkflowEngine_Entity_File'
-	 *
-	 * @since 18.0.0
-	 */
-	public function getEntityId():string;
+    /**
+     * returns the id of the entity the operator is designed for
+     *
+     * Example: 'WorkflowEngine_Entity_File'
+     *
+     * @since 18.0.0
+     */
+    public function getEntityId():string;
 }

apps/twofactor_backupcodes/appinfo/routes.php

Indentation +7 added lines, -7 removed lines

@@ -21,12 +21,12 @@
  */
 // @codeCoverageIgnoreStart
 return [
-	'routes' => [
-		[
-			'name' => 'settings#createCodes',
-			'url' => '/settings/create',
-			'verb' => 'POST'
-		],
-	]
+    'routes' => [
+        [
+            'name' => 'settings#createCodes',
+            'url' => '/settings/create',
+            'verb' => 'POST'
+        ],
+    ]
 ];
 // @codeCoverageIgnoreEnd

apps/workflowengine/lib/Check/FileName.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	}
 
 	public function supportedEntities(): array {
-		return [ File::class ];
+		return [File::class];
 	}
 
 	public function isAvailableForScope(int $scope): bool {

Indentation +53 added lines, -53 removed lines

@@ -31,63 +31,63 @@
 use OCP\WorkflowEngine\IFileCheck;
 
 class FileName extends AbstractStringCheck implements IFileCheck {
-	use TFileCheck;
+    use TFileCheck;
 
-	/** @var IRequest */
-	protected $request;
-	/** @var IMountManager */
-	private $mountManager;
+    /** @var IRequest */
+    protected $request;
+    /** @var IMountManager */
+    private $mountManager;
 
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 */
-	public function __construct(IL10N $l, IRequest $request, IMountManager $mountManager) {
-		parent::__construct($l);
-		$this->request = $request;
-		$this->mountManager = $mountManager;
-	}
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     */
+    public function __construct(IL10N $l, IRequest $request, IMountManager $mountManager) {
+        parent::__construct($l);
+        $this->request = $request;
+        $this->mountManager = $mountManager;
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getActualValue(): string {
-		$fileName = $this->path === null ? '' : basename($this->path);
-		if ($fileName === '' && (!$this->storage->isLocal() || $this->storage->instanceOfStorage(Local::class))) {
-			// Return the mountpoint name of external storage that are not mounted as user home
-			$mountPoints = $this->mountManager->findByStorageId($this->storage->getId());
-			if (empty($mountPoints) || $mountPoints[0]->getMountType() !== 'external') {
-				return $fileName;
-			}
-			$mountPointPath = rtrim($mountPoints[0]->getMountPoint(), '/');
-			$mountPointPieces = explode('/', $mountPointPath);
-			$mountPointName = array_pop($mountPointPieces);
-			if (!empty($mountPointName) && $mountPointName !== 'files' && count($mountPointPieces) !== 2) {
-				return $mountPointName;
-			}
-		}
-		return $fileName;
-	}
+    /**
+     * @return string
+     */
+    protected function getActualValue(): string {
+        $fileName = $this->path === null ? '' : basename($this->path);
+        if ($fileName === '' && (!$this->storage->isLocal() || $this->storage->instanceOfStorage(Local::class))) {
+            // Return the mountpoint name of external storage that are not mounted as user home
+            $mountPoints = $this->mountManager->findByStorageId($this->storage->getId());
+            if (empty($mountPoints) || $mountPoints[0]->getMountType() !== 'external') {
+                return $fileName;
+            }
+            $mountPointPath = rtrim($mountPoints[0]->getMountPoint(), '/');
+            $mountPointPieces = explode('/', $mountPointPath);
+            $mountPointName = array_pop($mountPointPieces);
+            if (!empty($mountPointName) && $mountPointName !== 'files' && count($mountPointPieces) !== 2) {
+                return $mountPointName;
+            }
+        }
+        return $fileName;
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $checkValue
-	 * @param string $actualValue
-	 * @return bool
-	 */
-	protected function executeStringCheck($operator, $checkValue, $actualValue): bool {
-		if ($operator === 'is' || $operator === '!is') {
-			$checkValue = mb_strtolower($checkValue);
-			$actualValue = mb_strtolower($actualValue);
-		}
-		return parent::executeStringCheck($operator, $checkValue, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $checkValue
+     * @param string $actualValue
+     * @return bool
+     */
+    protected function executeStringCheck($operator, $checkValue, $actualValue): bool {
+        if ($operator === 'is' || $operator === '!is') {
+            $checkValue = mb_strtolower($checkValue);
+            $actualValue = mb_strtolower($actualValue);
+        }
+        return parent::executeStringCheck($operator, $checkValue, $actualValue);
+    }
 
-	public function supportedEntities(): array {
-		return [ File::class ];
-	}
+    public function supportedEntities(): array {
+        return [ File::class ];
+    }
 
-	public function isAvailableForScope(int $scope): bool {
-		return true;
-	}
+    public function isAvailableForScope(int $scope): bool {
+        return true;
+    }
 }

lib/public/Security/CSP/AddContentSecurityPolicyEvent.php

Indentation +15 added lines, -15 removed lines

@@ -33,21 +33,21 @@
  */
 class AddContentSecurityPolicyEvent extends Event {
 
-	/** @var ContentSecurityPolicyManager */
-	private $policyManager;
+    /** @var ContentSecurityPolicyManager */
+    private $policyManager;
 
-	/**
-	 * @since 17.0.0
-	 */
-	public function __construct(ContentSecurityPolicyManager $policyManager) {
-		parent::__construct();
-		$this->policyManager = $policyManager;
-	}
+    /**
+     * @since 17.0.0
+     */
+    public function __construct(ContentSecurityPolicyManager $policyManager) {
+        parent::__construct();
+        $this->policyManager = $policyManager;
+    }
 
-	/**
-	 * @since 17.0.0
-	 */
-	public function addPolicy(EmptyContentSecurityPolicy $csp): void {
-		$this->policyManager->addDefaultPolicy($csp);
-	}
+    /**
+     * @since 17.0.0
+     */
+    public function addPolicy(EmptyContentSecurityPolicy $csp): void {
+        $this->policyManager->addDefaultPolicy($csp);
+    }
 }

lib/public/Security/FeaturePolicy/AddFeaturePolicyEvent.php

Indentation +15 added lines, -15 removed lines

@@ -33,21 +33,21 @@
  */
 class AddFeaturePolicyEvent extends Event {
 
-	/** @var FeaturePolicyManager */
-	private $policyManager;
+    /** @var FeaturePolicyManager */
+    private $policyManager;
 
-	/**
-	 * @since 17.0.0
-	 */
-	public function __construct(FeaturePolicyManager $policyManager) {
-		parent::__construct();
-		$this->policyManager = $policyManager;
-	}
+    /**
+     * @since 17.0.0
+     */
+    public function __construct(FeaturePolicyManager $policyManager) {
+        parent::__construct();
+        $this->policyManager = $policyManager;
+    }
 
-	/**
-	 * @since 17.0.0
-	 */
-	public function addPolicy(EmptyFeaturePolicy $policy) {
-		$this->policyManager->addDefaultPolicy($policy);
-	}
+    /**
+     * @since 17.0.0
+     */
+    public function addPolicy(EmptyFeaturePolicy $policy) {
+        $this->policyManager->addDefaultPolicy($policy);
+    }
 }

apps/encryption/lib/Hooks/UserHooks.php

Spacing +2 added lines, -2 removed lines

@@ -266,7 +266,7 @@ 
 			// Save private key
 			if ($encryptedPrivateKey) {
 				$this->keyManager->setPrivateKey($user->getUID(),
-					$this->crypt->generateHeader() . $encryptedPrivateKey);
+					$this->crypt->generateHeader().$encryptedPrivateKey);
 			} else {
 				$this->logger->error('Encryption could not update users encryption password');
 			}
@@ -315,7 +315,7 @@ 
 				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $newUserPassword, $userId);
 
 				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader() . $encryptedKey);
+					$this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader().$encryptedKey);
 
 					if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
 						$this->recovery->recoverUsersFiles($recoveryPassword, $userId);

Indentation +300 added lines, -300 removed lines

@@ -44,304 +44,304 @@
 
 class UserHooks implements IHook {
 
-	/**
-	 * list of user for which we perform a password reset
-	 * @var array
-	 */
-	protected static $passwordResetUsers = [];
-
-	/**
-	 * @var KeyManager
-	 */
-	private $keyManager;
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
-	/**
-	 * @var Setup
-	 */
-	private $userSetup;
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-	/**
-	 * @var Util
-	 */
-	private $util;
-	/**
-	 * @var Session
-	 */
-	private $session;
-	/**
-	 * @var Recovery
-	 */
-	private $recovery;
-	/**
-	 * @var Crypt
-	 */
-	private $crypt;
-
-	/**
-	 * UserHooks constructor.
-	 *
-	 * @param KeyManager $keyManager
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param Setup $userSetup
-	 * @param IUserSession $userSession
-	 * @param Util $util
-	 * @param Session $session
-	 * @param Crypt $crypt
-	 * @param Recovery $recovery
-	 */
-	public function __construct(KeyManager $keyManager,
-								IUserManager $userManager,
-								ILogger $logger,
-								Setup $userSetup,
-								IUserSession $userSession,
-								Util $util,
-								Session $session,
-								Crypt $crypt,
-								Recovery $recovery) {
-		$this->keyManager = $keyManager;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->userSetup = $userSetup;
-		$this->userSession = $userSession;
-		$this->util = $util;
-		$this->session = $session;
-		$this->recovery = $recovery;
-		$this->crypt = $crypt;
-	}
-
-	/**
-	 * Connects Hooks
-	 *
-	 * @return null
-	 */
-	public function addHooks() {
-		OCUtil::connectHook('OC_User', 'post_login', $this, 'login');
-		OCUtil::connectHook('OC_User', 'logout', $this, 'logout');
-
-		// this hooks only make sense if no master key is used
-		if ($this->util->isMasterKeyEnabled() === false) {
-			OCUtil::connectHook('OC_User',
-				'post_setPassword',
-				$this,
-				'setPassphrase');
-
-			OCUtil::connectHook('OC_User',
-				'pre_setPassword',
-				$this,
-				'preSetPassphrase');
-
-			OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
-				'post_passwordReset',
-				$this,
-				'postPasswordReset');
-
-			OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
-				'pre_passwordReset',
-				$this,
-				'prePasswordReset');
-
-			OCUtil::connectHook('OC_User',
-				'post_createUser',
-				$this,
-				'postCreateUser');
-
-			OCUtil::connectHook('OC_User',
-				'post_deleteUser',
-				$this,
-				'postDeleteUser');
-		}
-	}
-
-
-	/**
-	 * Startup encryption backend upon user login
-	 *
-	 * @note This method should never be called for users using client side encryption
-	 * @param array $params
-	 * @return boolean|null
-	 */
-	public function login($params) {
-		// ensure filesystem is loaded
-		if (!\OC\Files\Filesystem::$loaded) {
-			$this->setupFS($params['uid']);
-		}
-		if ($this->util->isMasterKeyEnabled() === false) {
-			$this->userSetup->setupUser($params['uid'], $params['password']);
-		}
-
-		$this->keyManager->init($params['uid'], $params['password']);
-	}
-
-	/**
-	 * remove keys from session during logout
-	 */
-	public function logout() {
-		$this->session->clear();
-	}
-
-	/**
-	 * setup encryption backend upon user created
-	 *
-	 * @note This method should never be called for users using client side encryption
-	 * @param array $params
-	 */
-	public function postCreateUser($params) {
-		$this->userSetup->setupUser($params['uid'], $params['password']);
-	}
-
-	/**
-	 * cleanup encryption backend upon user deleted
-	 *
-	 * @param array $params : uid, password
-	 * @note This method should never be called for users using client side encryption
-	 */
-	public function postDeleteUser($params) {
-		$this->keyManager->deletePublicKey($params['uid']);
-	}
-
-	public function prePasswordReset($params) {
-		$user = $params['uid'];
-		self::$passwordResetUsers[$user] = true;
-	}
-
-	public function postPasswordReset($params) {
-		$uid = $params['uid'];
-		$password = $params['password'];
-		$this->keyManager->backupUserKeys('passwordReset', $uid);
-		$this->keyManager->deleteUserKeys($uid);
-		$this->userSetup->setupUser($uid, $password);
-		unset(self::$passwordResetUsers[$uid]);
-	}
-
-	/**
-	 * If the password can't be changed within Nextcloud, than update the key password in advance.
-	 *
-	 * @param array $params : uid, password
-	 * @return boolean|null
-	 */
-	public function preSetPassphrase($params) {
-		$user = $this->userManager->get($params['uid']);
-
-		if ($user && !$user->canChangePassword()) {
-			$this->setPassphrase($params);
-		}
-	}
-
-	/**
-	 * Change a user's encryption passphrase
-	 *
-	 * @param array $params keys: uid, password
-	 * @return boolean|null
-	 */
-	public function setPassphrase($params) {
-
-		// if we are in the process to resetting a user password, we have nothing
-		// to do here
-		if (isset(self::$passwordResetUsers[$params['uid']])) {
-			return true;
-		}
-
-		// Get existing decrypted private key
-		$user = $this->userSession->getUser();
-
-		// current logged in user changes his own password
-		if ($user && $params['uid'] === $user->getUID()) {
-			$privateKey = $this->session->getPrivateKey();
-
-			// Encrypt private key with new user pwd as passphrase
-			$encryptedPrivateKey = $this->crypt->encryptPrivateKey($privateKey, $params['password'], $params['uid']);
-
-			// Save private key
-			if ($encryptedPrivateKey) {
-				$this->keyManager->setPrivateKey($user->getUID(),
-					$this->crypt->generateHeader() . $encryptedPrivateKey);
-			} else {
-				$this->logger->error('Encryption could not update users encryption password');
-			}
-
-			// NOTE: Session does not need to be updated as the
-			// private key has not changed, only the passphrase
-			// used to decrypt it has changed
-		} else { // admin changed the password for a different user, create new keys and re-encrypt file keys
-			$userId = $params['uid'];
-			$this->initMountPoints($userId);
-			$recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;
-
-			$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
-			$recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
-			try {
-				$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $recoveryPassword);
-			} catch (\Exception $e) {
-				$decryptedRecoveryKey = false;
-			}
-			if ($decryptedRecoveryKey === false) {
-				$message = 'Can not decrypt the recovery key. Maybe you provided the wrong password. Try again.';
-				throw new GenericEncryptionException($message, $message);
-			}
-
-			// we generate new keys if...
-			// ...we have a recovery password and the user enabled the recovery key
-			// ...encryption was activated for the first time (no keys exists)
-			// ...the user doesn't have any files
-			if (
-				($this->recovery->isRecoveryEnabledForUser($userId) && $recoveryPassword)
-				|| !$this->keyManager->userHasKeys($userId)
-				|| !$this->util->userHasFiles($userId)
-			) {
-
-				// backup old keys
-				//$this->backupAllKeys('recovery');
-
-				$newUserPassword = $params['password'];
-
-				$keyPair = $this->crypt->createKeyPair();
-
-				// Save public key
-				$this->keyManager->setPublicKey($userId, $keyPair['publicKey']);
-
-				// Encrypt private key with new password
-				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $newUserPassword, $userId);
-
-				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader() . $encryptedKey);
-
-					if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
-						$this->recovery->recoverUsersFiles($recoveryPassword, $userId);
-					}
-				} else {
-					$this->logger->error('Encryption Could not update users encryption password');
-				}
-			}
-		}
-	}
-
-	/**
-	 * init mount points for given user
-	 *
-	 * @param string $user
-	 * @throws \OC\User\NoUserException
-	 */
-	protected function initMountPoints($user) {
-		Filesystem::initMountPoints($user);
-	}
-
-	/**
-	 * setup file system for user
-	 *
-	 * @param string $uid user id
-	 */
-	protected function setupFS($uid) {
-		\OC_Util::setupFS($uid);
-	}
+    /**
+     * list of user for which we perform a password reset
+     * @var array
+     */
+    protected static $passwordResetUsers = [];
+
+    /**
+     * @var KeyManager
+     */
+    private $keyManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+    /**
+     * @var ILogger
+     */
+    private $logger;
+    /**
+     * @var Setup
+     */
+    private $userSetup;
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+    /**
+     * @var Util
+     */
+    private $util;
+    /**
+     * @var Session
+     */
+    private $session;
+    /**
+     * @var Recovery
+     */
+    private $recovery;
+    /**
+     * @var Crypt
+     */
+    private $crypt;
+
+    /**
+     * UserHooks constructor.
+     *
+     * @param KeyManager $keyManager
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param Setup $userSetup
+     * @param IUserSession $userSession
+     * @param Util $util
+     * @param Session $session
+     * @param Crypt $crypt
+     * @param Recovery $recovery
+     */
+    public function __construct(KeyManager $keyManager,
+                                IUserManager $userManager,
+                                ILogger $logger,
+                                Setup $userSetup,
+                                IUserSession $userSession,
+                                Util $util,
+                                Session $session,
+                                Crypt $crypt,
+                                Recovery $recovery) {
+        $this->keyManager = $keyManager;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->userSetup = $userSetup;
+        $this->userSession = $userSession;
+        $this->util = $util;
+        $this->session = $session;
+        $this->recovery = $recovery;
+        $this->crypt = $crypt;
+    }
+
+    /**
+     * Connects Hooks
+     *
+     * @return null
+     */
+    public function addHooks() {
+        OCUtil::connectHook('OC_User', 'post_login', $this, 'login');
+        OCUtil::connectHook('OC_User', 'logout', $this, 'logout');
+
+        // this hooks only make sense if no master key is used
+        if ($this->util->isMasterKeyEnabled() === false) {
+            OCUtil::connectHook('OC_User',
+                'post_setPassword',
+                $this,
+                'setPassphrase');
+
+            OCUtil::connectHook('OC_User',
+                'pre_setPassword',
+                $this,
+                'preSetPassphrase');
+
+            OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
+                'post_passwordReset',
+                $this,
+                'postPasswordReset');
+
+            OCUtil::connectHook('\OC\Core\LostPassword\Controller\LostController',
+                'pre_passwordReset',
+                $this,
+                'prePasswordReset');
+
+            OCUtil::connectHook('OC_User',
+                'post_createUser',
+                $this,
+                'postCreateUser');
+
+            OCUtil::connectHook('OC_User',
+                'post_deleteUser',
+                $this,
+                'postDeleteUser');
+        }
+    }
+
+
+    /**
+     * Startup encryption backend upon user login
+     *
+     * @note This method should never be called for users using client side encryption
+     * @param array $params
+     * @return boolean|null
+     */
+    public function login($params) {
+        // ensure filesystem is loaded
+        if (!\OC\Files\Filesystem::$loaded) {
+            $this->setupFS($params['uid']);
+        }
+        if ($this->util->isMasterKeyEnabled() === false) {
+            $this->userSetup->setupUser($params['uid'], $params['password']);
+        }
+
+        $this->keyManager->init($params['uid'], $params['password']);
+    }
+
+    /**
+     * remove keys from session during logout
+     */
+    public function logout() {
+        $this->session->clear();
+    }
+
+    /**
+     * setup encryption backend upon user created
+     *
+     * @note This method should never be called for users using client side encryption
+     * @param array $params
+     */
+    public function postCreateUser($params) {
+        $this->userSetup->setupUser($params['uid'], $params['password']);
+    }
+
+    /**
+     * cleanup encryption backend upon user deleted
+     *
+     * @param array $params : uid, password
+     * @note This method should never be called for users using client side encryption
+     */
+    public function postDeleteUser($params) {
+        $this->keyManager->deletePublicKey($params['uid']);
+    }
+
+    public function prePasswordReset($params) {
+        $user = $params['uid'];
+        self::$passwordResetUsers[$user] = true;
+    }
+
+    public function postPasswordReset($params) {
+        $uid = $params['uid'];
+        $password = $params['password'];
+        $this->keyManager->backupUserKeys('passwordReset', $uid);
+        $this->keyManager->deleteUserKeys($uid);
+        $this->userSetup->setupUser($uid, $password);
+        unset(self::$passwordResetUsers[$uid]);
+    }
+
+    /**
+     * If the password can't be changed within Nextcloud, than update the key password in advance.
+     *
+     * @param array $params : uid, password
+     * @return boolean|null
+     */
+    public function preSetPassphrase($params) {
+        $user = $this->userManager->get($params['uid']);
+
+        if ($user && !$user->canChangePassword()) {
+            $this->setPassphrase($params);
+        }
+    }
+
+    /**
+     * Change a user's encryption passphrase
+     *
+     * @param array $params keys: uid, password
+     * @return boolean|null
+     */
+    public function setPassphrase($params) {
+
+        // if we are in the process to resetting a user password, we have nothing
+        // to do here
+        if (isset(self::$passwordResetUsers[$params['uid']])) {
+            return true;
+        }
+
+        // Get existing decrypted private key
+        $user = $this->userSession->getUser();
+
+        // current logged in user changes his own password
+        if ($user && $params['uid'] === $user->getUID()) {
+            $privateKey = $this->session->getPrivateKey();
+
+            // Encrypt private key with new user pwd as passphrase
+            $encryptedPrivateKey = $this->crypt->encryptPrivateKey($privateKey, $params['password'], $params['uid']);
+
+            // Save private key
+            if ($encryptedPrivateKey) {
+                $this->keyManager->setPrivateKey($user->getUID(),
+                    $this->crypt->generateHeader() . $encryptedPrivateKey);
+            } else {
+                $this->logger->error('Encryption could not update users encryption password');
+            }
+
+            // NOTE: Session does not need to be updated as the
+            // private key has not changed, only the passphrase
+            // used to decrypt it has changed
+        } else { // admin changed the password for a different user, create new keys and re-encrypt file keys
+            $userId = $params['uid'];
+            $this->initMountPoints($userId);
+            $recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;
+
+            $recoveryKeyId = $this->keyManager->getRecoveryKeyId();
+            $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
+            try {
+                $decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $recoveryPassword);
+            } catch (\Exception $e) {
+                $decryptedRecoveryKey = false;
+            }
+            if ($decryptedRecoveryKey === false) {
+                $message = 'Can not decrypt the recovery key. Maybe you provided the wrong password. Try again.';
+                throw new GenericEncryptionException($message, $message);
+            }
+
+            // we generate new keys if...
+            // ...we have a recovery password and the user enabled the recovery key
+            // ...encryption was activated for the first time (no keys exists)
+            // ...the user doesn't have any files
+            if (
+                ($this->recovery->isRecoveryEnabledForUser($userId) && $recoveryPassword)
+                || !$this->keyManager->userHasKeys($userId)
+                || !$this->util->userHasFiles($userId)
+            ) {
+
+                // backup old keys
+                //$this->backupAllKeys('recovery');
+
+                $newUserPassword = $params['password'];
+
+                $keyPair = $this->crypt->createKeyPair();
+
+                // Save public key
+                $this->keyManager->setPublicKey($userId, $keyPair['publicKey']);
+
+                // Encrypt private key with new password
+                $encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $newUserPassword, $userId);
+
+                if ($encryptedKey) {
+                    $this->keyManager->setPrivateKey($userId, $this->crypt->generateHeader() . $encryptedKey);
+
+                    if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
+                        $this->recovery->recoverUsersFiles($recoveryPassword, $userId);
+                    }
+                } else {
+                    $this->logger->error('Encryption Could not update users encryption password');
+                }
+            }
+        }
+    }
+
+    /**
+     * init mount points for given user
+     *
+     * @param string $user
+     * @throws \OC\User\NoUserException
+     */
+    protected function initMountPoints($user) {
+        Filesystem::initMountPoints($user);
+    }
+
+    /**
+     * setup file system for user
+     *
+     * @param string $uid user id
+     */
+    protected function setupFS($uid) {
+        \OC_Util::setupFS($uid);
+    }
 }

apps/files/lib/Listener/LegacyLoadAdditionalScriptsAdapter.php

Indentation +20 added lines, -20 removed lines

@@ -32,25 +32,25 @@
 
 class LegacyLoadAdditionalScriptsAdapter implements IEventListener {
 
-	/** @var SymfonyAdapter */
-	private $dispatcher;
-
-	public function __construct(SymfonyAdapter $dispatcher) {
-		$this->dispatcher = $dispatcher;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof LoadAdditionalScriptsEvent)) {
-			return;
-		}
-
-		$legacyEvent = new GenericEvent(null, ['hiddenFields' => []]);
-		$this->dispatcher->dispatch('OCA\Files::loadAdditionalScripts', $legacyEvent);
-
-		$hiddenFields = $legacyEvent->getArgument('hiddenFields');
-		foreach ($hiddenFields as $name => $value) {
-			$event->addHiddenField($name, $value);
-		}
-	}
+    /** @var SymfonyAdapter */
+    private $dispatcher;
+
+    public function __construct(SymfonyAdapter $dispatcher) {
+        $this->dispatcher = $dispatcher;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof LoadAdditionalScriptsEvent)) {
+            return;
+        }
+
+        $legacyEvent = new GenericEvent(null, ['hiddenFields' => []]);
+        $this->dispatcher->dispatch('OCA\Files::loadAdditionalScripts', $legacyEvent);
+
+        $hiddenFields = $legacyEvent->getArgument('hiddenFields');
+        foreach ($hiddenFields as $name => $value) {
+            $event->addHiddenField($name, $value);
+        }
+    }
 
 }

apps/settings/templates/settings/admin/additional-mail.php

Spacing +6 added lines, -6 removed lines

@@ -56,9 +56,9 @@ 
 
 <div class="section" id="mail_general_settings">
 	<form id="mail_general_settings_form" class="mail_settings">
-		<h2><?php p($l->t('Email server'));?></h2>
+		<h2><?php p($l->t('Email server')); ?></h2>
 		<a target="_blank" rel="noreferrer noopener" class="icon-info"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
 		<p class="settings-hint"><?php p($l->t('It is important to set up this server to be able to send emails, like for password reset and notifications.')); ?></p>
 		<p><span id="mail_settings_msg" class="msg"></span></p>
@@ -72,7 +72,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
@@ -87,7 +87,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<label id="mail_sendmailmode_label" for="mail_sendmailmode" class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
@@ -96,7 +96,7 @@ 
 			<select name="mail_sendmailmode" id="mail_sendmailmode" class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
 				<?php foreach ($mail_sendmailmode as $sendmailmodeValue => $sendmailmodeLabel): ?>
 					<option value="<?php p($sendmailmodeValue)?>" <?= $sendmailmodeValue === $_['mail_sendmailmode'] ? 'selected="selected"' : '' ?>><?php p($sendmailmodeLabel) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 		</p>
 
@@ -117,7 +117,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"

Indentation +36 added lines, -36 removed lines

@@ -25,31 +25,31 @@ 
 /** @var array $_ */
 
 $mail_smtpauthtype = [
-	'' => $l->t('None'),
-	'LOGIN' => $l->t('Login'),
-	'PLAIN' => $l->t('Plain'),
-	'NTLM' => $l->t('NT LAN Manager'),
+    '' => $l->t('None'),
+    'LOGIN' => $l->t('Login'),
+    'PLAIN' => $l->t('Plain'),
+    'NTLM' => $l->t('NT LAN Manager'),
 ];
 
 $mail_smtpsecure = [
-	'' => $l->t('None'),
-	'ssl' => $l->t('SSL/TLS'),
-	'tls' => $l->t('STARTTLS'),
+    '' => $l->t('None'),
+    'ssl' => $l->t('SSL/TLS'),
+    'tls' => $l->t('STARTTLS'),
 ];
 
 $mail_smtpmode = [
-	['smtp', 'SMTP'],
+    ['smtp', 'SMTP'],
 ];
 if ($_['sendmail_is_available']) {
-	$mail_smtpmode[] = ['sendmail', 'Sendmail'];
+    $mail_smtpmode[] = ['sendmail', 'Sendmail'];
 }
 if ($_['mail_smtpmode'] === 'qmail') {
-	$mail_smtpmode[] = ['qmail', 'qmail'];
+    $mail_smtpmode[] = ['qmail', 'qmail'];
 }
 
 $mail_sendmailmode = [
-	'smtp' => 'smtp (-bs)',
-	'pipe' => 'pipe (-t)'
+    'smtp' => 'smtp (-bs)',
+    'pipe' => 'pipe (-t)'
 ];
 
 ?>
@@ -67,29 +67,29 @@ 
 			<label for="mail_smtpmode"><?php p($l->t('Send mode')); ?></label>
 			<select name="mail_smtpmode" id="mail_smtpmode">
 				<?php foreach ($mail_smtpmode as $smtpmode):
-					$selected = '';
-					if ($smtpmode[0] == $_['mail_smtpmode']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($smtpmode[0] == $_['mail_smtpmode']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
 				<?php endforeach;?>
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 				<?php p($l->t('Encryption')); ?>
 			</label>
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
-					$selected = '';
-					if ($secure == $_['mail_smtpsecure']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($secure == $_['mail_smtpsecure']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>
@@ -113,29 +113,29 @@ 
 		</p>
 
 		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
 			<select name="mail_smtpauthtype" id="mail_smtpauthtype">
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
-					$selected = '';
-					if ($authtype == $_['mail_smtpauthtype']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($authtype == $_['mail_smtpauthtype']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
 				<?php if ($_['mail_smtpauth']) {
-						print_unescaped('checked="checked"');
-					} ?> />
+                        print_unescaped('checked="checked"');
+                    } ?> />
 			<label for="mail_smtpauth"><?php p($l->t('Authentication required')); ?></label>
 		</p>
 
 		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 			<label for="mail_smtphost"><?php p($l->t('Server address')); ?></label>
 			<input type="text" name="mail_smtphost" id="mail_smtphost" placeholder="smtp.example.com"
 				   value="<?php p($_['mail_smtphost']) ?>" />
@@ -146,8 +146,8 @@ 
 	</form>
 	<form class="mail_settings" id="mail_credentials_settings">
 		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 			<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
 			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
 				   value="<?php p($_['mail_smtpname']) ?>" />