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
73ee63b0
Commit
73ee63b0
authored
Jul 16, 2020
by
Alan (Maciej) Paruszewski
Committed by
James Fargher
Jul 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Present only issues visible to user in Vulnerabilitiy Issue Links API
parent
6f1b899d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
54 additions
and
15 deletions
+54
-15
ee/changelogs/unreleased/9424-filter-not-visible-issues-from-vulnerability-issue-links-api.yml
...not-visible-issues-from-vulnerability-issue-links-api.yml
+5
-0
ee/lib/api/vulnerability_issue_links.rb
ee/lib/api/vulnerability_issue_links.rb
+2
-4
ee/spec/factories/vulnerabilities.rb
ee/spec/factories/vulnerabilities.rb
+1
-1
ee/spec/requests/api/vulnerability_issue_links_spec.rb
ee/spec/requests/api/vulnerability_issue_links_spec.rb
+46
-10
No files found.
ee/changelogs/unreleased/9424-filter-not-visible-issues-from-vulnerability-issue-links-api.yml
0 → 100644
View file @
73ee63b0
---
title
:
Present only issues visible to user in Vulnerabilitiy Issue Links API
merge_request
:
36987
author
:
type
:
fixed
ee/lib/api/vulnerability_issue_links.rb
View file @
73ee63b0
...
@@ -33,10 +33,8 @@ module API
...
@@ -33,10 +33,8 @@ module API
end
end
get
':id/issue_links'
do
get
':id/issue_links'
do
vulnerability
=
find_and_authorize_vulnerability!
(
:read_vulnerability
)
vulnerability
=
find_and_authorize_vulnerability!
(
:read_vulnerability
)
present
vulnerability
related_issues
=
vulnerability
.
related_issues
.
with_api_entity_associations
.
with_vulnerability_links
.
related_issues
present
Ability
.
issues_readable_by_user
(
related_issues
,
current_user
),
.
with_api_entity_associations
.
with_vulnerability_links
,
with:
EE
::
API
::
Entities
::
VulnerabilityRelatedIssue
with:
EE
::
API
::
Entities
::
VulnerabilityRelatedIssue
end
end
...
...
ee/spec/factories/vulnerabilities.rb
View file @
73ee63b0
...
@@ -78,7 +78,7 @@ FactoryBot.define do
...
@@ -78,7 +78,7 @@ FactoryBot.define do
trait
:with_issue_links
do
trait
:with_issue_links
do
after
(
:create
)
do
|
vulnerability
|
after
(
:create
)
do
|
vulnerability
|
create_list
(
:issue
,
2
).
each
do
|
issue
|
create_list
(
:issue
,
2
,
project:
vulnerability
.
project
).
each
do
|
issue
|
create
(
:vulnerabilities_issue_link
,
vulnerability:
vulnerability
,
issue:
issue
)
create
(
:vulnerabilities_issue_link
,
vulnerability:
vulnerability
,
issue:
issue
)
end
end
end
end
...
...
ee/spec/requests/api/vulnerability_issue_links_spec.rb
View file @
73ee63b0
...
@@ -24,7 +24,8 @@ RSpec.describe API::VulnerabilityIssueLinks do
...
@@ -24,7 +24,8 @@ RSpec.describe API::VulnerabilityIssueLinks do
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
end
end
it
'gets the list of vulnerabilities'
do
shared_examples
"responds with list of only visible issue links"
do
it
'gets the list of visible issue links'
,
:aggregate_failures
do
get_issue_links
get_issue_links
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
...
@@ -34,6 +35,41 @@ RSpec.describe API::VulnerabilityIssueLinks do
...
@@ -34,6 +35,41 @@ RSpec.describe API::VulnerabilityIssueLinks do
match_array
(
vulnerability
.
issue_links
.
map
(
&
:id
)))
match_array
(
vulnerability
.
issue_links
.
map
(
&
:id
)))
expect
(
json_response
.
map
{
|
link
|
link
[
'vulnerability_link_type'
]
}).
to
all
eq
'related'
expect
(
json_response
.
map
{
|
link
|
link
[
'vulnerability_link_type'
]
}).
to
all
eq
'related'
end
end
end
context
'when linked issue is not confidential and available for the user'
do
include_examples
'responds with list of only visible issue links'
end
context
'when there is an additional confidential issue linked'
do
let_it_be
(
:public_project
)
{
create
(
:project
,
:public
)
}
let_it_be
(
:confidential_issue
)
{
create
(
:issue
,
:confidential
,
project:
public_project
)
}
let_it_be
(
:confidential_issue_link
)
{
create
(
:vulnerabilities_issue_link
,
vulnerability:
vulnerability
,
issue:
confidential_issue
)
}
include_examples
'responds with list of only visible issue links'
it
'does not return confidential issue in the response'
do
get_issue_links
expect
(
json_response
.
map
{
|
link
|
link
[
'id'
]
}).
not_to
include
(
confidential_issue
.
id
)
expect
(
json_response
.
map
{
|
link
|
link
[
'vulnerability_link_id'
]
}).
not_to
include
(
confidential_issue_link
.
id
)
end
end
context
'when link is created to issue in the inaccessible project'
do
let_it_be
(
:private_project
)
{
create
(
:project
,
:private
)
}
let_it_be
(
:private_issue
)
{
create
(
:issue
,
:confidential
,
project:
private_project
)
}
let_it_be
(
:private_issue_link
)
{
create
(
:vulnerabilities_issue_link
,
vulnerability:
vulnerability
,
issue:
private_issue
)
}
include_examples
'responds with list of only visible issue links'
it
'does not return issue from inaccessible project'
do
get_issue_links
expect
(
json_response
.
map
{
|
link
|
link
[
'id'
]
}).
not_to
include
(
private_issue
.
id
)
expect
(
json_response
.
map
{
|
link
|
link
[
'vulnerability_link_id'
]
}).
not_to
include
(
private_issue_link
.
id
)
end
end
it_behaves_like
'responds with "not found" for an unknown vulnerability ID'
it_behaves_like
'responds with "not found" for an unknown vulnerability ID'
...
@@ -81,7 +117,7 @@ RSpec.describe API::VulnerabilityIssueLinks do
...
@@ -81,7 +117,7 @@ RSpec.describe API::VulnerabilityIssueLinks do
end
end
end
end
context
'w
ith valid target_project_id and target_issue_iid params
'
do
context
'w
hen issue is from different project
'
do
let_it_be
(
:other_issue
)
{
create
(
:issue
)
}
let_it_be
(
:other_issue
)
{
create
(
:issue
)
}
let
(
:target_project_id
)
{
other_issue
.
project_id
}
let
(
:target_project_id
)
{
other_issue
.
project_id
}
...
...
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