Job : check mimetyme and max upload

diff --git a/app/local_settings.py b/app/local_settings.py
index f78738b4e51ea0525fb66cf82a5ca33c8bd3b148..5692a793252e107a052f8bb295352a55e6c80af6 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -155,6 +155,7 @@ ARTICLE_PER_PAGE = 4 # just for tests because we haven't got enough content
 FILE_UPLOAD_PERMISSIONS = 0o664
 FILE_UPLOAD_TEMP_DIR = '/srv/media/uploads/tmp/'
 MAX_UPLOAD_SIZE = 512000000
+MAX_UPLOAD_SIZE_FRONT = 10485760
 FILEBROWSER_MAX_UPLOAD_SIZE = 512000000
 
 if DEBUG:

diff --git a/app/organization/job/views.py b/app/organization/job/views.py
index afb46fe1ad9da46e81abbd03f78be9e3c3cd0255..e991cb57cbe7c38033cd29b1b6ed88de71d41e23 100644 (file)
--- a/app/organization/job/views.py
+++ b/app/organization/job/views.py
@@ -1,5 +1,6 @@
 import os
 import mimetypes
+import humanize
 from django import forms
 from django.shortcuts import redirect
 from django.shortcuts import render
@@ -17,8 +18,7 @@ from mezzanine.conf import settings
 from organization.job.models import JobOffer, JobResponse
 from organization.job.forms import JobResponseForm
 
-extention = ['.pdf', '.PDF', '.doc', '.docx']
-
+mime_types = ['pdf', 'msword', 'vnd.oasis.opendocument.text', 'vnd.openxmlformats-officedocument.wordprocessingml.document']
 
 class JobOfferDetailView(CreateView):
 
@@ -42,11 +42,15 @@ class JobOfferDetailView(CreateView):
         return reverse_lazy('organization-job-offer-detail', kwargs={'slug':self.kwargs['slug']})
 
     def form_valid(self, form):
-        # check extension uploaded files
-        name_cv, ext_cv = os.path.splitext(form.cleaned_data['curriculum_vitae'].name)
-        name_cl, ext_cl = os.path.splitext(form.cleaned_data['cover_letter'].name)
-        if ext_cv not in extention or ext_cl not in extention :
-            messages.info(self.request, _("Only .pdf, .doc, .docx files allowed."))
+        # check mimetype uploaded files
+        mime_type_cv = form.cleaned_data['curriculum_vitae'].content_type.split('/')[1]
+        mime_type_cl = form.cleaned_data['cover_letter'].content_type.split('/')[1]
+        if mime_type_cv not in mime_types or mime_type_cl not in mime_types :
+            messages.info(self.request, _("Only .pdf, .odt, .doc, .docx files allowed."))
+            return super(JobOfferDetailView, self).form_invalid(form)
+        # check max upload file for anonymous user
+        if form.cleaned_data['curriculum_vitae'].size > settings.MAX_UPLOAD_SIZE_FRONT or form.cleaned_data['cover_letter'].size > settings.MAX_UPLOAD_SIZE_FRONT :
+            messages.info(self.request, _("Uploaded files cannot exceed "+humanize.naturalsize(settings.MAX_UPLOAD_SIZE_FRONT)+"."))
             return super(JobOfferDetailView, self).form_invalid(form)
         email_application_notification(self.request, self.job_offer, form.cleaned_data)
         messages.info(self.request, _("You have successfully submitted your application."))

diff --git a/requirements.txt b/requirements.txt
index 6618a48b0d673b0b4986b47a6d36d9577211319b..9f1cec83f676416684a3d3e5474e22a869c21b2e 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@ watchdog
 mysqlclient
 psycopg2
 pyquery
+humanize
 Django==1.9.7
 mezzanine==4.2.0
 django-modeltranslation