kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '52940-fix-internal-email-pattern-not-respected' into 'master' 

Fix a bug where internal email pattern wasn't respected

Closes #52940

See merge request gitlab-org/gitlab-ce!22516
This commit is contained in:
Douwe Maan 2018-11-14 09:17:00 +00:00
parent bc72b2f181 1f0502df0a
commit f31aea1722
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/users/build_service.rb
View File

@ -95,10 +95,6 @@ module Users
if params[:reset_password]
user_params.merge!(force_random_password: true, password_expires_at: nil)
end
if user_default_internal_regex_enabled? && !user_params.key?(:external)
user_params[:external] = user_external?
end
else
allowed_signup_params = signup_params
allowed_signup_params << :skip_confirmation if skip_authorization
@ -109,6 +105,10 @@ module Users
end
end
if user_default_internal_regex_enabled? && !user_params.key?(:external)
user_params[:external] = user_external?
end
user_params
end

5
changelogs/unreleased/52940-fix-internal-email-pattern-not-respected.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix a bug where internal email pattern wasn't respected
merge_request: 22516
author:
type: fixed

6
spec/services/users/build_service_spec.rb
View File

@ -159,9 +159,9 @@ describe Users::BuildService do
true | true | 'fl@example.com' | '' | true
true | false | 'fl@example.com' | '' | true
true | nil | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | true
true | true | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | true
true | false | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | true
true | nil | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | false
true | true | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | false
true | false | 'fl@example.com' | '^(?:(?!\.ext@).)*$\r?' | false
true | nil | 'tester.ext@domain.com' | '^(?:(?!\.ext@).)*$\r?' | true
true | true | 'tester.ext@domain.com' | '^(?:(?!\.ext@).)*$\r?' | true