From 02fa02f979a3bd03c15539b8834de47e2488089a Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Wed, 9 Oct 2013 01:17:25 +0200
Subject: [PATCH] Better error checking; MIME type safety

---
 src/Controllers/PostController.php | 31 +++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php
index b11a9001..58dd493e 100644
--- a/src/Controllers/PostController.php
+++ b/src/Controllers/PostController.php
@@ -87,8 +87,33 @@ class PostController
 				throw new SimpleException('No tags set');
 
 			$suppliedFile = $_FILES['file'];
+			switch ($suppliedFile['error'])
+			{
+				case UPLOAD_ERR_OK:
+					break;
+				case UPLOAD_ERR_INI_SIZE:
+					throw new SimpleException('File is too big (maximum size allowed: ' . ini_get('upload_max_filesize') . ')');
+				case UPLOAD_ERR_FORM_SIZE:
+					throw new SimpleException('File is too big than it was allowed in HTML form');
+				case UPLOAD_ERR_PARTIAL:
+					throw new SimpleException('File transfer was interrupted');
+				case UPLOAD_ERR_NO_FILE:
+					throw new SimpleException('No file was uploaded');
+				case UPLOAD_ERR_NO_TMP_DIR:
+					throw new SimpleException('Server misconfiguration error: missing temporary folder');
+				case UPLOAD_ERR_CANT_WRITE:
+					throw new SimpleException('Server misconfiguration error: cannot write to disk');
+				case UPLOAD_ERR_EXTENSION:
+					throw new SimpleException('Server misconfiguration error: upload was canceled by an extension');
+				default:
+					throw new SimpleException('Generic file upload error (id: ' . $suppliedFile['error'] . ')');
+			}
+			if (!is_uploaded_file($suppliedFile['tmp_name']))
+				throw new SimpleException('Generic file upload error');
 
-			switch ($suppliedFile['type'])
+			#$mimeType = $suppliedFile['type'];
+			$mimeType = mime_content_type($suppliedFile['tmp_name']);
+			switch ($mimeType)
 			{
 				case 'image/gif':
 				case 'image/png':
@@ -99,7 +124,7 @@ class PostController
 					$postType = PostType::Flash;
 					break;
 				default:
-					throw new SimpleException('Invalid file type "' . $suppliedFile['type'] . '"');
+					throw new SimpleException('Invalid file type "' . $mimeType . '"');
 			}
 
 			//todo: find out duplicate files
@@ -127,7 +152,7 @@ class PostController
 			$dbPost = R::dispense('post');
 			$dbPost->type = $postType;
 			$dbPost->name = $name;
-			$dbPost->mime_type = $suppliedFile['type'];
+			$dbPost->mime_type = $mimeType;
 			$dbPost->safety = $suppliedSafety;
 			$dbPost->upload_date = time();
 			$dbPost->sharedTag = $dbTags;