diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-30 16:54:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-30 16:54:01 +0300 |
| commit | d111c2d301f43d0b6de98f47da39d2b107ce17a1 (patch) | |
| tree | 92897bde1a5132063f4820b733a793d140785e03 /lib/gitlab | |
| parent | 5b713e1e9a309d1afff4c7068d1e03fbd6a5f7f7 (diff) | |
Add latest changes from gitlab-org/security/gitlab@14-9-stable-ee
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/auth/o_auth/user.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/password.rb | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb index 200f1a843e6..d9efb6b8d2d 100644 --- a/lib/gitlab/auth/o_auth/user.rb +++ b/lib/gitlab/auth/o_auth/user.rb @@ -239,8 +239,8 @@ module Gitlab name: name.strip.presence || valid_username, username: valid_username, email: email, - password: Gitlab::Password.test_default(21), - password_confirmation: Gitlab::Password.test_default(21), + password: auth_hash.password, + password_confirmation: auth_hash.password, password_automatically_set: true } end diff --git a/lib/gitlab/password.rb b/lib/gitlab/password.rb deleted file mode 100644 index 00aef8754d6..00000000000 --- a/lib/gitlab/password.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -# This module is used to return fake strong password for tests - -module Gitlab - module Password - DEFAULT_LENGTH = 12 - TEST_DEFAULT = "123qweQWE!@#" + "0" * (User.password_length.max - DEFAULT_LENGTH) - def self.test_default(length = 12) - password_length = [[User.password_length.min, length].max, User.password_length.max].min - TEST_DEFAULT[...password_length] - end - end -end |