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
40887a94
Commit
40887a94
authored
Jan 10, 2019
by
Francisco Javier López
Committed by
Nick Thomas
Jan 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix files/blob api endpoint content disposition
parent
0bbdbd55
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
19 deletions
+34
-19
changelogs/unreleased/fj-55882-fix-files-api-content-disposition.yml
...unreleased/fj-55882-fix-files-api-content-disposition.yml
+5
-0
lib/api/helpers.rb
lib/api/helpers.rb
+5
-1
spec/lib/api/helpers_spec.rb
spec/lib/api/helpers_spec.rb
+18
-14
spec/requests/api/files_spec.rb
spec/requests/api/files_spec.rb
+3
-2
spec/requests/api/repositories_spec.rb
spec/requests/api/repositories_spec.rb
+3
-2
No files found.
changelogs/unreleased/fj-55882-fix-files-api-content-disposition.yml
0 → 100644
View file @
40887a94
---
title
:
Fix files/blob api endpoints content disposition
merge_request
:
24267
author
:
type
:
fixed
lib/api/helpers.rb
View file @
40887a94
...
@@ -496,7 +496,11 @@ module API
...
@@ -496,7 +496,11 @@ module API
def
send_git_blob
(
repository
,
blob
)
def
send_git_blob
(
repository
,
blob
)
env
[
'api.format'
]
=
:txt
env
[
'api.format'
]
=
:txt
content_type
'text/plain'
content_type
'text/plain'
header
[
'Content-Disposition'
]
=
content_disposition
(
'attachment'
,
blob
.
name
)
header
[
'Content-Disposition'
]
=
content_disposition
(
'inline'
,
blob
.
name
)
# Let Workhorse examine the content and determine the better content disposition
header
[
Gitlab
::
Workhorse
::
DETECT_HEADER
]
=
"true"
header
(
*
Gitlab
::
Workhorse
.
send_git_blob
(
repository
,
blob
))
header
(
*
Gitlab
::
Workhorse
.
send_git_blob
(
repository
,
blob
))
end
end
...
...
spec/lib/api/helpers_spec.rb
View file @
40887a94
...
@@ -150,7 +150,6 @@ describe API::Helpers do
...
@@ -150,7 +150,6 @@ describe API::Helpers do
end
end
describe
'#send_git_blob'
do
describe
'#send_git_blob'
do
context
'content disposition'
do
let
(
:repository
)
{
double
}
let
(
:repository
)
{
double
}
let
(
:blob
)
{
double
(
name:
'foobar'
)
}
let
(
:blob
)
{
double
(
name:
'foobar'
)
}
...
@@ -165,17 +164,22 @@ describe API::Helpers do
...
@@ -165,17 +164,22 @@ describe API::Helpers do
allow
(
Gitlab
::
Workhorse
).
to
receive
(
:send_git_blob
)
allow
(
Gitlab
::
Workhorse
).
to
receive
(
:send_git_blob
)
end
end
it
'sets Gitlab::Workhorse::DETECT_HEADER header'
do
expect
(
send_git_blob
[
Gitlab
::
Workhorse
::
DETECT_HEADER
]).
to
eq
"true"
end
context
'content disposition'
do
context
'when blob name is null'
do
context
'when blob name is null'
do
let
(
:blob
)
{
double
(
name:
nil
)
}
let
(
:blob
)
{
double
(
name:
nil
)
}
it
'returns only the disposition'
do
it
'returns only the disposition'
do
expect
(
send_git_blob
[
'Content-Disposition'
]).
to
eq
'
attachment
'
expect
(
send_git_blob
[
'Content-Disposition'
]).
to
eq
'
inline
'
end
end
end
end
context
'when blob name is not null'
do
context
'when blob name is not null'
do
it
'returns disposition with the blob name'
do
it
'returns disposition with the blob name'
do
expect
(
send_git_blob
[
'Content-Disposition'
]).
to
eq
'
attachment
; filename="foobar"'
expect
(
send_git_blob
[
'Content-Disposition'
]).
to
eq
'
inline
; filename="foobar"'
end
end
end
end
end
end
...
...
spec/requests/api/files_spec.rb
View file @
40887a94
...
@@ -183,14 +183,15 @@ describe API::Files do
...
@@ -183,14 +183,15 @@ describe API::Files do
get
api
(
url
,
current_user
),
params:
params
get
api
(
url
,
current_user
),
params:
params
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
headers
[
Gitlab
::
Workhorse
::
DETECT_HEADER
]).
to
eq
"true"
end
end
it
'
forces attachment content disposition
'
do
it
'
sets inline content disposition by default
'
do
url
=
route
(
file_path
)
+
"/raw"
url
=
route
(
file_path
)
+
"/raw"
get
api
(
url
,
current_user
),
params:
params
get
api
(
url
,
current_user
),
params:
params
expect
(
headers
[
'Content-Disposition'
]).
to
eq
(
'
attachment
; filename="popen.rb"'
)
expect
(
headers
[
'Content-Disposition'
]).
to
eq
(
'
inline
; filename="popen.rb"'
)
end
end
context
'when mandatory params are not given'
do
context
'when mandatory params are not given'
do
...
...
spec/requests/api/repositories_spec.rb
View file @
40887a94
...
@@ -166,12 +166,13 @@ describe API::Repositories do
...
@@ -166,12 +166,13 @@ describe API::Repositories do
get
api
(
route
,
current_user
)
get
api
(
route
,
current_user
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
headers
[
Gitlab
::
Workhorse
::
DETECT_HEADER
]).
to
eq
"true"
end
end
it
'
forces attachment content disposition
'
do
it
'
sets inline content disposition by default
'
do
get
api
(
route
,
current_user
)
get
api
(
route
,
current_user
)
expect
(
headers
[
'Content-Disposition'
]).
to
eq
'
attachment
'
expect
(
headers
[
'Content-Disposition'
]).
to
eq
'
inline
'
end
end
context
'when sha does not exist'
do
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