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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
07437ac3
Commit
07437ac3
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/ssh_ldap_check' of /home/git/repositories/gitlab/gitlabhq
parents
db10e6aa
baa65e89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
lib/api/internal.rb
lib/api/internal.rb
+1
-0
lib/gitlab/ldap/user.rb
lib/gitlab/ldap/user.rb
+10
-0
No files found.
lib/api/internal.rb
View file @
07437ac3
...
...
@@ -35,6 +35,7 @@ module API
user
=
key
.
user
return
false
if
user
.
blocked?
return
false
if
user
.
ldap_user?
&&
Gitlab
::
LDAP
::
User
.
blocked?
(
user
.
extern_uid
)
action
=
case
git_cmd
when
*
DOWNLOAD_COMMANDS
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ldap/user.rb
View file @
07437ac3
...
...
@@ -71,6 +71,16 @@ module Gitlab
find_by_uid
(
ldap_user
.
dn
)
if
ldap_user
end
# Check LDAP user existance by dn. User in git over ssh check
#
# It covers 2 cases:
# * when ldap account was removed
# * when ldap account was deactivated by change of OU membership in 'dn'
def
blocked?
(
dn
)
ldap
=
OmniAuth
::
LDAP
::
Adaptor
.
new
(
ldap_conf
)
ldap
.
connection
.
search
(
base:
dn
,
size:
1
).
blank?
end
private
def
find_by_uid
(
uid
)
...
...
This diff is collapsed.
Click to expand it.
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