Skip to content
Snippets Groups Projects

SSO enforcement shouldn't require SSO for non-members and public groups

Merged Bogdan Denkovych requested to merge bdenkovych-issue-386920 into master
All threads resolved!
3 files
+ 10
17
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -8,6 +8,7 @@ module GroupPolicy
prepended do
include CrudPolicyHelpers
condition(:group_member, scope: :subject) { @user && @user.is_a?(User) && @subject.member?(@user) }
condition(:ldap_synced, scope: :subject) { @subject.ldap_synced? }
condition(:saml_group_links_enabled, scope: :subject) do
@subject.root_ancestor.saml_group_links_enabled?
@@ -89,7 +90,7 @@ module GroupPolicy
end
condition(:needs_new_sso_session, scope: :subject) do
::Gitlab::Auth::GroupSaml::SsoEnforcer.group_access_restricted?(@subject, user: @user)
::Gitlab::Auth::GroupSaml::SsoEnforcer.group_access_restricted?(@subject, user: @user) && (@subject.private? || group_member?)
end
condition(:no_active_sso_session, scope: :subject) do
Loading