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
2cd47bba
Commit
2cd47bba
authored
Dec 31, 2018
by
Francisco Javier López
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed api content-disposition in blob and files endpoint
parent
77909a88
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
4 deletions
+47
-4
changelogs/unreleased/fj-55781-fix-api-blob-content-disposition.yml
.../unreleased/fj-55781-fix-api-blob-content-disposition.yml
+5
-0
lib/api/helpers.rb
lib/api/helpers.rb
+7
-1
scripts/prepare_build.sh
scripts/prepare_build.sh
+1
-1
spec/lib/api/helpers_spec.rb
spec/lib/api/helpers_spec.rb
+32
-0
spec/requests/api/files_spec.rb
spec/requests/api/files_spec.rb
+1
-1
spec/requests/api/repositories_spec.rb
spec/requests/api/repositories_spec.rb
+1
-1
No files found.
changelogs/unreleased/fj-55781-fix-api-blob-content-disposition.yml
0 → 100644
View file @
2cd47bba
---
title
:
Fix content-disposition in blobs and files API endpoint
merge_request
:
24078
author
:
type
:
fixed
lib/api/helpers.rb
View file @
2cd47bba
...
...
@@ -496,7 +496,7 @@ module API
def
send_git_blob
(
repository
,
blob
)
env
[
'api.format'
]
=
:txt
content_type
'text/plain'
header
[
'Content-Disposition'
]
=
"attachment; filename=
#{
blob
.
name
.
inspect
}
"
header
[
'Content-Disposition'
]
=
content_disposition
(
'attachment'
,
blob
.
name
)
header
(
*
Gitlab
::
Workhorse
.
send_git_blob
(
repository
,
blob
))
end
...
...
@@ -529,5 +529,11 @@ module API
params
[
:archived
]
end
def
content_disposition
(
disposition
,
filename
)
disposition
+=
%(; filename=#{filename.inspect})
if
filename
.
present?
disposition
end
end
end
scripts/prepare_build.sh
View file @
2cd47bba
...
...
@@ -10,7 +10,7 @@ fi
# Only install knapsack after bundle install! Otherwise oddly some native
# gems could not be found under some circumstance. No idea why, hours wasted.
retry gem
install
knapsack
--no-
ri
--no-rdoc
retry gem
install
knapsack
--no-
document
cp
config/gitlab.yml.example config/gitlab.yml
sed
-i
's/bin_path: \/usr\/bin\/git/bin_path: \/usr\/local\/bin\/git/'
config/gitlab.yml
...
...
spec/lib/api/helpers_spec.rb
View file @
2cd47bba
...
...
@@ -148,4 +148,36 @@ describe API::Helpers do
it_behaves_like
'user namespace finder'
end
describe
'#send_git_blob'
do
context
'content disposition'
do
let
(
:repository
)
{
double
}
let
(
:blob
)
{
double
(
name:
'foobar'
)
}
let
(
:send_git_blob
)
do
subject
.
send
(
:send_git_blob
,
repository
,
blob
)
end
before
do
allow
(
subject
).
to
receive
(
:env
).
and_return
({})
allow
(
subject
).
to
receive
(
:content_type
)
allow
(
subject
).
to
receive
(
:header
).
and_return
({})
allow
(
Gitlab
::
Workhorse
).
to
receive
(
:send_git_blob
)
end
context
'when blob name is null'
do
let
(
:blob
)
{
double
(
name:
nil
)
}
it
'returns only the disposition'
do
expect
(
send_git_blob
[
'Content-Disposition'
]).
to
eq
'attachment'
end
end
context
'when blob name is not null'
do
it
'returns disposition with the blob name'
do
expect
(
send_git_blob
[
'Content-Disposition'
]).
to
eq
'attachment; filename="foobar"'
end
end
end
end
end
spec/requests/api/files_spec.rb
View file @
2cd47bba
...
...
@@ -190,7 +190,7 @@ describe API::Files do
get
api
(
url
,
current_user
),
params:
params
expect
(
headers
[
'Content-Disposition'
]).
to
match
(
/^attachment/
)
expect
(
headers
[
'Content-Disposition'
]).
to
eq
(
'attachment; filename="popen.rb"'
)
end
context
'when mandatory params are not given'
do
...
...
spec/requests/api/repositories_spec.rb
View file @
2cd47bba
...
...
@@ -171,7 +171,7 @@ describe API::Repositories do
it
'forces attachment content disposition'
do
get
api
(
route
,
current_user
)
expect
(
headers
[
'Content-Disposition'
]).
to
match
(
/^attachment/
)
expect
(
headers
[
'Content-Disposition'
]).
to
eq
'attachment'
end
context
'when sha does not exist'
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