Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
776adc89
Commit
776adc89
authored
May 14, 2019
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag for SAML sign in to GitLab.com
parent
93d93433
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
32 deletions
+5
-32
ee/app/controllers/groups/omniauth_callbacks_controller.rb
ee/app/controllers/groups/omniauth_callbacks_controller.rb
+0
-18
ee/changelogs/unreleased/jej-unflag-group-saml-sign-in-to-dot-com.yml
...s/unreleased/jej-unflag-group-saml-sign-in-to-dot-com.yml
+5
-0
ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb
.../controllers/groups/omniauth_callbacks_controller_spec.rb
+0
-14
No files found.
ee/app/controllers/groups/omniauth_callbacks_controller.rb
View file @
776adc89
...
...
@@ -82,24 +82,6 @@ class Groups::OmniauthCallbacksController < OmniauthCallbacksController
Gitlab
::
Auth
::
GroupSaml
::
User
.
new
(
oauth
,
@saml_provider
)
end
override
:sign_in_user_flow
def
sign_in_user_flow
(
auth_user_class
)
# User has successfully authenticated with the SAML provider for the group
# but is not signed in to the GitLab instance.
if
sign_in_to_gitlab_enabled?
super
else
flash
[
:notice
]
=
"You must be signed in to use SAML with this group"
redirect_to
new_user_session_path
end
end
def
sign_in_to_gitlab_enabled?
::
Feature
.
enabled?
(
:group_saml_allows_sign_in_to_gitlab
,
@unauthenticated_group
)
end
override
:fail_login
def
fail_login
(
user
)
if
user
...
...
ee/changelogs/unreleased/jej-unflag-group-saml-sign-in-to-dot-com.yml
0 → 100644
View file @
776adc89
---
title
:
Group SAML can be used to sign into a GitLab instance
merge_request
:
12660
author
:
type
:
added
ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb
View file @
776adc89
...
...
@@ -188,20 +188,6 @@ describe Groups::OmniauthCallbacksController do
end
end
context
'identity linked but sign in flow disabled'
do
before
do
create_linked_user
stub_feature_flags
(
group_saml_allows_sign_in_to_gitlab:
false
)
end
it
'prevents sign in'
do
post
provider
,
params:
{
group_id:
group
}
expect
(
flash
[
:notice
]).
to
start_with
(
'You must be signed in'
)
expect
(
response
).
to
redirect_to
(
'/users/sign_in'
)
end
end
it_behaves_like
"and identity already linked"
end
end
...
...
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