Merge branch 'filetype-recognition' into 'develop'

Use headers for file content type recognition.

See merge request pleroma/pleroma!14
This commit is contained in:
lambda 2017-11-12 09:27:59 +00:00
commit 87dee3902a
1 changed files with 32 additions and 3 deletions

View File

@ -9,9 +9,8 @@ def store(%Plug.Upload{} = file) do
File.cp!(file.path, result_file) File.cp!(file.path, result_file)
# fix content type on some image uploads # fix content type on some image uploads
matches = Regex.named_captures(~r/\.(?<ext>(jpg|jpeg|png|gif))$/i, file.filename) content_type = if file.content_type == "application/octet-stream" do
content_type = if file.content_type == "application/octet-stream" and matches do get_content_type(file.path)
if matches["ext"] == "jpg", do: "image/jpeg", else: "image/#{matches["ext"]}"
else else
file.content_type file.content_type
end end
@ -61,4 +60,34 @@ defp upload_path do
defp url_for(file) do defp url_for(file) do
"#{Web.base_url()}/media/#{file}" "#{Web.base_url()}/media/#{file}"
end end
def get_content_type(file) do
match = File.open(file, [:read], fn(f) ->
case IO.binread(f, 8) do
<<0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a>> ->
"image/png"
<<0x47, 0x49, 0x46, 0x38, _, 0x61, _, _>> ->
"image/gif"
<<0xff, 0xd8, 0xff, _, _, _, _, _>> ->
"image/jpeg"
<<0x1a, 0x45, 0xdf, 0xa3, _, _, _, _>> ->
"video/webm"
<<0x00, 0x00, 0x00, _, 0x66, 0x74, 0x79, 0x70>> ->
"video/mp4"
<<0x49, 0x44, 0x33, _, _, _, _, _>> ->
"audio/mpeg"
<<0x4f, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00>> ->
"audio/ogg"
<<0x52, 0x49, 0x46, 0x46, _, _, _, _>> ->
"audio/wav"
_ ->
"application/octet-stream"
end
end)
case match do
{:ok, type} -> type
_e -> "application/octet-stream"
end
end
end end