tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8481 from annando/mimetype

Browse source 
Improved Mime Type detection
This commit is contained in:
Hypolite Petovan 2020-04-01 07:27:42 -04:00 committed by GitHub
commit 0584667d13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 89 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/api.php
View file

@ -4734,13 +4734,8 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
}
}
if ($filetype == "") {
$filetype = Images::guessType($filename);
}
$imagedata = @getimagesize($src);
if ($imagedata) {
$filetype = $imagedata['mime'];
}
$filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
Logger::log(
"File upload src: " . $src . " - filename: " . $filename .
" - size: " . $filesize . " - type: " . $filetype,

4
mod/photos.php
View file

@ -706,9 +706,7 @@ function photos_post(App $a)
return;
}
if ($type == "") {
$type = Images::guessType($filename);
}
$type = Images::getMimeTypeBySource($src, $filename, $type);
Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);

18
mod/wall_upload.php
View file

@ -174,23 +174,7 @@ function wall_upload_post(App $a, $desktopmode = true)
exit();
}
// This is a special treatment for picture upload from Twidere
if (($filename == "octet-stream") && ($filetype != "")) {
$filename = $filetype;
$filetype = "";
}
if ($filetype == "") {
$filetype = Images::guessType($filename);
}
// If there is a temp name, then do a manual check
// This is more reliable than the provided value
$imagedata = getimagesize($src);
if ($imagedata) {
$filetype = $imagedata['mime'];
}
$filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
Logger::log("File upload src: " . $src . " - filename: " . $filename .
" - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG);

15
src/Content/Text/BBCode.php
View file

@ -453,6 +453,10 @@ class BBCode
{
$s = $srctext;
// Simplify image links
$s = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $s);
$s = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $s);
$matches = null;
$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER);
if ($c) {
@ -464,13 +468,14 @@ class BBCode
continue;
}
$i = Network::fetchUrl($mtch[1]);
if (!$i) {
return $srctext;
$curlResult = Network::curl($mtch[1], true);
if (!$curlResult->isSuccess()) {
continue;
}
// guess mimetype from headers or filename
$type = Images::guessType($mtch[1], true);
$i = $curlResult->getBody();
$type = $curlResult->getContentType();
$type = Images::getMimeTypeByData($i, $mtch[1], $type);
if ($i) {
$Image = new Image($i, $type);

4
src/Model/Photo.php
View file

@ -432,9 +432,7 @@ class Photo
return false;
}
if (empty($type)) {
$type = Images::guessType($image_url, true);
}
$type = Images::getMimeTypeByData($img_str, $image_url, $type);
$Image = new Image($img_str, $type);
if ($Image->isValid()) {

13
src/Model/User.php
View file

@ -839,9 +839,16 @@ class User
$photo_failure = false;
$filename = basename($photo);
$img_str = Network::fetchUrl($photo, true);
// guess mimetype from headers or filename
$type = Images::guessType($photo, true);
$curlResult = Network::curl($photo, true);
if ($curlResult->isSuccess()) {
$img_str = $curlResult->getBody();
$type = $curlResult->getContentType();
} else {
$img_str = '';
$type = '';
}
$type = Images::getMimeTypeByData($img_str, $photo, $type);
$Image = new Image($img_str, $type);
if ($Image->isValid()) {

5
src/Module/Settings/Profile/Photo/Index.php
View file

@ -52,9 +52,8 @@ class Index extends BaseSettings
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
$filetype = $_FILES['userfile']['type'];
if ($filetype == '') {
$filetype = Images::guessType($filename);
}
$filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
$maximagesize = DI::config()->get('system', 'maximagesize', 0);

16
src/Object/Image.php
View file

@ -708,22 +708,6 @@ class Image
return Images::getFormatsMap();
}
/**
* Guess image mimetype from filename or from Content-Type header
*
* @param string $filename Image filename
* @param boolean $fromcurl Check Content-Type header from curl request
* @param string $header passed headers to take into account
*
* @return string|null
* @throws Exception
* @deprecated in version 2019.12 please use Util\Images::guessType() instead.
*/
public static function guessType($filename, $fromcurl = false, $header = '')
{
return Images::guessType($filename, $fromcurl, $header);
}
/**
* @param string $url url
* @return array

107
src/Util/Images.php
View file

@ -24,7 +24,6 @@ namespace Friendica\Util;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\DI;
use Imagick;
/**
* Image utilities
@ -74,61 +73,79 @@ class Images
}
/**
* Guess image mimetype from filename or from Content-Type header
* Fetch image mimetype from the image data or guessing from the file name
*
* @param string $filename Image filename
* @param boolean $fromcurl Check Content-Type header from curl request
* @param string $header passed headers to take into account
* @param string $image_data Image data
* @param string $filename File name (for guessing the type via the extension)
* @param string $mime default mime type
*
* @return string|null
* @return string
* @throws \Exception
*/
public static function guessType($filename, $fromcurl = false, $header = '')
public static function getMimeTypeByData(string $image_data, string $filename = '', string $mime = '')
{
Logger::info('Image: guessType: ' . $filename . ($fromcurl ? ' from curl headers' : ''));
$type = null;
if ($fromcurl) {
$headers = [];
$h = explode("\n", $header);
foreach ($h as $l) {
$data = array_map("trim", explode(":", trim($l), 2));
if (count($data) > 1) {
list($k, $v) = $data;
$headers[$k] = $v;
}
}
if (array_key_exists('Content-Type', $headers)) {
$type = $headers['Content-Type'];
}
if (substr($mime, 0, 6) == 'image/') {
Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mime]);
return $mime;
}
if (is_null($type)) {
// Guessing from extension? Isn't that... dangerous?
if (class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
/**
* Well, this not much better,
* but at least it comes from the data inside the image,
* we won't be tricked by a manipulated extension
*/
$image = new Imagick($filename);
$type = $image->getImageMimeType();
} else {
$ext = pathinfo($filename, PATHINFO_EXTENSION);
$types = self::supportedTypes();
$type = 'image/jpeg';
foreach ($types as $m => $e) {
if ($ext == $e) {
$type = $m;
}
}
}
$image = @getimagesizefromstring($image_data);
if (!empty($image['mime'])) {
Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mime, 'mime' => $image['mime']]);
return $image['mime'];
}
Logger::info('Image: guessType: type=' . $type);
return $type;
return self::guessTypeByExtension($filename);
}
/**
* Fetch image mimetype from the image data or guessing from the file name
*
* @param string $sourcefile Source file of the image
* @param string $filename File name (for guessing the type via the extension)
* @param string $mime default mime type
*
* @return string
* @throws \Exception
*/
public static function getMimeTypeBySource(string $sourcefile, string $filename = '', string $mime = '')
{
if (substr($mime, 0, 6) == 'image/') {
Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mime]);
return $mime;
}
$image = @getimagesize($sourcefile);
if (!empty($image['mime'])) {
Logger::info('Mime type detected via file', ['filename' => $filename, 'default' => $mime, 'image' => $image]);
return $image['mime'];
}
return self::guessTypeByExtension($filename);
}
/**
* Guess image mimetype from the filename
*
* @param string $filename Image filename
*
* @return string
* @throws \Exception
*/
public static function guessTypeByExtension(string $filename)
{
$ext = pathinfo(parse_url($filename, PHP_URL_PATH), PATHINFO_EXTENSION);
$types = self::supportedTypes();
$type = 'image/jpeg';
foreach ($types as $m => $e) {
if ($ext == $e) {
$type = $m;
}
}
Logger::info('Mime type guessed via extension', ['filename' => $filename, 'type' => $type]);
return $type;
}
/**
* @param string $url