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
Boxiang Sun
gitlab-ce
Commits
bc999d53
Commit
bc999d53
authored
Jul 18, 2018
by
Jan Provaznik
Committed by
Kamil Trzciński
Jul 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix filename for accelerated uploads
parent
29477fc2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
86 additions
and
18 deletions
+86
-18
app/uploaders/file_uploader.rb
app/uploaders/file_uploader.rb
+0
-4
changelogs/unreleased/fix-filename-for-direct-uploads.yml
changelogs/unreleased/fix-filename-for-direct-uploads.yml
+5
-0
lib/uploaded_file.rb
lib/uploaded_file.rb
+11
-1
spec/lib/uploaded_file_spec.rb
spec/lib/uploaded_file_spec.rb
+24
-13
spec/uploaders/file_uploader_spec.rb
spec/uploaders/file_uploader_spec.rb
+46
-0
No files found.
app/uploaders/file_uploader.rb
View file @
bc999d53
...
...
@@ -136,10 +136,6 @@ class FileUploader < GitlabUploader
}
end
def
filename
self
.
file
.
filename
end
def
upload
=
(
value
)
super
...
...
changelogs/unreleased/fix-filename-for-direct-uploads.yml
0 → 100644
View file @
bc999d53
---
title
:
Fix filename for accelerated uploads
merge_request
:
author
:
type
:
fixed
lib/uploaded_file.rb
View file @
bc999d53
...
...
@@ -21,7 +21,7 @@ class UploadedFile
raise
InvalidPathError
,
"
#{
path
}
file does not exist"
unless
::
File
.
exist?
(
path
)
@content_type
=
content_type
@original_filename
=
filename
||
::
File
.
basename
(
path
)
@original_filename
=
sanitize_filename
(
filename
||
path
)
@content_type
=
content_type
@sha256
=
sha256
@remote_id
=
remote_id
...
...
@@ -55,6 +55,16 @@ class UploadedFile
end
end
# copy-pasted from CarrierWave::SanitizedFile
def
sanitize_filename
(
name
)
name
=
name
.
tr
(
"
\\
"
,
"/"
)
# work-around for IE
name
=
::
File
.
basename
(
name
)
name
=
name
.
gsub
(
CarrierWave
::
SanitizedFile
.
sanitize_regexp
,
"_"
)
name
=
"_
#{
name
}
"
if
name
=~
/\A\.+\z/
name
=
"unnamed"
if
name
.
empty?
name
.
mb_chars
.
to_s
end
def
path
@tempfile
.
path
end
...
...
spec/lib/uploaded_file_spec.rb
View file @
bc999d53
require
'spec_helper'
describe
UploadedFile
do
describe
".from_params"
do
let
(
:temp_dir
)
{
Dir
.
tmpdir
}
let
(
:temp_file
)
{
Tempfile
.
new
(
"test"
,
temp_dir
)
}
let
(
:upload_path
)
{
nil
}
let
(
:temp_dir
)
{
Dir
.
tmpdir
}
let
(
:temp_file
)
{
Tempfile
.
new
(
"test"
,
temp_dir
)
}
subject
do
described_class
.
from_params
(
params
,
:file
,
upload_path
)
end
before
do
FileUtils
.
touch
(
temp_file
)
end
before
do
FileUtils
.
touch
(
temp_file
)
end
after
do
FileUtils
.
rm_f
(
temp_file
)
end
describe
".from_params"
do
let
(
:upload_path
)
{
nil
}
after
do
FileUtils
.
rm_f
(
temp_file
)
FileUtils
.
rm_r
(
upload_path
)
if
upload_path
end
subject
do
described_class
.
from_params
(
params
,
:file
,
upload_path
)
end
context
'when valid file is specified'
do
context
'only local path is specified'
do
let
(
:params
)
do
...
...
@@ -37,7 +41,7 @@ describe UploadedFile do
context
'all parameters are specified'
do
let
(
:params
)
do
{
'file.path'
=>
temp_file
.
path
,
'file.name'
=>
'
my_file
.txt'
,
'file.name'
=>
'
dir/my file&
.txt'
,
'file.type'
=>
'my/type'
,
'file.sha256'
=>
'sha256'
,
'file.remote_id'
=>
'remote_id'
}
...
...
@@ -48,7 +52,7 @@ describe UploadedFile do
end
it
"generates filename from path"
do
expect
(
subject
.
original_filename
).
to
eq
(
'my_file.txt'
)
expect
(
subject
.
original_filename
).
to
eq
(
'my_file
_
.txt'
)
expect
(
subject
.
content_type
).
to
eq
(
'my/type'
)
expect
(
subject
.
sha256
).
to
eq
(
'sha256'
)
expect
(
subject
.
remote_id
).
to
eq
(
'remote_id'
)
...
...
@@ -113,4 +117,11 @@ describe UploadedFile do
end
end
end
describe
'#sanitize_filename'
do
it
{
expect
(
described_class
.
new
(
temp_file
.
path
).
sanitize_filename
(
'spaced name'
)).
to
eq
(
'spaced_name'
)
}
it
{
expect
(
described_class
.
new
(
temp_file
.
path
).
sanitize_filename
(
'#$%^&'
)).
to
eq
(
'_____'
)
}
it
{
expect
(
described_class
.
new
(
temp_file
.
path
).
sanitize_filename
(
'..'
)).
to
eq
(
'_..'
)
}
it
{
expect
(
described_class
.
new
(
temp_file
.
path
).
sanitize_filename
(
''
)).
to
eq
(
'unnamed'
)
}
end
end
spec/uploaders/file_uploader_spec.rb
View file @
bc999d53
...
...
@@ -166,4 +166,50 @@ describe FileUploader do
uploader
.
upload
=
upload
end
end
describe
'#cache!'
do
subject
do
uploader
.
store!
(
uploaded_file
)
end
context
'when remote file is used'
do
let
(
:temp_file
)
{
Tempfile
.
new
(
"test"
)
}
let!
(
:fog_connection
)
do
stub_uploads_object_storage
(
described_class
)
end
let
(
:uploaded_file
)
do
UploadedFile
.
new
(
temp_file
.
path
,
filename:
"my file.txt"
,
remote_id:
"test/123123"
)
end
let!
(
:fog_file
)
do
fog_connection
.
directories
.
get
(
'uploads'
).
files
.
create
(
key:
'tmp/uploads/test/123123'
,
body:
'content'
)
end
before
do
FileUtils
.
touch
(
temp_file
)
end
after
do
FileUtils
.
rm_f
(
temp_file
)
end
it
'file is stored remotely in permament location with sanitized name'
do
subject
expect
(
uploader
).
to
be_exists
expect
(
uploader
).
not_to
be_cached
expect
(
uploader
).
not_to
be_file_storage
expect
(
uploader
.
path
).
not_to
be_nil
expect
(
uploader
.
path
).
not_to
include
(
'tmp/upload'
)
expect
(
uploader
.
path
).
not_to
include
(
'tmp/cache'
)
expect
(
uploader
.
url
).
to
include
(
'/my_file.txt'
)
expect
(
uploader
.
object_store
).
to
eq
(
described_class
::
Store
::
REMOTE
)
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