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
Léo-Paul Géneau
gitlab-ce
Commits
4aae86f6
Commit
4aae86f6
authored
May 29, 2018
by
Mayra Cabrera
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'dev/master'
parents
673a45a1
0033e572
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
186 additions
and
24 deletions
+186
-24
CHANGELOG.md
CHANGELOG.md
+28
-0
app/controllers/profiles_controller.rb
app/controllers/profiles_controller.rb
+0
-2
changelogs/unreleased/security-dm-delete-deploy-key.yml
changelogs/unreleased/security-dm-delete-deploy-key.yml
+5
-0
changelogs/unreleased/security-fj-import-export-assignment.yml
...elogs/unreleased/security-fj-import-export-assignment.yml
+5
-0
changelogs/unreleased/security-users-can-update-their-password-without-entering-current-password.yml
...date-their-password-without-entering-current-password.yml
+5
-0
lib/api/deploy_keys.rb
lib/api/deploy_keys.rb
+3
-3
lib/gitlab/import_export/attribute_cleaner.rb
lib/gitlab/import_export/attribute_cleaner.rb
+9
-2
lib/gitlab/import_export/attributes_finder.rb
lib/gitlab/import_export/attributes_finder.rb
+4
-0
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+0
-2
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+15
-8
lib/gitlab/import_export/reader.rb
lib/gitlab/import_export/reader.rb
+1
-1
lib/gitlab/import_export/relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+9
-1
spec/controllers/profiles_controller_spec.rb
spec/controllers/profiles_controller_spec.rb
+13
-0
spec/lib/gitlab/import_export/attribute_cleaner_spec.rb
spec/lib/gitlab/import_export/attribute_cleaner_spec.rb
+26
-3
spec/lib/gitlab/import_export/project.json
spec/lib/gitlab/import_export/project.json
+2
-0
spec/lib/gitlab/import_export/project.light.json
spec/lib/gitlab/import_export/project.light.json
+2
-0
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+9
-0
spec/lib/gitlab/import_export/relation_factory_spec.rb
spec/lib/gitlab/import_export/relation_factory_spec.rb
+11
-1
spec/requests/api/deploy_keys_spec.rb
spec/requests/api/deploy_keys_spec.rb
+39
-1
No files found.
CHANGELOG.md
View file @
4aae86f6
...
@@ -2,6 +2,15 @@
...
@@ -2,6 +2,15 @@
documentation
](
doc/development/changelog.md
)
for instructions on adding your own
documentation
](
doc/development/changelog.md
)
for instructions on adding your own
entry.
entry.
## 10.8.2 (2018-05-28)
### Security (3 changes)
-
Prevent user passwords from being changed without providing the previous password.
-
Fix API to remove deploy key from project instead of deleting it entirely.
-
Fixed bug that allowed importing arbitrary project attributes.
## 10.8.1 (2018-05-23)
## 10.8.1 (2018-05-23)
### Fixed (9 changes)
### Fixed (9 changes)
...
@@ -193,6 +202,15 @@ entry.
...
@@ -193,6 +202,15 @@ entry.
-
Gitaly handles repository forks by default.
-
Gitaly handles repository forks by default.
## 10.7.5 (2018-05-28)
### Security (3 changes)
-
Prevent user passwords from being changed without providing the previous password.
-
Fix API to remove deploy key from project instead of deleting it entirely.
-
Fixed bug that allowed importing arbitrary project attributes.
## 10.7.4 (2018-05-21)
## 10.7.4 (2018-05-21)
### Fixed (1 change)
### Fixed (1 change)
...
@@ -457,6 +475,16 @@ entry.
...
@@ -457,6 +475,16 @@ entry.
-
Upgrade Gitaly to upgrade its charlock_holmes.
-
Upgrade Gitaly to upgrade its charlock_holmes.
## 10.6.6 (2018-05-28)
### Security (4 changes)
-
Do not allow non-members to create MRs via forked projects when MRs are private.
-
Prevent user passwords from being changed without providing the previous password.
-
Fix API to remove deploy key from project instead of deleting it entirely.
-
Fixed bug that allowed importing arbitrary project attributes.
## 10.6.5 (2018-04-24)
## 10.6.5 (2018-04-24)
### Security (1 change)
### Security (1 change)
...
...
app/controllers/profiles_controller.rb
View file @
4aae86f6
...
@@ -93,8 +93,6 @@ class ProfilesController < Profiles::ApplicationController
...
@@ -93,8 +93,6 @@ class ProfilesController < Profiles::ApplicationController
:linkedin
,
:linkedin
,
:location
,
:location
,
:name
,
:name
,
:password
,
:password_confirmation
,
:public_email
,
:public_email
,
:skype
,
:skype
,
:twitter
,
:twitter
,
...
...
changelogs/unreleased/security-dm-delete-deploy-key.yml
0 → 100644
View file @
4aae86f6
---
title
:
Fix API to remove deploy key from project instead of deleting it entirely
merge_request
:
author
:
type
:
security
changelogs/unreleased/security-fj-import-export-assignment.yml
0 → 100644
View file @
4aae86f6
---
title
:
Fixed bug that allowed importing arbitrary project attributes
merge_request
:
author
:
type
:
security
changelogs/unreleased/security-users-can-update-their-password-without-entering-current-password.yml
0 → 100644
View file @
4aae86f6
---
title
:
Prevent user passwords from being changed without providing the previous password
merge_request
:
author
:
type
:
security
lib/api/deploy_keys.rb
View file @
4aae86f6
...
@@ -148,10 +148,10 @@ module API
...
@@ -148,10 +148,10 @@ module API
requires
:key_id
,
type:
Integer
,
desc:
'The ID of the deploy key'
requires
:key_id
,
type:
Integer
,
desc:
'The ID of the deploy key'
end
end
delete
":id/deploy_keys/:key_id"
do
delete
":id/deploy_keys/:key_id"
do
key
=
user_project
.
deploy_keys
.
find
(
params
[
:key_id
])
deploy_key_project
=
user_project
.
deploy_keys_projects
.
find_by
(
deploy_key_id:
params
[
:key_id
])
not_found!
(
'Deploy Key'
)
unless
key
not_found!
(
'Deploy Key'
)
unless
deploy_key_project
destroy_conditionally!
(
key
)
destroy_conditionally!
(
deploy_key_project
)
end
end
end
end
end
end
...
...
lib/gitlab/import_export/attribute_cleaner.rb
View file @
4aae86f6
...
@@ -7,14 +7,15 @@ module Gitlab
...
@@ -7,14 +7,15 @@ module Gitlab
new
(
*
args
).
clean
new
(
*
args
).
clean
end
end
def
initialize
(
relation_hash
:,
relation_class
:)
def
initialize
(
relation_hash
:,
relation_class
:
,
excluded_keys:
[]
)
@relation_hash
=
relation_hash
@relation_hash
=
relation_hash
@relation_class
=
relation_class
@relation_class
=
relation_class
@excluded_keys
=
excluded_keys
end
end
def
clean
def
clean
@relation_hash
.
reject
do
|
key
,
_value
|
@relation_hash
.
reject
do
|
key
,
_value
|
prohibited_key?
(
key
)
||
!
@relation_class
.
attribute_method?
(
key
)
prohibited_key?
(
key
)
||
!
@relation_class
.
attribute_method?
(
key
)
||
excluded_key?
(
key
)
end
.
except
(
'id'
)
end
.
except
(
'id'
)
end
end
...
@@ -23,6 +24,12 @@ module Gitlab
...
@@ -23,6 +24,12 @@ module Gitlab
def
prohibited_key?
(
key
)
def
prohibited_key?
(
key
)
key
.
end_with?
(
'_id'
)
&&
!
ALLOWED_REFERENCES
.
include?
(
key
)
key
.
end_with?
(
'_id'
)
&&
!
ALLOWED_REFERENCES
.
include?
(
key
)
end
end
def
excluded_key?
(
key
)
return
false
if
@excluded_keys
.
empty?
@excluded_keys
.
include?
(
key
)
end
end
end
end
end
end
end
lib/gitlab/import_export/attributes_finder.rb
View file @
4aae86f6
...
@@ -32,6 +32,10 @@ module Gitlab
...
@@ -32,6 +32,10 @@ module Gitlab
@methods
[
key
].
nil?
?
{}
:
{
methods:
@methods
[
key
]
}
@methods
[
key
].
nil?
?
{}
:
{
methods:
@methods
[
key
]
}
end
end
def
find_excluded_keys
(
klass_name
)
@excluded_attributes
[
klass_name
.
to_sym
]
&
.
map
(
&
:to_s
)
||
[]
end
private
private
def
find_attributes_only
(
value
)
def
find_attributes_only
(
value
)
...
...
lib/gitlab/import_export/import_export.yml
View file @
4aae86f6
...
@@ -98,8 +98,6 @@ excluded_attributes:
...
@@ -98,8 +98,6 @@ excluded_attributes:
-
:import_jid
-
:import_jid
-
:created_at
-
:created_at
-
:updated_at
-
:updated_at
-
:import_jid
-
:import_jid
-
:id
-
:id
-
:star_count
-
:star_count
-
:last_activity_at
-
:last_activity_at
...
...
lib/gitlab/import_export/project_tree_restorer.rb
View file @
4aae86f6
...
@@ -88,16 +88,18 @@ module Gitlab
...
@@ -88,16 +88,18 @@ module Gitlab
end
end
def
project_params
def
project_params
@project_params
||=
json_params
.
merge
(
override_params
)
@project_params
||=
begin
attrs
=
json_params
.
merge
(
override_params
)
# Cleaning all imported and overridden params
Gitlab
::
ImportExport
::
AttributeCleaner
.
clean
(
relation_hash:
attrs
,
relation_class:
Project
,
excluded_keys:
excluded_keys_for_relation
(
:project
))
end
end
end
def
override_params
def
override_params
return
{}
unless
params
=
@project
.
import_data
&
.
data
&
.
fetch
(
'override_params'
,
nil
)
@override_params
||=
@project
.
import_data
&
.
data
&
.
fetch
(
'override_params'
,
nil
)
||
{}
@override_params
||=
params
.
select
do
|
key
,
_value
|
Project
.
column_names
.
include?
(
key
.
to_s
)
&&
!
reader
.
project_tree
[
:except
].
include?
(
key
.
to_sym
)
end
end
end
def
json_params
def
json_params
...
@@ -171,7 +173,8 @@ module Gitlab
...
@@ -171,7 +173,8 @@ module Gitlab
relation_hash:
parsed_relation_hash
(
relation_hash
,
relation
.
to_sym
),
relation_hash:
parsed_relation_hash
(
relation_hash
,
relation
.
to_sym
),
members_mapper:
members_mapper
,
members_mapper:
members_mapper
,
user:
@user
,
user:
@user
,
project:
@restored_project
)
project:
@restored_project
,
excluded_keys:
excluded_keys_for_relation
(
relation
))
end
.
compact
end
.
compact
relation_hash_list
.
is_a?
(
Array
)
?
relation_array
:
relation_array
.
first
relation_hash_list
.
is_a?
(
Array
)
?
relation_array
:
relation_array
.
first
...
@@ -192,6 +195,10 @@ module Gitlab
...
@@ -192,6 +195,10 @@ module Gitlab
def
reader
def
reader
@reader
||=
Gitlab
::
ImportExport
::
Reader
.
new
(
shared:
@shared
)
@reader
||=
Gitlab
::
ImportExport
::
Reader
.
new
(
shared:
@shared
)
end
end
def
excluded_keys_for_relation
(
relation
)
@reader
.
attributes_finder
.
find_excluded_keys
(
relation
)
end
end
end
end
end
end
end
lib/gitlab/import_export/reader.rb
View file @
4aae86f6
module
Gitlab
module
Gitlab
module
ImportExport
module
ImportExport
class
Reader
class
Reader
attr_reader
:tree
attr_reader
:tree
,
:attributes_finder
def
initialize
(
shared
:)
def
initialize
(
shared
:)
@shared
=
shared
@shared
=
shared
...
...
lib/gitlab/import_export/relation_factory.rb
View file @
4aae86f6
...
@@ -36,13 +36,21 @@ module Gitlab
...
@@ -36,13 +36,21 @@ module Gitlab
new
(
*
args
).
create
new
(
*
args
).
create
end
end
def
initialize
(
relation_sym
:,
relation_hash
:,
members_mapper
:,
user
:,
project
:)
def
initialize
(
relation_sym
:,
relation_hash
:,
members_mapper
:,
user
:,
project
:
,
excluded_keys:
[]
)
@relation_name
=
OVERRIDES
[
relation_sym
]
||
relation_sym
@relation_name
=
OVERRIDES
[
relation_sym
]
||
relation_sym
@relation_hash
=
relation_hash
.
except
(
'noteable_id'
)
@relation_hash
=
relation_hash
.
except
(
'noteable_id'
)
@members_mapper
=
members_mapper
@members_mapper
=
members_mapper
@user
=
user
@user
=
user
@project
=
project
@project
=
project
@imported_object_retries
=
0
@imported_object_retries
=
0
# Remove excluded keys from relation_hash
# We don't do this in the parsed_relation_hash because of the 'transformed attributes'
# For example, MergeRequestDiffFiles exports its diff attribute as utf8_diff. Then,
# in the create method that attribute is renamed to diff. And because diff is an excluded key,
# if we clean the excluded keys in the parsed_relation_hash, it will be removed
# from the object attributes and the export will fail.
@relation_hash
.
except!
(
*
excluded_keys
)
end
end
# Creates an object from an actual model with name "relation_sym" with params from
# Creates an object from an actual model with name "relation_sym" with params from
...
...
spec/controllers/profiles_controller_spec.rb
View file @
4aae86f6
...
@@ -3,6 +3,19 @@ require('spec_helper')
...
@@ -3,6 +3,19 @@ require('spec_helper')
describe
ProfilesController
,
:request_store
do
describe
ProfilesController
,
:request_store
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
describe
'POST update'
do
it
'does not update password'
do
sign_in
(
user
)
expect
do
post
:update
,
user:
{
password:
'hello12345'
,
password_confirmation:
'hello12345'
}
end
.
not_to
change
{
user
.
reload
.
encrypted_password
}
expect
(
response
.
status
).
to
eq
(
302
)
end
end
describe
'PUT update'
do
describe
'PUT update'
do
it
'allows an email update from a user without an external email address'
do
it
'allows an email update from a user without an external email address'
do
sign_in
(
user
)
sign_in
(
user
)
...
...
spec/lib/gitlab/import_export/attribute_cleaner_spec.rb
View file @
4aae86f6
...
@@ -15,7 +15,10 @@ describe Gitlab::ImportExport::AttributeCleaner do
...
@@ -15,7 +15,10 @@ describe Gitlab::ImportExport::AttributeCleaner do
'project_id'
=>
99
,
'project_id'
=>
99
,
'user_id'
=>
99
,
'user_id'
=>
99
,
'random_id_in_the_middle'
=>
99
,
'random_id_in_the_middle'
=>
99
,
'notid'
=>
99
'notid'
=>
99
,
'import_source'
=>
'whatever'
,
'import_type'
=>
'whatever'
,
'non_existent_attr'
=>
'whatever'
}
}
end
end
...
@@ -28,10 +31,30 @@ describe Gitlab::ImportExport::AttributeCleaner do
...
@@ -28,10 +31,30 @@ describe Gitlab::ImportExport::AttributeCleaner do
}
}
end
end
let
(
:excluded_keys
)
{
%w[import_source import_type]
}
subject
{
described_class
.
clean
(
relation_hash:
unsafe_hash
,
relation_class:
relation_class
,
excluded_keys:
excluded_keys
)
}
before
do
allow
(
relation_class
).
to
receive
(
:attribute_method?
).
and_return
(
true
)
allow
(
relation_class
).
to
receive
(
:attribute_method?
).
with
(
'non_existent_attr'
).
and_return
(
false
)
end
it
'removes unwanted attributes from the hash'
do
it
'removes unwanted attributes from the hash'
do
# allow(relation_class).to receive(:attribute_method?).and_return(true)
expect
(
subject
).
to
eq
(
post_safe_hash
)
end
it
'removes attributes not present in relation_class'
do
expect
(
subject
.
keys
).
not_to
include
'non_existent_attr'
end
it
'removes excluded keys from the hash'
do
expect
(
subject
.
keys
).
not_to
include
excluded_keys
end
it
'does not remove excluded key if not listed'
do
parsed_hash
=
described_class
.
clean
(
relation_hash:
unsafe_hash
,
relation_class:
relation_class
)
parsed_hash
=
described_class
.
clean
(
relation_hash:
unsafe_hash
,
relation_class:
relation_class
)
expect
(
parsed_hash
).
to
eq
(
post_safe_hash
)
expect
(
parsed_hash
.
keys
).
to
eq
post_safe_hash
.
keys
+
excluded_keys
end
end
end
end
spec/lib/gitlab/import_export/project.json
View file @
4aae86f6
{
{
"description"
:
"Nisi et repellendus ut enim quo accusamus vel magnam."
,
"description"
:
"Nisi et repellendus ut enim quo accusamus vel magnam."
,
"import_type"
:
"gitlab_project"
,
"creator_id"
:
123
,
"visibility_level"
:
10
,
"visibility_level"
:
10
,
"archived"
:
false
,
"archived"
:
false
,
"labels"
:
[
"labels"
:
[
...
...
spec/lib/gitlab/import_export/project.light.json
View file @
4aae86f6
{
{
"description"
:
"Nisi et repellendus ut enim quo accusamus vel magnam."
,
"description"
:
"Nisi et repellendus ut enim quo accusamus vel magnam."
,
"import_type"
:
"gitlab_project"
,
"creator_id"
:
123
,
"visibility_level"
:
10
,
"visibility_level"
:
10
,
"archived"
:
false
,
"archived"
:
false
,
"milestones"
:
[
"milestones"
:
[
...
...
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
View file @
4aae86f6
...
@@ -23,6 +23,10 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
...
@@ -23,6 +23,10 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
allow_any_instance_of
(
Gitlab
::
Git
::
Repository
).
to
receive
(
:create_branch
)
allow_any_instance_of
(
Gitlab
::
Git
::
Repository
).
to
receive
(
:create_branch
)
project_tree_restorer
=
described_class
.
new
(
user:
@user
,
shared:
@shared
,
project:
@project
)
project_tree_restorer
=
described_class
.
new
(
user:
@user
,
shared:
@shared
,
project:
@project
)
expect
(
Gitlab
::
ImportExport
::
RelationFactory
).
to
receive
(
:create
).
with
(
hash_including
(
excluded_keys:
[
'whatever'
])).
and_call_original
.
at_least
(
:once
)
allow
(
project_tree_restorer
).
to
receive
(
:excluded_keys_for_relation
).
and_return
([
'whatever'
])
@restored_project_json
=
project_tree_restorer
.
restore
@restored_project_json
=
project_tree_restorer
.
restore
end
end
end
end
...
@@ -248,6 +252,11 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
...
@@ -248,6 +252,11 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
expect
(
labels
.
where
(
type:
"ProjectLabel"
).
count
).
to
eq
(
results
.
fetch
(
:first_issue_labels
,
0
))
expect
(
labels
.
where
(
type:
"ProjectLabel"
).
count
).
to
eq
(
results
.
fetch
(
:first_issue_labels
,
0
))
expect
(
labels
.
where
(
type:
"ProjectLabel"
).
where
.
not
(
group_id:
nil
).
count
).
to
eq
(
0
)
expect
(
labels
.
where
(
type:
"ProjectLabel"
).
where
.
not
(
group_id:
nil
).
count
).
to
eq
(
0
)
end
end
it
'does not set params that are excluded from import_export settings'
do
expect
(
project
.
import_type
).
to
be_nil
expect
(
project
.
creator_id
).
not_to
eq
123
end
end
end
shared_examples
'restores group correctly'
do
|**
results
|
shared_examples
'restores group correctly'
do
|**
results
|
...
...
spec/lib/gitlab/import_export/relation_factory_spec.rb
View file @
4aae86f6
...
@@ -4,12 +4,14 @@ describe Gitlab::ImportExport::RelationFactory do
...
@@ -4,12 +4,14 @@ describe Gitlab::ImportExport::RelationFactory do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:members_mapper
)
{
double
(
'members_mapper'
).
as_null_object
}
let
(
:members_mapper
)
{
double
(
'members_mapper'
).
as_null_object
}
let
(
:user
)
{
create
(
:admin
)
}
let
(
:user
)
{
create
(
:admin
)
}
let
(
:excluded_keys
)
{
[]
}
let
(
:created_object
)
do
let
(
:created_object
)
do
described_class
.
create
(
relation_sym:
relation_sym
,
described_class
.
create
(
relation_sym:
relation_sym
,
relation_hash:
relation_hash
,
relation_hash:
relation_hash
,
members_mapper:
members_mapper
,
members_mapper:
members_mapper
,
user:
user
,
user:
user
,
project:
project
)
project:
project
,
excluded_keys:
excluded_keys
)
end
end
context
'hook object'
do
context
'hook object'
do
...
@@ -67,6 +69,14 @@ describe Gitlab::ImportExport::RelationFactory do
...
@@ -67,6 +69,14 @@ describe Gitlab::ImportExport::RelationFactory do
expect
(
created_object
.
service_id
).
not_to
eq
(
service_id
)
expect
(
created_object
.
service_id
).
not_to
eq
(
service_id
)
end
end
end
end
context
'excluded attributes'
do
let
(
:excluded_keys
)
{
%w[url]
}
it
'are removed from the imported object'
do
expect
(
created_object
.
url
).
to
be_nil
end
end
end
end
# Mocks an ActiveRecordish object with the dodgy columns
# Mocks an ActiveRecordish object with the dodgy columns
...
...
spec/requests/api/deploy_keys_spec.rb
View file @
4aae86f6
...
@@ -171,7 +171,7 @@ describe API::DeployKeys do
...
@@ -171,7 +171,7 @@ describe API::DeployKeys do
deploy_key
deploy_key
end
end
it
'
deletes existing key
'
do
it
'
removes existing key from project
'
do
expect
do
expect
do
delete
api
(
"/projects/
#{
project
.
id
}
/deploy_keys/
#{
deploy_key
.
id
}
"
,
admin
)
delete
api
(
"/projects/
#{
project
.
id
}
/deploy_keys/
#{
deploy_key
.
id
}
"
,
admin
)
...
@@ -179,6 +179,44 @@ describe API::DeployKeys do
...
@@ -179,6 +179,44 @@ describe API::DeployKeys do
end
.
to
change
{
project
.
deploy_keys
.
count
}.
by
(
-
1
)
end
.
to
change
{
project
.
deploy_keys
.
count
}.
by
(
-
1
)
end
end
context
'when the deploy key is public'
do
it
'does not delete the deploy key'
do
expect
do
delete
api
(
"/projects/
#{
project
.
id
}
/deploy_keys/
#{
deploy_key
.
id
}
"
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
204
)
end
.
not_to
change
{
DeployKey
.
count
}
end
end
context
'when the deploy key is not public'
do
let!
(
:deploy_key
)
{
create
(
:deploy_key
,
public:
false
)
}
context
'when the deploy key is only used by this project'
do
it
'deletes the deploy key'
do
expect
do
delete
api
(
"/projects/
#{
project
.
id
}
/deploy_keys/
#{
deploy_key
.
id
}
"
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
204
)
end
.
to
change
{
DeployKey
.
count
}.
by
(
-
1
)
end
end
context
'when the deploy key is used by other projects'
do
before
do
create
(
:deploy_keys_project
,
project:
project2
,
deploy_key:
deploy_key
)
end
it
'does not delete the deploy key'
do
expect
do
delete
api
(
"/projects/
#{
project
.
id
}
/deploy_keys/
#{
deploy_key
.
id
}
"
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
204
)
end
.
not_to
change
{
DeployKey
.
count
}
end
end
end
it
'returns 404 Not Found with invalid ID'
do
it
'returns 404 Not Found with invalid ID'
do
delete
api
(
"/projects/
#{
project
.
id
}
/deploy_keys/404"
,
admin
)
delete
api
(
"/projects/
#{
project
.
id
}
/deploy_keys/404"
,
admin
)
...
...
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