X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=filex%2Fuploadhandler.py;h=7e57a369b4923324199e39274f17a1dac9ab8706;hb=0531413dff86618983d7c6ae2f723b5051029e1b;hp=75a6cd771e7d6069ac52eef95de6548002a5a6fd;hpb=312245a1dce5fc98836bf69d4d09da3053794376;p=qcg-portal.git

diff --git a/filex/uploadhandler.py b/filex/uploadhandler.py
index 75a6cd7..7e57a36 100644
--- a/filex/uploadhandler.py
+++ b/filex/uploadhandler.py
@@ -1,9 +1,9 @@
-from functools import wraps
+import os
 
 from django.core.files.uploadedfile import UploadedFile
 from django.core.files.uploadhandler import FileUploadHandler, StopUpload, StopFutureHandlers
-from django.views.decorators.csrf import csrf_exempt, csrf_protect
 
+from filex.forms import HostPathForm
 from filex.ftp import FTPOperation
 
 
@@ -15,19 +15,17 @@ class FtpUploadHandler(FileUploadHandler):
     def new_file(self, file_name, *args, **kwargs):
         super(FtpUploadHandler, self).new_file(file_name, *args, **kwargs)
 
-        # TODO limit to selected request.path
-        # TODO validate host and path
-        host = self.request.GET.get('host')
-        path = self.request.GET.get('path')
+        form = HostPathForm(self.request.GET)
 
-        if self.request.user.is_anonymous() or not host or not path:
+        if self.request.user.is_anonymous() or not form.is_valid():
             raise StopUpload(connection_reset=True)
 
         if self.ftp is None:
             self.ftp = FTPOperation(self.request.session['proxy'], self.chunk_size)
 
-        self.url = 'gsiftp://' + host + path + self.file_name
-        self.tmp_url = 'gsiftp://' + host + path + self.file_name + '.part'
+        self.url = 'gsiftp://{}/{}'.format(form.cleaned_data['host'],
+                                           os.path.join(form.cleaned_data['path'], self.file_name))
+        self.tmp_url = self.url + '.part'
 
         self.ftp.put(self.tmp_url)
 
@@ -45,13 +43,3 @@ class FtpUploadHandler(FileUploadHandler):
 
         return UploadedFile(name=self.file_name, size=file_size, charset=self.charset,
                             content_type=self.content_type, content_type_extra=self.content_type_extra)
-
-
-def with_ftp_upload_handler(view_func):
-    @wraps(view_func)
-    def wrapped_view(request, *args, **kwargs):
-        request.upload_handlers = [FtpUploadHandler(request)]
-
-        return csrf_protect(view_func)(request, *args, **kwargs)
-
-    return csrf_exempt(wrapped_view)