Commit 34fd5570 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Move user access check to Gitlab::UserAccess

parent 6d45909f
...@@ -61,18 +61,7 @@ module Gitlab ...@@ -61,18 +61,7 @@ module Gitlab
private private
def user_allowed?(user) def user_allowed?(user)
return false if user.blocked? Gitlab::UserAccess.allowed?(user)
if Gitlab.config.ldap.enabled
if user.ldap_user?
# Check if LDAP user exists and match LDAP user_filter
Gitlab::LDAP::Access.open do |adapter|
return false unless adapter.allowed?(user)
end
end
end
true
end end
end end
end end
module Gitlab
module UserAccess
def self.allowed?(user)
return false if user.blocked?
if Gitlab.config.ldap.enabled
if user.ldap_user?
# Check if LDAP user exists and match LDAP user_filter
Gitlab::LDAP::Access.open do |adapter|
return false unless adapter.allowed?(user)
end
end
end
true
end
end
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