BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f4b30c6d
Unverified
Commit
f4b30c6d
authored
Apr 24, 2017
by
Douwe Maan
Committed by
Rémy Coutable
Apr 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
7d10817c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
5 deletions
+47
-5
create_service.rb
app/services/users/create_service.rb
+4
-4
dm-fix-oauth-user-creation.yml
changelogs/unreleased/dm-fix-oauth-user-creation.yml
+4
-0
user.rb
lib/gitlab/o_auth/user.rb
+1
-1
user_spec.rb
spec/lib/gitlab/ldap/user_spec.rb
+12
-0
user_spec.rb
spec/lib/gitlab/o_auth/user_spec.rb
+14
-0
user_spec.rb
spec/lib/gitlab/saml/user_spec.rb
+12
-0
No files found.
app/services/users/create_service.rb
View file @
f4b30c6d
...
...
@@ -6,8 +6,8 @@ module Users
@params
=
params
.
dup
end
def
build
raise
Gitlab
::
Access
::
AccessDeniedError
unless
can_create_user?
def
build
(
skip_authorization:
false
)
raise
Gitlab
::
Access
::
AccessDeniedError
unless
skip_authorization
||
can_create_user?
user
=
User
.
new
(
build_user_params
)
...
...
@@ -32,8 +32,8 @@ module Users
user
end
def
execute
user
=
build
def
execute
(
skip_authorization:
false
)
user
=
build
(
skip_authorization:
skip_authorization
)
if
user
.
save
log_info
(
"User
\"
#{
user
.
name
}
\"
(
#{
user
.
email
}
) was created"
)
...
...
changelogs/unreleased/dm-fix-oauth-user-creation.yml
0 → 100644
View file @
f4b30c6d
---
title
:
Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled
merge_request
:
author
:
lib/gitlab/o_auth/user.rb
View file @
f4b30c6d
...
...
@@ -148,7 +148,7 @@ module Gitlab
def
build_new_user
user_params
=
user_attributes
.
merge
(
extern_uid:
auth_hash
.
uid
,
provider:
auth_hash
.
provider
,
skip_confirmation:
true
)
Users
::
CreateService
.
new
(
nil
,
user_params
).
build
Users
::
CreateService
.
new
(
nil
,
user_params
).
build
(
skip_authorization:
true
)
end
def
user_attributes
...
...
spec/lib/gitlab/ldap/user_spec.rb
View file @
f4b30c6d
...
...
@@ -108,6 +108,18 @@ describe Gitlab::LDAP::User, lib: true do
it
"creates a new user if not found"
do
expect
{
ldap_user
.
save
}.
to
change
{
User
.
count
}.
by
(
1
)
end
context
'when signup is disabled'
do
before
do
stub_application_setting
signup_enabled:
false
end
it
'creates the user'
do
ldap_user
.
save
expect
(
gl_user
).
to
be_persisted
end
end
end
describe
'updating email'
do
...
...
spec/lib/gitlab/o_auth/user_spec.rb
View file @
f4b30c6d
...
...
@@ -40,6 +40,20 @@ describe Gitlab::OAuth::User, lib: true do
let
(
:provider
)
{
'twitter'
}
describe
'signup'
do
context
'when signup is disabled'
do
before
do
stub_application_setting
signup_enabled:
false
end
it
'creates the user'
do
stub_omniauth_config
(
allow_single_sign_on:
[
'twitter'
])
oauth_user
.
save
expect
(
gl_user
).
to
be_persisted
end
end
it
'marks user as having password_automatically_set'
do
stub_omniauth_config
(
allow_single_sign_on:
[
'twitter'
],
external_providers:
[
'twitter'
])
...
...
spec/lib/gitlab/saml/user_spec.rb
View file @
f4b30c6d
...
...
@@ -211,6 +211,18 @@ describe Gitlab::Saml::User, lib: true do
end
end
end
context
'when signup is disabled'
do
before
do
stub_application_setting
signup_enabled:
false
end
it
'creates the user'
do
saml_user
.
save
expect
(
gl_user
).
to
be_persisted
end
end
end
describe
'blocking'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment