Add auth features

app/controllers/api/account.php

@@ -71,7 +71,7 @@ App::post('/v1/account')
     ->label('abuse-limit', 10)
     ->param('userId', '', new CustomId(), 'Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
     ->param('email', '', new Email(), 'User email.')
-    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary'])
+    ->param('password', '', fn ($project, $passwordsDictionary10k) => new PasswordDictionary($passwordsDictionary10k, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary10k'])
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('request')
     ->inject('response')
@@ -2016,7 +2016,7 @@ App::patch('/v1/account/password')
     ->label('sdk.response.model', Response::MODEL_USER)
     ->label('sdk.offline.model', '/account')
     ->label('sdk.offline.key', 'current')
-    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary'])
+    ->param('password', '', fn ($project, $passwordsDictionary10k) => new PasswordDictionary($passwordsDictionary10k, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary10k'])
     ->param('oldPassword', '', new Password(), 'Current user password. Must be at least 8 chars.', true)
     ->inject('requestTimestamp')
     ->inject('response')

app/controllers/api/projects.php

@@ -86,7 +86,6 @@ App::post('/v1/projects')
 
         $auth = Config::getParam('auth', []);
         $auths = ['limit' => 0, 'maxSessions' => APP_LIMIT_USER_SESSIONS_DEFAULT, 'passwordHistory' => 0, 'passwordAi' => false, 'sessionRefresh' => false, 'passwordDictionary' => false, 'passwordDictionaryLength' => '10k', 'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, 'personalDataCheck' => false];
-        // TODO: Khushboo add here
         foreach ($auth as $index => $method) {
             $auths[$method['key'] ?? ''] = true;
         }

app/controllers/api/users.php

@@ -162,7 +162,7 @@ App::post('/v1/users')
     ->param('userId', '', new CustomId(), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
     ->param('email', null, new Email(), 'User email.', true)
     ->param('phone', null, new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.', true)
-    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'Plain text user password. Must be at least 8 chars.', true, ['project', 'passwordsDictionary'])
+    ->param('password', '', fn ($project, $passwordsDictionary10k) => new PasswordDictionary($passwordsDictionary10k, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'Plain text user password. Must be at least 8 chars.', true, ['project', 'passwordsDictionary10k'])
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
     ->inject('project')
@@ -1069,7 +1069,7 @@ App::patch('/v1/users/:userId/password')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
     ->param('userId', '', new UID(), 'User ID.')
-    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary'])
+    ->param('password', '', fn ($project, $passwordsDictionary10k) => new PasswordDictionary($passwordsDictionary10k, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary10k'])
     ->inject('response')
     ->inject('project')
     ->inject('dbForProject')

app/init.php

@@ -932,19 +932,6 @@ $register->set('passwordsDictionary10k', function () {
     return $content;
 });
 
-$register->set('passwordsDictionary100k', function () {
-    $content = \file_get_contents(__DIR__ . '/assets/security/100k-common-passwords');
-    $content = explode("\n", $content);
-    $content = array_flip($content);
-    return $content;
-});
-
-$register->set('passwordsDictionary1m', function () {
-    $content = \file_get_contents(__DIR__ . '/assets/security/1m-common-passwords');
-    $content = explode("\n", $content);
-    $content = array_flip($content);
-    return $content;
-});
 $register->set('promiseAdapter', function () {
     return new Swoole();
 });
@@ -1443,17 +1430,6 @@ App::setResource('passwordsDictionary10k', function ($register) {
     return $register->get('passwordsDictionary10k');
 }, ['register']);
 
-
-App::setResource('passwordsDictionary100k', function ($register) {
-    /** @var Utopia\Registry\Registry $register */
-    return $register->get('passwordsDictionary100k');
-}, ['register']);
-
-App::setResource('passwordsDictionary1m', function ($register) {
-    /** @var Utopia\Registry\Registry $register */
-    return $register->get('passwordsDictionary1m');
-}, ['register']);
-
 App::setResource('servers', function () {
     $platforms = Config::getParam('platforms');
     $server = $platforms[APP_PLATFORM_SERVER];

src/Appwrite/Utopia/Response/Model/Project.php

@@ -126,13 +126,18 @@ class Project extends Model
                 'default' => 0,
                 'example' => 5,
             ])
-                    // TODO: Khushboo add here
-                ->addRule('authPasswordDictionary', [
-                    'type' => self::TYPE_BOOLEAN,
-                    'description' => 'Whether or not to check user\'s password against most commonly used passwords.',
-                    'default' => false,
-                    'example' => true,
-                ])
+            ->addRule('authPasswordDictionary', [
+                'type' => self::TYPE_BOOLEAN,
+                'description' => 'Whether or not to check user\'s password against most commonly used passwords.',
+                'default' => false,
+                'example' => true,
+            ])
+            ->addRule('authPasswordDictionaryLength', [
+                'type' => self::TYPE_BOOLEAN,
+                'description' => 'How many most commonly used password to check against. Possible values are: 10k, 100k, 1m, 10m',
+                'default' => '10k',
+                'example' => '1m',
+            ])
                 ->addRule('authPasswordAi', [
                     'type' => self::TYPE_BOOLEAN,
                     'description' => 'Whether or not to check user\'s password against against AI opinion',
@@ -333,6 +338,7 @@ class Project extends Model
         $document->setAttribute('authSessionsLimit', $authValues['maxSessions'] ?? APP_LIMIT_USER_SESSIONS_DEFAULT);
         $document->setAttribute('authPasswordHistory', $authValues['passwordHistory'] ?? 0);
         $document->setAttribute('authPasswordDictionary', $authValues['passwordDictionary'] ?? false);
+        $document->setAttribute('authPasswordDictionaryLength', $authValues['passwordDictionaryLength'] ?? false);
         $document->setAttribute('authPasswordAi', $authValues['passwordAi'] ?? false);
         $document->setAttribute('authSessionRefresh', $authValues['sessionRefresh'] ?? false);
         // TODO: Khushboo add here