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
1cc95f7c
Commit
1cc95f7c
authored
Feb 14, 2020
by
Blair Lunceford
Committed by
Imre Farkas
Feb 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add GET endpoint to LDAP group link API
parent
57acb8eb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
81 additions
and
3 deletions
+81
-3
changelogs/unreleased/13679-add-get-endpoint-to-ldap-group-link-api.yml
...eleased/13679-add-get-endpoint-to-ldap-group-link-api.yml
+5
-0
doc/api/groups.md
doc/api/groups.md
+19
-3
ee/lib/api/ldap_group_links.rb
ee/lib/api/ldap_group_links.rb
+15
-0
ee/spec/requests/api/ldap_group_links_spec.rb
ee/spec/requests/api/ldap_group_links_spec.rb
+42
-0
No files found.
changelogs/unreleased/13679-add-get-endpoint-to-ldap-group-link-api.yml
0 → 100644
View file @
1cc95f7c
---
title
:
Add GET endpoint to LDAP group link API
merge_request
:
24216
author
:
type
:
added
doc/api/groups.md
View file @
1cc95f7c
...
...
@@ -798,7 +798,7 @@ DELETE /groups/:id/hooks/:hook_id
Group audit events can be accessed via the
[
Group Audit Events API
](
audit_events.md#group-audit-events-starter
)
## Sync group with LDAP **(
CORE ONLY
)**
## Sync group with LDAP **(
STARTER
)**
Syncs the group with its linked LDAP group. Only available to group owners and administrators.
...
...
@@ -814,7 +814,23 @@ Parameters:
Please consult the
[
Group Members
](
members.md
)
documentation.
### Add LDAP group link **(CORE ONLY)**
## LDAP Group Links
List, add, and delete LDAP group links.
### List LDAP group links **(STARTER)**
Lists LDAP group links.
```
GET /groups/:id/ldap_group_links
```
Parameters:
-
`id`
(required) - The ID of a group
### Add LDAP group link **(STARTER)**
Adds an LDAP group link.
...
...
@@ -829,7 +845,7 @@ Parameters:
-
`group_access`
(required) - Minimum access level for members of the LDAP group
-
`provider`
(required) - LDAP provider for the LDAP group
### Delete LDAP group link **(
CORE ONLY
)**
### Delete LDAP group link **(
STARTER
)**
Deletes an LDAP group link.
...
...
ee/lib/api/ldap_group_links.rb
View file @
1cc95f7c
...
...
@@ -8,6 +8,21 @@ module API
requires
:id
,
type:
String
,
desc:
'The ID of a group'
end
resource
:groups
do
desc
'Get LDAP group links for a group'
do
success
EE
::
API
::
Entities
::
LdapGroupLink
end
get
":id/ldap_group_links"
do
group
=
find_group
(
params
[
:id
])
authorize!
:admin_group
,
group
ldap_group_links
=
group
.
ldap_group_links
if
ldap_group_links
&&
ldap_group_links
!=
[]
present
ldap_group_links
,
with:
EE
::
API
::
Entities
::
LdapGroupLink
else
render_api_error!
(
'No linked LDAP groups found'
,
404
)
end
end
desc
'Add a linked LDAP group to group'
do
success
EE
::
API
::
Entities
::
LdapGroupLink
end
...
...
ee/spec/requests/api/ldap_group_links_spec.rb
View file @
1cc95f7c
...
...
@@ -13,12 +13,54 @@ describe API::LdapGroupLinks, api: true do
group
=
create
(
:group
)
group
.
ldap_group_links
.
create
cn:
'ldap-group1'
,
group_access:
Gitlab
::
Access
::
MAINTAINER
,
provider:
'ldap1'
group
.
ldap_group_links
.
create
cn:
'ldap-group2'
,
group_access:
Gitlab
::
Access
::
MAINTAINER
,
provider:
'ldap2'
group
.
ldap_group_links
.
create
filter:
'(uid=mary)'
,
group_access:
Gitlab
::
Access
::
DEVELOPER
,
provider:
'ldap3'
group
end
let
(
:group_with_no_ldap_links
)
{
create
(
:group
)
}
before
do
group_with_ldap_links
.
add_owner
owner
group_with_ldap_links
.
add_user
user
,
Gitlab
::
Access
::
DEVELOPER
group_with_no_ldap_links
.
add_owner
owner
end
describe
"GET /groups/:id/ldap_group_links"
do
context
"when unauthenticated"
do
it
"returns authentication error"
do
get
api
(
"/groups/
#{
group_with_ldap_links
.
id
}
/ldap_group_links"
)
expect
(
response
).
to
have_gitlab_http_status
(
:unauthorized
)
end
end
context
"when a less priviledged user"
do
it
"returns forbidden"
do
get
api
(
"/groups/
#{
group_with_ldap_links
.
id
}
/ldap_group_links"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
:forbidden
)
end
end
context
"when owner of the group"
do
it
"returns ldap group links"
do
get
api
(
"/groups/
#{
group_with_ldap_links
.
id
}
/ldap_group_links"
,
owner
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
(
match
([
a_hash_including
(
'cn'
=>
'ldap-group1'
,
'provider'
=>
'ldap1'
),
a_hash_including
(
'cn'
=>
'ldap-group2'
,
'provider'
=>
'ldap2'
),
a_hash_including
(
'cn'
=>
nil
,
'provider'
=>
'ldap3'
)
]))
end
it
"returns error if no ldap group links found"
do
get
api
(
"/groups/
#{
group_with_no_ldap_links
.
id
}
/ldap_group_links"
,
owner
)
expect
(
response
).
to
have_gitlab_http_status
(
:not_found
)
end
end
end
describe
"POST /groups/:id/ldap_group_links"
do
...
...
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