diff options
author | Joas Schilling <coding@schilljs.com> | 2019-11-27 12:27:31 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2019-12-04 17:21:50 +0300 |
commit | dd53fad898e8b1de75efeda094b2f0f037d8a407 (patch) | |
tree | 5079c244f797309766cf1236e7260553b24733af /lib/private | |
parent | 19935a6a26d70e0a7e9ee757f8519a11179bf1fd (diff) |
Prevent creating users with existing files
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/User/Manager.php | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index 29cae3da79b..9bb0aff5cd7 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -294,10 +294,6 @@ class Manager extends PublicEmitter implements IUserManager { * @return bool|IUser the created user or false */ public function createUser($uid, $password) { - if (!$this->verifyUid($uid)) { - return false; - } - $localBackends = []; foreach ($this->backends as $backend) { if ($backend instanceof Database) { @@ -332,22 +328,30 @@ class Manager extends PublicEmitter implements IUserManager { // Check the name for bad characters // Allowed are: "a-z", "A-Z", "0-9" and "_.@-'" - if (preg_match('/[^a-zA-Z0-9 _\.@\-\']/', $uid)) { + if (preg_match('/[^a-zA-Z0-9 _.@\-\']/', $uid)) { throw new \InvalidArgumentException($l->t('Only the following characters are allowed in a username:' . ' "a-z", "A-Z", "0-9", and "_.@-\'"')); } + // No empty username if (trim($uid) === '') { throw new \InvalidArgumentException($l->t('A valid username must be provided')); } + // No whitespace at the beginning or at the end if (trim($uid) !== $uid) { throw new \InvalidArgumentException($l->t('Username contains whitespace at the beginning or at the end')); } + // Username only consists of 1 or 2 dots (directory traversal) if ($uid === '.' || $uid === '..') { throw new \InvalidArgumentException($l->t('Username must not consist of dots only')); } + + if (!$this->verifyUid($uid)) { + throw new \InvalidArgumentException($l->t('Username is invalid because files already exist for this user')); + } + // No empty password if (trim($password) === '') { throw new \InvalidArgumentException($l->t('A valid password must be provided')); @@ -623,10 +627,18 @@ class Manager extends PublicEmitter implements IUserManager { private function verifyUid(string $uid): bool { $appdata = 'appdata_' . $this->config->getSystemValueString('instanceid'); - if ($uid === '.htaccess' || $uid === 'files_external' || $uid === '.ocdata' || $uid === 'owncloud.log' || $uid === 'nextcloud.log' || $uid === $appdata) { + if (\in_array($uid, [ + '.htaccess', + 'files_external', + '.ocdata', + 'owncloud.log', + 'nextcloud.log', + $appdata], true)) { return false; } - return true; + $dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data'); + + return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid); } } |