aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit/security.py
diff options
context:
space:
mode:
authorBrett Smith <brettcsmith@brettcsmith.org>2012-03-26 14:10:22 -0400
committerBrett Smith <brettcsmith@brettcsmith.org>2012-03-26 14:10:22 -0400
commitc16b8196631e5b1c4cbe618a9af74f5455fe861c (patch)
tree5a94548275636849dd8c771de6b5fe854c0f2098 /mediagoblin/submit/security.py
parent28f364bd6d488955952aebe86033e5ba148da2fb (diff)
parent7ccf41818581743c2e16935cd7308ad3d6694149 (diff)
downloadmediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.lz
mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.tar.xz
mediagoblin-c16b8196631e5b1c4cbe618a9af74f5455fe861c.zip
Merge remote branch 'origin/master' into bug261-resized-filenames
This merge involved moving the new FilenameBuilder class to processing/__init__.py, and putting the comment deletion tests back into test_submission.py using the refactored functions.
Diffstat (limited to 'mediagoblin/submit/security.py')
-rw-r--r--mediagoblin/submit/security.py26
1 files changed, 0 insertions, 26 deletions
diff --git a/mediagoblin/submit/security.py b/mediagoblin/submit/security.py
deleted file mode 100644
index 5dbc0db4..00000000
--- a/mediagoblin/submit/security.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-from mimetypes import guess_type
-
-ALLOWED = ['image/jpeg', 'image/png', 'image/tiff', 'image/gif']
-
-
-def check_filetype(posted_file):
- if not guess_type(posted_file.filename)[0] in ALLOWED:
- return False
-
- return True