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
5f0f7718
Commit
5f0f7718
authored
Dec 03, 2020
by
Saikat Sarkar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass the 'raw' URL instead of 'blob' URL in revocation api call
parent
446c5ec8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
67 additions
and
11 deletions
+67
-11
ee/app/presenters/vulnerability_presenter.rb
ee/app/presenters/vulnerability_presenter.rb
+29
-10
ee/app/workers/scan_security_report_secrets_worker.rb
ee/app/workers/scan_security_report_secrets_worker.rb
+1
-1
ee/changelogs/unreleased/raw_url.yml
ee/changelogs/unreleased/raw_url.yml
+5
-0
ee/spec/presenters/vulnerability_presenter_spec.rb
ee/spec/presenters/vulnerability_presenter_spec.rb
+31
-0
ee/spec/workers/scan_security_report_secrets_worker_spec.rb
ee/spec/workers/scan_security_report_secrets_worker_spec.rb
+1
-0
No files found.
ee/app/presenters/vulnerability_presenter.rb
View file @
5f0f7718
...
@@ -17,23 +17,24 @@ class VulnerabilityPresenter < Gitlab::View::Presenter::Delegated
...
@@ -17,23 +17,24 @@ class VulnerabilityPresenter < Gitlab::View::Presenter::Delegated
"
#{
file
}
:
#{
line
}
"
"
#{
file
}
:
#{
line
}
"
end
end
def
location_link
def
location_link_with_raw_path
return
location_text
unless
blob_path
location_link_for
(
raw_path
)
end
"
#{
root_url
}#{
blob_path
}
"
def
location_link
location_link_for
(
blob_path
)
end
end
def
blob
_path
def
raw
_path
return
unless
file
return
unless
file
branch
=
finding
.
pipelines
&
.
last
&
.
sha
||
project
.
default_branch
path_with_line_number
(
project_raw_path
(
vulnerability
.
project
,
File
.
join
(
pipeline_branch
,
file
)))
path
=
project_blob_path
(
vulnerability
.
project
,
File
.
join
(
branch
,
file
))
end
return
unless
path
path
=
path
.
gsub
(
/^\//
,
''
)
def
blob_path
return
unless
file
add_line_numbers
(
path
,
finding
.
location
[
'start_line'
],
finding
.
location
[
'end_line'
]
)
path_with_line_number
(
project_blob_path
(
vulnerability
.
project
,
File
.
join
(
pipeline_branch
,
file
))
)
end
end
def
scanner
def
scanner
...
@@ -46,6 +47,24 @@ class VulnerabilityPresenter < Gitlab::View::Presenter::Delegated
...
@@ -46,6 +47,24 @@ class VulnerabilityPresenter < Gitlab::View::Presenter::Delegated
private
private
def
location_link_for
(
path
)
return
location_text
unless
path
"
#{
root_url
}#{
path
}
"
end
def
pipeline_branch
finding
.
pipelines
&
.
last
&
.
sha
||
project
.
default_branch
end
def
path_with_line_number
(
path
)
return
unless
path
path
=
path
.
gsub
(
/^\//
,
''
)
add_line_numbers
(
path
,
finding
.
location
[
'start_line'
],
finding
.
location
[
'end_line'
])
end
def
root_url
def
root_url
Gitlab
::
Routing
.
url_helpers
.
root_url
Gitlab
::
Routing
.
url_helpers
.
root_url
end
end
...
...
ee/app/workers/scan_security_report_secrets_worker.rb
View file @
5f0f7718
...
@@ -37,7 +37,7 @@ class ScanSecurityReportSecretsWorker # rubocop:disable Scalability/IdempotentWo
...
@@ -37,7 +37,7 @@ class ScanSecurityReportSecretsWorker # rubocop:disable Scalability/IdempotentWo
{
{
type:
revocation_type
(
vulnerability_finding
),
type:
revocation_type
(
vulnerability_finding
),
token:
vulnerability_finding
.
metadata
[
'raw_source_code_extract'
],
token:
vulnerability_finding
.
metadata
[
'raw_source_code_extract'
],
location:
vulnerability_finding
.
vulnerability
.
present
.
location_link
location:
vulnerability_finding
.
vulnerability
.
present
.
location_link
_with_raw_path
}
}
end
end
end
end
...
...
ee/changelogs/unreleased/raw_url.yml
0 → 100644
View file @
5f0f7718
---
title
:
Pass the 'raw' URL instead of 'blob' URL in revocation api call
merge_request
:
49170
author
:
type
:
added
ee/spec/presenters/vulnerability_presenter_spec.rb
0 → 100644
View file @
5f0f7718
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
VulnerabilityPresenter
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
:success
,
project:
project
)
}
let
(
:finding
)
{
create
(
:vulnerabilities_finding
,
:with_secret_detection
,
pipelines:
[
pipeline
],
project:
project
)
}
subject
{
described_class
.
new
(
finding
.
vulnerability
)
}
describe
'#location_link_with_raw_path'
do
it
'returns the location link in raw format'
do
path
=
subject
.
location_link_with_raw_path
expect
(
path
).
to
include
(
'raw'
)
expect
(
path
).
to
include
(
finding
.
file
)
expect
(
path
).
to
include
(
"#L
#{
finding
.
location
[
'start_line'
]
}
"
)
end
end
describe
'#location_link'
do
it
'returns the location link in blob format'
do
path
=
subject
.
location_link
expect
(
path
).
to
include
(
'blob'
)
expect
(
path
).
to
include
(
finding
.
file
)
expect
(
path
).
to
include
(
"#L
#{
finding
.
location
[
'start_line'
]
}
"
)
end
end
end
ee/spec/workers/scan_security_report_secrets_worker_spec.rb
View file @
5f0f7718
...
@@ -66,6 +66,7 @@ RSpec.describe ScanSecurityReportSecretsWorker do
...
@@ -66,6 +66,7 @@ RSpec.describe ScanSecurityReportSecretsWorker do
expect
(
key
[
:type
]).
to
eql
(
revocation_key_type
)
expect
(
key
[
:type
]).
to
eql
(
revocation_key_type
)
expect
(
key
[
:token
]).
to
eql
(
api_key
)
expect
(
key
[
:token
]).
to
eql
(
api_key
)
expect
(
key
[
:location
]).
to
include
(
file
)
expect
(
key
[
:location
]).
to
include
(
file
)
expect
(
key
[
:location
]).
to
include
(
'raw'
)
end
end
end
end
end
end
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