Soper
/
sugoi
forked from gitbot/uguu
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

saner code

testing
nokonoko 2021-06-22 13:25:57 +02:00
parent 74d3554fa6
commit 48233fb137
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
static/php/classes/UploadedFile.class.php
View File

@ -4,7 +4,6 @@ class UploadedFile
{
/* Public attributes */
public $name;
public $mime;
public $size;
public $tempfile;
public $error;
@ -29,4 +28,48 @@ class UploadedFile
return $this->sha1;
}
/**
* MIME-type
*
* @var string
*/
private $mime;
/**
* Fetches the MIME type of the file
*
* @return string|false $mime
*/
public function getMime(){
if (!$this->mime) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$this->mime = finfo_file($finfo, $file->tempfile);
finfo_close($finfo);
}
return $this->mime;
}
/**
* Extension of file
*
* @var string
*/
private $ext;
/**
* Fetches the extension of the file
*
* @return string|false $ext
*/
public function getExt(){
if (!$this->ext) {
$this->ext = pathinfo($file->name, PATHINFO_EXTENSION);
}
return $this->ext;
}
}

11
static/php/upload.php
View File

@ -24,12 +24,8 @@ function generateName($file)
// We start at N retries, and --N until we give up
$tries = UGUU_FILES_RETRIES;
$length = UGUU_FILES_LENGTH;
//Get EXT
$ext = pathinfo($file->name, PATHINFO_EXTENSION);
//Get mime
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$type_mime = finfo_file($finfo, $file->tempfile);
finfo_close($finfo);
$ext = $file->getExt();
// Check if extension is a double-dot extension and, if true, override $ext
$revname = strrev($file->name);
@ -61,7 +57,7 @@ function generateName($file)
}
//Check if mime is blacklisted
if (in_array($type_mime, unserialize(CONFIG_BLOCKED_MIME))) {
if (in_array($file->getMime(), unserialize(CONFIG_BLOCKED_MIME))) {
http_response_code(415);
throw new Exception ('Extension type not allowed.');
exit(0);
@ -208,7 +204,6 @@ function refiles($files)
foreach ($files as $file) {
$f = new UploadedFile();
$f->name = $file['name'];
$f->mime = $file['type'];
$f->size = $file['size'];
$f->tempfile = $file['tmp_name'];
$f->error = $file['error'];