From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 7 Jun 2011 05:36:24 +0000 (-0500)
Subject: Fixing check_filetype...
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=eb21f9a6cb24adeeea10e26442f92a968a38c53e;p=mediagoblin.git

Fixing check_filetype...

We need to check the first part of the guess_type returned tuple, and
also this try: except: doesn't belong here, so killing.
---

diff --git a/mediagoblin/submit/security.py b/mediagoblin/submit/security.py
index 5a06a499..b2cb6d88 100644
--- a/mediagoblin/submit/security.py
+++ b/mediagoblin/submit/security.py
@@ -16,19 +16,11 @@
 
 from mimetypes import guess_type
 
-from Image import open as image_open
 
 ALLOWED = ['image/jpeg', 'image/png', 'image/tiff', 'image/gif']
 
 def check_filetype(posted_file):
-    if not guess_type(posted_file.filename) in ALLOWED:
-        return False
-
-    # TODO: This should be handled by the processing stage.  We should
-    # handle error detection there.
-    try:
-        image = image_open(posted_file.file)
-    except IOError:
+    if not guess_type(posted_file.filename)[0] in ALLOWED:
         return False
 
     return True