stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-20 20:49:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Smash multiple extensions down into a single one when accepting file

Browse Source 
uploads.  Fixes #1872.
This commit is contained in:
Bharat Mediratta
2012-05-17 20:25:27 -07:00
parent 931da5f2ff
commit 9e2ea2ffed
6 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gallery/controllers/uploader.php
View File

@@ -63,6 +63,10 @@ class Uploader_Controller extends Controller {
$item->parent_id = $album->id;
$item->set_data_file($temp_filename);
// Remove double extensions from the filename - they'll be disallowed in the model but if
// we don't do it here then it'll result in a failed upload.
$item->name = legal_file::smash_extensions($item->name);
$path_info = @pathinfo($temp_filename);
if (array_key_exists("extension", $path_info) &&
in_array(strtolower($path_info["extension"]), array("flv", "mp4", "m4v"))) {

16
modules/gallery/helpers/legal_file.php
View File

@@ -92,4 +92,20 @@ class legal_file_Core {
return preg_replace("/\.[^\.]*?$/", ".{$new_ext}", $filename);
}
}
/**
* Reduce the given file to having a single extension.
*/
static function smash_extensions($filename) {
$parts = pathinfo($filename);
$result = "";
if ($parts["dirname"] != ".") {
$result .= $parts["dirname"] . "/";
}
$parts["filename"] = str_replace(".", "_", $parts["filename"]);
$parts["filename"] = preg_replace("/[_]+/", "_", $parts["filename"]);
$parts["filename"] = trim($parts["filename"], "_");
$result .= "{$parts['filename']}.{$parts['extension']}";
return $result;
}
}

10
modules/gallery/models/item.php
View File

@@ -797,11 +797,19 @@ class Item_Model_Core extends ORM_MPTT {
if (strpos($this->name, "/") !== false) {
$v->add_error("name", "no_slashes");
return;
} else if (rtrim($this->name, ".") !== $this->name) {
}
if (rtrim($this->name, ".") !== $this->name) {
$v->add_error("name", "no_trailing_period");
return;
}
// Do not accept files with double extensions, they can cause problems on some
// versions of Apache.
if (substr_count($this->name, ".") > 1) {
$v->add_error("name", "illegal_data_file_extension");
}
if ($this->is_movie() || $this->is_photo()) {
$ext = pathinfo($this->name, PATHINFO_EXTENSION);

3
modules/gallery/tests/Item_Model_Test.php
View File

@@ -490,7 +490,8 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
}
public function illegal_extension_test() {
foreach (array("test.php", "test.PHP", "test.php5", "test.php4", "test.pl") as $name) {
foreach (array("test.php", "test.PHP", "test.php5", "test.php4",
"test.pl", "test.php.png") as $name) {
try {
$photo = test::random_photo_unsaved(item::root());
$photo->name = $name;

10
modules/gallery/tests/Legal_File_Helper_Test.php
View File

@@ -35,4 +35,14 @@ class Legal_File_Helper_Test extends Gallery_Unit_Test_Case {
"/website/foo.com/VID_20120513_105421.jpg",
legal_file::change_extension("/website/foo.com/VID_20120513_105421.mp4", "jpg"));
}
public function smash_extensions_test() {
$this->assert_equal("foo_bar.jpg", legal_file::smash_extensions("foo.bar.jpg"));
$this->assert_equal("foo_bar_baz.jpg", legal_file::smash_extensions("foo.bar.baz.jpg"));
$this->assert_equal("foo_bar_baz.jpg", legal_file::smash_extensions("foo.bar.baz.jpg"));
$this->assert_equal("foo_bar_baz.jpg", legal_file::smash_extensions("...foo...bar..baz...jpg"));
$this->assert_equal("/path/to/foo_bar.jpg", legal_file::smash_extensions("/path/to/foo.bar.jpg"));
$this->assert_equal("/path/to.to/foo_bar.jpg", legal_file::smash_extensions("/path/to.to/foo.bar.jpg"));
$this->assert_equal("foo_bar-12345678.jpg", legal_file::smash_extensions("foo.bar-12345678.jpg"));
}
}

1
modules/watermark/controllers/admin_watermarks.php
View File

@@ -98,6 +98,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
$pathinfo = pathinfo($file);
// Forge prefixes files with "uploadfile-xxxxxxx" for uniqueness
$name = preg_replace("/uploadfile-[^-]+-(.*)/", '$1', $pathinfo["basename"]);
$name = legal_file::smash_extensions($name);
if (!($image_info = getimagesize($file)) ||
!in_array($image_info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG))) {