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
iv
gitlab-ce
Commits
cf2058c0
Commit
cf2058c0
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6781 from thekid/master
Complete admin APIs for SSH Keys
parents
7b4a7625
05e792b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
127 additions
and
0 deletions
+127
-0
doc/api/users.md
doc/api/users.md
+27
-0
lib/api/users.rb
lib/api/users.rb
+39
-0
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+61
-0
No files found.
doc/api/users.md
View file @
cf2058c0
...
...
@@ -220,6 +220,18 @@ Parameters:
+
**none**
## List SSH keys for user
Get a list of a specified user's SSH keys. Available only for admin
```
GET /users/:uid/keys
```
Parameters:
+
`uid`
(required) - id of specified user
## Single SSH key
...
...
@@ -286,3 +298,18 @@ Parameters:
+
`id`
(required) - SSH key ID
## Delete SSH key
Deletes key owned by a specified user. Available only for admin.
```
DELETE /users/:uid/keys/:id
```
Parameters:
+
`uid`
(required) - id of specified user
+
`id`
(required) - SSH key ID
Will return
`200 Ok`
on success, or
`404 Not found`
if either user or key cannot be found.
This diff is collapsed.
Click to expand it.
lib/api/users.rb
View file @
cf2058c0
...
...
@@ -113,6 +113,45 @@ module API
end
end
# Get ssh keys of a specified user. Only available to admin users.
#
# Parameters:
# uid (required) - The ID of a user
# Example Request:
# GET /users/:uid/keys
get
':uid/keys'
do
authenticated_as_admin!
user
=
User
.
find_by
(
id:
params
[
:uid
])
if
user
present
user
.
keys
,
with:
Entities
::
SSHKey
else
not_found!
end
end
# Delete existing ssh key of a specified user. Only available to admin
# users.
#
# Parameters:
# uid (required) - The ID of a user
# id (required) - SSH Key ID
# Example Request:
# DELETE /users/:uid/keys/:id
delete
':uid/keys/:id'
do
authenticated_as_admin!
user
=
User
.
find_by
(
id:
params
[
:uid
])
if
user
begin
key
=
user
.
keys
.
find
params
[
:id
]
key
.
destroy
rescue
ActiveRecord
::
RecordNotFound
not_found!
end
else
not_found!
end
end
# Delete user. Available only for admin
#
# Example Request:
...
...
This diff is collapsed.
Click to expand it.
spec/requests/api/users_spec.rb
View file @
cf2058c0
...
...
@@ -242,6 +242,67 @@ describe API::API, api: true do
end
end
describe
'GET /user/:uid/keys'
do
before
{
admin
}
context
'when unauthenticated'
do
it
'should return authentication error'
do
get
api
(
"/users/
#{
user
.
id
}
/keys"
)
response
.
status
.
should
==
401
end
end
context
'when authenticated'
do
it
'should return 404 for non-existing user'
do
get
api
(
'/users/999999/keys'
,
admin
)
response
.
status
.
should
==
404
end
it
'should return array of ssh keys'
do
user
.
keys
<<
key
user
.
save
get
api
(
"/users/
#{
user
.
id
}
/keys"
,
admin
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
first
[
'title'
].
should
==
key
.
title
end
end
end
describe
'DELETE /user/:uid/keys/:id'
do
before
{
admin
}
context
'when unauthenticated'
do
it
'should return authentication error'
do
delete
api
(
"/users/
#{
user
.
id
}
/keys/42"
)
response
.
status
.
should
==
401
end
end
context
'when authenticated'
do
it
'should delete existing key'
do
user
.
keys
<<
key
user
.
save
expect
{
delete
api
(
"/users/
#{
user
.
id
}
/keys/
#{
key
.
id
}
"
,
admin
)
}.
to
change
{
user
.
keys
.
count
}.
by
(
-
1
)
response
.
status
.
should
==
200
end
it
'should return 404 error if user not found'
do
user
.
keys
<<
key
user
.
save
delete
api
(
"/users/999999/keys/
#{
key
.
id
}
"
,
admin
)
response
.
status
.
should
==
404
end
it
'should return 404 error if key not foud'
do
delete
api
(
"/users/
#{
user
.
id
}
/keys/42"
,
admin
)
response
.
status
.
should
==
404
end
end
end
describe
"DELETE /users/:id"
do
before
{
admin
}
...
...
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