Commit e7f4f0ae authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Block user if he/she was blocked in Active Directory

parent 0f144f36
......@@ -59,6 +59,7 @@ v 7.9.0 (unreleased)
- Added blue thmeme
- Remove annoying notice messages when create/update merge request
- Allow smb:// links in Markdown text.
- Block user if he/she was blocked in Active Directory
v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers
......
......@@ -34,7 +34,14 @@ def initialize(user, adapter=nil)
def allowed?
if Gitlab::LDAP::Person.find_by_dn(user.ldap_identity.extern_uid, adapter)
return true unless ldap_config.active_directory
!Gitlab::LDAP::Person.disabled_via_active_directory?(user.ldap_identity.extern_uid, adapter)
# Block user in GitLab if he/she was blocked in AD
if Gitlab::LDAP::Person.disabled_via_active_directory?(user.ldap_identity.extern_uid, adapter)
user.block unless user.blocked?
false
else
true
end
else
false
end
......
......@@ -20,6 +20,11 @@
before { Gitlab::LDAP::Person.stub(disabled_via_active_directory?: true) }
it { is_expected.to be_falsey }
it "should block user in GitLab" do
access.allowed?
user.should be_blocked
end
end
context 'and has no disabled flag in active diretory' do
......@@ -38,4 +43,4 @@
end
end
end
end
\ No newline at end of file
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment