') - .text('Upload server currently unavailable - ' + - new Date()) - .appendTo('#fileupload'); - }); - } - } else { - // Load existing files: - $('#fileupload').addClass('fileupload-processing'); - $.ajax({ - // Uncomment the following to send cross-domain cookies: - //xhrFields: {withCredentials: true}, - //url: $('#fileupload').fileupload('option', 'url'), - url: '/upload/view/', - dataType: 'json', - context: $('#fileupload')[0] - }).always(function () { - $(this).removeClass('fileupload-processing'); - }).done(function (result) { - $(this).fileupload('option', 'done') - .call(this, null, {result: result}); - }); - } + // Load existing files: + $('#fileupload').addClass('fileupload-processing'); + $.ajax({ + // Uncomment the following to send cross-domain cookies: + //xhrFields: {withCredentials: true}, + //url: $('#fileupload').fileupload('option', 'url'), + url: '/upload/view/', + dataType: 'json', + context: $('#fileupload')[0] + }).always(function () { + $(this).removeClass('fileupload-processing'); + }).done(function (result) { + $(this).fileupload('option', 'done') + .call(this, null, {result: result}); + }); }); From a3a9cdc06fdd9a75746fe3372f6eab7e74ca91d0 Mon Sep 17 00:00:00 2001 From: Fabrizio Buratta Date: Thu, 27 Feb 2014 17:50:49 +0100 Subject: [PATCH 27/57] security fix: view/create/delete only for logged in users --- fileupload/views.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fileupload/views.py b/fileupload/views.py index ded5690..1320538 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -56,6 +56,9 @@ class FileCreateView(CreateView): model = File def form_valid(self, form): + if not self.request.user.is_authenticated(): + return redirect('home') + self.object = form.save() files = [serialize(self.object)] data = {'files': files} @@ -77,6 +80,9 @@ class FileDeleteView(DeleteView): model = File def delete(self, request, *args, **kwargs): + if not self.request.user.is_authenticated(): + return redirect('home') + self.object = self.get_object() self.object.delete() response = JSONResponse(True, mimetype=response_mimetype(request)) @@ -91,6 +97,10 @@ def get_queryset(self): return File.objects.filter(username=self.request.user) def render_to_response(self, context, **response_kwargs): + + if not self.request.user.is_authenticated(): + return redirect('home') + files = [ serialize(p) for p in self.get_queryset() ] data = {'files': files} response = JSONResponse(data, mimetype=response_mimetype(self.request)) From a347c57443a6b657d3820dc4b5998d01a44c9dc7 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Feb 2014 18:23:13 +0100 Subject: [PATCH 28/57] minor --- fileupload/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileupload/views.py b/fileupload/views.py index 1320538..7974458 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -22,7 +22,7 @@ def send_email(response,user): for file in response['files']: msg_content += "File Uploaded: "+ file['name'] + '\r\n' - msg_content += "Download: https://ml.moldiscovery.com"+ file['url'] + '\r\n\r\n' + msg_content += "Download: https://ml.moldiscovery.com:8888/uploader"+ file['url'] + '\r\n\r\n' msg = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" % (FROMADDR, ", ".join(TOADDRS), SUBJECT) ) From bde0195d558f4021cb36013ba8f7c2f841866193 Mon Sep 17 00:00:00 2001 From: Fabrizio Buratta Date: Fri, 28 Feb 2014 11:10:42 +0100 Subject: [PATCH 29/57] better progress bar css --- fileupload/static/css/jquery.fileupload-ui.css | 9 +++++++++ fileupload/views.py | 1 + 2 files changed, 10 insertions(+) diff --git a/fileupload/static/css/jquery.fileupload-ui.css b/fileupload/static/css/jquery.fileupload-ui.css index fe1be75..74c080b 100644 --- a/fileupload/static/css/jquery.fileupload-ui.css +++ b/fileupload/static/css/jquery.fileupload-ui.css @@ -45,6 +45,15 @@ margin: 0px; } +.ui-widget-content { + border: 1px solid #555555; + height: 14px; + margin-bottom: 10px; + width: 80%; + background: #000000 url(../img/progessbar.gif) 50% 50% repeat; + color: #ffffff; +} + .ui-widget { font-size: 0.92em; } diff --git a/fileupload/views.py b/fileupload/views.py index 7974458..7fb24a4 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -22,6 +22,7 @@ def send_email(response,user): for file in response['files']: msg_content += "File Uploaded: "+ file['name'] + '\r\n' + msg_content += "File Size: "+ str(file['size']) + ' bytes\r\n' msg_content += "Download: https://ml.moldiscovery.com:8888/uploader"+ file['url'] + '\r\n\r\n' msg = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" From dcb92d5962027f8623498836dba4b920e585cc98 Mon Sep 17 00:00:00 2001 From: Fabrizio Buratta Date: Fri, 28 Feb 2014 12:09:51 +0100 Subject: [PATCH 30/57] better progress bar image --- fileupload/static/css/jquery.fileupload-ui.css | 10 +++++++++- .../img/ui-bg_highlight-soft_44_444444_1x100.png | Bin 0 -> 215 bytes .../ui-bg_highlight-soft_44_444444_1x100.png.orig | Bin 0 -> 277 bytes 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 fileupload/static/img/ui-bg_highlight-soft_44_444444_1x100.png create mode 100644 fileupload/static/img/ui-bg_highlight-soft_44_444444_1x100.png.orig diff --git a/fileupload/static/css/jquery.fileupload-ui.css b/fileupload/static/css/jquery.fileupload-ui.css index 74c080b..0139638 100644 --- a/fileupload/static/css/jquery.fileupload-ui.css +++ b/fileupload/static/css/jquery.fileupload-ui.css @@ -50,10 +50,18 @@ height: 14px; margin-bottom: 10px; width: 80%; - background: #000000 url(../img/progessbar.gif) 50% 50% repeat; + background: #000000 url(../img/progressbar.gif) 50% 50% repeat; color: #ffffff; } +.ui-widget-header { +border: 1px solid #005491; +/*background: #388532 url(images/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x;*/ +background: #005491 url(../img/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x; +color: #ffffff; +font-weight: bold; +} + .ui-widget { font-size: 0.92em; } diff --git a/fileupload/static/img/ui-bg_highlight-soft_44_444444_1x100.png b/fileupload/static/img/ui-bg_highlight-soft_44_444444_1x100.png new file mode 100644 index 0000000000000000000000000000000000000000..32733d6562e7cfb240383386f5447c0e82acd354 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!2~2v_?0{X??Smc!zY2lH!<>7kwzRU zHT&$XW`1Z%vYKJFj7M!@&7(H<+kX5tJnJ)9}fO~aQ^MPw(0M>1HQ4I{V1~6{m}fUKo>B0 My85}Sb4q9e08yw`lK=n! literal 0 HcmV?d00001 diff --git a/fileupload/static/img/ui-bg_highlight-soft_44_444444_1x100.png.orig b/fileupload/static/img/ui-bg_highlight-soft_44_444444_1x100.png.orig new file mode 100644 index 0000000000000000000000000000000000000000..a4e5b22e29f505535f92343e9b95e90c2b2c6460 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^j6j?s03;ZUuHXC*q?nSt-Ch3w7g=q17Rci)@Q5r1 z(jH*!b~4)z$O!jzaSV~ToUF0;kc0Y_69IoZ7M_^7FhSG#URv9nnl>HXwlC>CE9-bX zZ%Yb^NF-THEV46laWQInX3Uap%;J;w;dA<&;$VFLsfnN literal 0 HcmV?d00001 From 04b511e61dc33ac54f15d2f75e98db3d48571ab9 Mon Sep 17 00:00:00 2001 From: Fabrizio Buratta Date: Fri, 28 Feb 2014 12:19:17 +0100 Subject: [PATCH 31/57] minor --- fileupload/static/css/jquery.fileupload-ui.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileupload/static/css/jquery.fileupload-ui.css b/fileupload/static/css/jquery.fileupload-ui.css index 0139638..b52a3af 100644 --- a/fileupload/static/css/jquery.fileupload-ui.css +++ b/fileupload/static/css/jquery.fileupload-ui.css @@ -55,7 +55,7 @@ } .ui-widget-header { -border: 1px solid #005491; +border: 1px solid #020091; /*background: #388532 url(images/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x;*/ background: #005491 url(../img/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x; color: #ffffff; From df1e8ab617858e8c67ee91e157478e73898597ea Mon Sep 17 00:00:00 2001 From: Fabrizio Buratta Date: Fri, 28 Feb 2014 12:24:29 +0100 Subject: [PATCH 32/57] minor --- fileupload/static/css/jquery.fileupload-ui.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileupload/static/css/jquery.fileupload-ui.css b/fileupload/static/css/jquery.fileupload-ui.css index b52a3af..760f027 100644 --- a/fileupload/static/css/jquery.fileupload-ui.css +++ b/fileupload/static/css/jquery.fileupload-ui.css @@ -55,7 +55,7 @@ } .ui-widget-header { -border: 1px solid #020091; +border: 1px solid #798E9B; /*background: #388532 url(images/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x;*/ background: #005491 url(../img/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x; color: #ffffff; From e4db8679a7500c51f19abc117b36337d0e06b4e5 Mon Sep 17 00:00:00 2001 From: Fabrizio Buratta Date: Fri, 28 Feb 2014 13:02:27 +0100 Subject: [PATCH 33/57] compress files TIP --- fileupload/templates/fileupload/file_jquery_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileupload/templates/fileupload/file_jquery_form.html b/fileupload/templates/fileupload/file_jquery_form.html index d4516ad..b190ed6 100644 --- a/fileupload/templates/fileupload/file_jquery_form.html +++ b/fileupload/templates/fileupload/file_jquery_form.html @@ -50,7 +50,7 @@

- +

Molecular Discovery Secure File Upload.

Molecular Discovery Secure File Upload. ( TIP: Compress your files when possible. )

From d3eaf40d11fa529a9a12b65f0a8e1b59942fda51 Mon Sep 17 00:00:00 2001 From: Bobo Date: Tue, 18 Mar 2014 15:47:39 +0100 Subject: [PATCH 34/57] added action to download selected files --- fileupload/admin.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index 8b5ec66..a83b6c6 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -1,4 +1,24 @@ from fileupload.models import File from django.contrib import admin +from django.http import HttpResponse +import tarfile -admin.site.register(File) +def make_download(modeladmin, request, queryset): + response = HttpResponse(mimetype='application/x-gzip') + response['Content-Disposition'] = 'attachment; filename=MD_secure_upload_download.tar.gz' + tarred = tarfile.open(fileobj=response, mode='w:gz') + + for file in queryset: + tarred.add("media/"+file.file.name) + tarred.close() + + return response + +make_download.short_description = "Download selected files" + + +class FileAdmin(admin.ModelAdmin): + actions = [make_download] + + +admin.site.register(File,FileAdmin) From fe0a01dfeda15e0d869ba536b48a41942fcc8227 Mon Sep 17 00:00:00 2001 From: Bobo Date: Tue, 18 Mar 2014 16:34:13 +0100 Subject: [PATCH 35/57] added maxsize to multiple downloads --- fileupload/admin.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index a83b6c6..f23a7b7 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -2,17 +2,33 @@ from django.contrib import admin from django.http import HttpResponse import tarfile +from django.contrib import messages +def validate_size(files, maxsize): + total_size = 0 + if len(files) > 1: + for file in files: + total_size += file.file.size + + return total_size <= maxsize + return True + def make_download(modeladmin, request, queryset): response = HttpResponse(mimetype='application/x-gzip') response['Content-Disposition'] = 'attachment; filename=MD_secure_upload_download.tar.gz' tarred = tarfile.open(fileobj=response, mode='w:gz') - for file in queryset: - tarred.add("media/"+file.file.name) - tarred.close() + + if not validate_size(queryset,500000000): + messages.warning(request, "Download is too big, unselect some files, max size = 500 MB") + + else: + + for file in queryset: + tarred.add("media/"+file.file.name) + tarred.close() - return response + return response make_download.short_description = "Download selected files" From ac561376377552d3a6c0b510b47dcd6089cb44ac Mon Sep 17 00:00:00 2001 From: Bobo Date: Tue, 18 Mar 2014 16:42:32 +0100 Subject: [PATCH 36/57] minor --- fileupload/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index f23a7b7..b156d69 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -20,7 +20,7 @@ def make_download(modeladmin, request, queryset): if not validate_size(queryset,500000000): - messages.warning(request, "Download is too big, unselect some files, max size = 500 MB") + messages.warning(request, "Download group is too big, unselect some files or select just 1, max size of multple download: 500 MB") else: From 25f900e1279ea47ebc39bc898926017e25fa16ed Mon Sep 17 00:00:00 2001 From: Bobo Date: Tue, 18 Mar 2014 17:18:06 +0100 Subject: [PATCH 37/57] ordered Fileadmin and verbose slug --- fileupload/admin.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fileupload/admin.py b/fileupload/admin.py index b156d69..c98b217 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -32,8 +32,15 @@ def make_download(modeladmin, request, queryset): make_download.short_description = "Download selected files" +def file_size(obj): + if obj.file.size < 1000000: + return ("%s bytes" % (obj.file.size)) + return ("%s MBs" % (obj.file.size/1000000)) +file_size.short_description = 'Size' class FileAdmin(admin.ModelAdmin): + list_display = ('slug','username', file_size) + ordering = ('username','slug') actions = [make_download] From f8cbcfc904b18d6b79488dc86f8241afb99d4a7f Mon Sep 17 00:00:00 2001 From: Bobo Date: Tue, 18 Mar 2014 17:57:20 +0100 Subject: [PATCH 38/57] added verbose name to slug --- fileupload/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileupload/models.py b/fileupload/models.py index 27b8210..9a09f77 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -12,7 +12,7 @@ class File(models.Model): """ file = models.FileField(upload_to=upload_dir_path) - slug = models.SlugField(max_length=50, blank=True ) + slug = models.SlugField(max_length=50, blank=True, verbose_name="file name") username = models.CharField(max_length=50) def __unicode__(self): From b10c3af77ee4cc04ba37250340d680f33fb2f751 Mon Sep 17 00:00:00 2001 From: Bobo Date: Wed, 19 Mar 2014 10:43:50 +0100 Subject: [PATCH 39/57] use MEDIA_ROOT when tarring files --- fileupload/admin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index c98b217..b48304e 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -3,6 +3,7 @@ from django.http import HttpResponse import tarfile from django.contrib import messages +from django.conf import settings def validate_size(files, maxsize): total_size = 0 @@ -25,7 +26,7 @@ def make_download(modeladmin, request, queryset): else: for file in queryset: - tarred.add("media/"+file.file.name) + tarred.add(settings.MEDIA_ROOT+file.file.name, arcname=file.file.name ) tarred.close() return response From 474a9403e251ac3ce13fb68c0b42119d0c5e3360 Mon Sep 17 00:00:00 2001 From: Bobo Date: Wed, 19 Mar 2014 11:03:30 +0100 Subject: [PATCH 40/57] added error messages --- fileupload/admin.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index b48304e..f5bc347 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -15,21 +15,29 @@ def validate_size(files, maxsize): return True def make_download(modeladmin, request, queryset): - response = HttpResponse(mimetype='application/x-gzip') - response['Content-Disposition'] = 'attachment; filename=MD_secure_upload_download.tar.gz' - tarred = tarfile.open(fileobj=response, mode='w:gz') - - if not validate_size(queryset,500000000): - messages.warning(request, "Download group is too big, unselect some files or select just 1, max size of multple download: 500 MB") + try: + response = HttpResponse(mimetype='application/x-gzip') + response['Content-Disposition'] = 'attachment; filename=MD_secure_upload_download.tar.gz' + tarred = tarfile.open(fileobj=response, mode='w:gz') - else: - - for file in queryset: - tarred.add(settings.MEDIA_ROOT+file.file.name, arcname=file.file.name ) - tarred.close() - return response + if not validate_size(queryset,500000000): + messages.warning(request, "Download group is too big, unselect some files or select just 1, max size of multple download: 500 MB") + + else: + + for file in queryset: + tarred.add(settings.MEDIA_ROOT+file.file.name, arcname=file.file.name ) + tarred.close() + + return response + + except tarfile.TarError: + messages.error(request, "Error while creating the TAR archive, contact the webmaster.") + except : + messages.error(request, "There was an error, please contact the webmaster") + make_download.short_description = "Download selected files" From 73738d510a77f70c8ae7338c0dff7c9a63ff88d8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 10 Dec 2015 11:15:02 +0100 Subject: [PATCH 41/57] bunch of commits which are fixes and improvements on production --- fileupload/admin.py | 1 + fileupload/static/img/MD_logo.png | Bin 12778 -> 6278 bytes fileupload/static/js/app.js | 2 +- .../static/js/jquery.fileupload-validate.js | 2 +- fileupload/static/js/main.js | 4 ++-- fileupload/views.py | 2 +- settings.py | 8 ++++++-- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index f5bc347..3ae5990 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -49,6 +49,7 @@ def file_size(obj): class FileAdmin(admin.ModelAdmin): list_display = ('slug','username', file_size) + search_fields = ['slug', 'username'] ordering = ('username','slug') actions = [make_download] diff --git a/fileupload/static/img/MD_logo.png b/fileupload/static/img/MD_logo.png index 257bd14423a50c22bb2cb0c09fa81b1ad79c658a..47b3350a5b1f485b4e96f178f0f8ecebee680aa0 100644 GIT binary patch literal 6278 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 diff --git a/fileupload/static/js/app.js b/fileupload/static/js/app.js index 729eb1a..404b13d 100644 --- a/fileupload/static/js/app.js +++ b/fileupload/static/js/app.js @@ -40,7 +40,7 @@ // send Blob objects via XHR requests: disableImageResize: /Android(?!.*Chrome)|Opera/ .test(window.navigator.userAgent), - maxFileSize: 5000000, + maxFileSize: 100000, acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i }); } diff --git a/fileupload/static/js/jquery.fileupload-validate.js b/fileupload/static/js/jquery.fileupload-validate.js index 62f9fd3..de37447 100644 --- a/fileupload/static/js/jquery.fileupload-validate.js +++ b/fileupload/static/js/jquery.fileupload-validate.js @@ -71,7 +71,7 @@ maxNumberOfFiles: 'Maximum number of files exceeded', acceptFileTypes: 'File type not allowed', maxFileSize: 'File is too large', - minFileSize: 'File is too small, min allowed size is 5MB.' + minFileSize: 'File is too small, min allowed size is 0.1MB.' } }, diff --git a/fileupload/static/js/main.js b/fileupload/static/js/main.js index 049c3f1..47d960a 100644 --- a/fileupload/static/js/main.js +++ b/fileupload/static/js/main.js @@ -18,7 +18,7 @@ $(function () { // Initialize the jQuery File Upload widget: $('#fileupload').fileupload({ - minFileSize: 5000000, + minFileSize: 100000, // Uncomment the following to send cross-domain cookies: //xhrFields: {withCredentials: true}, //url: 'server/php/' @@ -40,7 +40,7 @@ $(function () { // Uncomment the following to send cross-domain cookies: //xhrFields: {withCredentials: true}, //url: $('#fileupload').fileupload('option', 'url'), - url: '/upload/view/', + url: 'https://ml.moldiscovery.com:8888/uploader/upload/view/', dataType: 'json', context: $('#fileupload')[0] }).always(function () { diff --git a/fileupload/views.py b/fileupload/views.py index 7fb24a4..cf799f6 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -65,7 +65,7 @@ def form_valid(self, form): data = {'files': files} response = JSONResponse(data, mimetype=response_mimetype(self.request)) response['Content-Disposition'] = 'inline; filename=files.json' - send_email(data, self.request.user.username) + #send_email(data, self.request.user.username) return response def form_invalid(self, form): diff --git a/settings.py b/settings.py index 4328f30..390e6c3 100644 --- a/settings.py +++ b/settings.py @@ -1,12 +1,16 @@ import os -DEBUG = True +DEBUG = False TEMPLATE_DEBUG = DEBUG +ALLOWED_HOSTS = ['ml.moldiscovery.com','fileserver.lan','ajax.googleapis.com'] + SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) +SERVER_EMAIL = 'admin@ml.moldiscovery.com' + ADMINS = ( - # ('Your Name', 'your_email@example.com'), + ('SysAdmin', 'fabrizio@moldiscovery.com'), ) MANAGERS = ADMINS From 5bf157ef5020a4bdc4c6b3f6aa373405c8e355b8 Mon Sep 17 00:00:00 2001 From: fburatta Date: Fri, 15 Jan 2016 10:38:46 +0100 Subject: [PATCH 42/57] added last modified --- fileupload/admin.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index 3ae5990..42a8847 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -4,6 +4,7 @@ import tarfile from django.contrib import messages from django.conf import settings +import os.path, time def validate_size(files, maxsize): total_size = 0 @@ -47,8 +48,12 @@ def file_size(obj): return ("%s MBs" % (obj.file.size/1000000)) file_size.short_description = 'Size' +def last_modified(obj): + date_text = "%s" % time.ctime(os.path.getmtime(settings.MEDIA_ROOT+obj.file.name)) + return date_text + class FileAdmin(admin.ModelAdmin): - list_display = ('slug','username', file_size) + list_display = ('slug','username', file_size, last_modified) search_fields = ['slug', 'username'] ordering = ('username','slug') actions = [make_download] From 2ee84804094ba7986b2862e3f86aa59276e3c706 Mon Sep 17 00:00:00 2001 From: fburatta Date: Thu, 26 May 2016 08:31:43 +0200 Subject: [PATCH 43/57] manage script update --- manage.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/manage.py b/manage.py index 3e4eedc..f9726f9 100755 --- a/manage.py +++ b/manage.py @@ -1,14 +1,10 @@ #!/usr/bin/env python -from django.core.management import execute_manager -import imp -try: - imp.find_module('settings') # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__) - sys.exit(1) - -import settings +import os +import sys if __name__ == "__main__": - execute_manager(settings) + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) From 874c41ca1c211f474fb58658d46cb8524fd20cfb Mon Sep 17 00:00:00 2001 From: fburatta Date: Thu, 26 May 2016 09:41:21 +0200 Subject: [PATCH 44/57] archive files action added --- fileupload/admin.py | 27 +++++++- settings.py | 16 +++-- settings_dev.py | 159 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+), 5 deletions(-) create mode 100644 settings_dev.py diff --git a/fileupload/admin.py b/fileupload/admin.py index 42a8847..3504d2e 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -2,6 +2,7 @@ from django.contrib import admin from django.http import HttpResponse import tarfile +import shutil from django.contrib import messages from django.conf import settings import os.path, time @@ -42,6 +43,30 @@ def make_download(modeladmin, request, queryset): make_download.short_description = "Download selected files" + +def make_archive(modeladmin, request, queryset): + + try: + + for file in queryset: + archive_dir = os.path.join(settings.ARCHIVE_ROOT,file.username) + if not os.path.exists(archive_dir): + os.makedirs(archive_dir) + + shutil.copyfile(settings.MEDIA_ROOT+file.file.name, os.path.join(archive_dir,file.slug)) + + file.delete() + + messages.info(request, file.slug + " Archived Successfully") + + except shutil.Error: + messages.error(request, "File Copy error, please contact the webmaster") + except : + messages.error(request, "There was an error, please contact the webmaster") + +make_archive.short_description = "Archive selected files" + + def file_size(obj): if obj.file.size < 1000000: return ("%s bytes" % (obj.file.size)) @@ -56,7 +81,7 @@ class FileAdmin(admin.ModelAdmin): list_display = ('slug','username', file_size, last_modified) search_fields = ['slug', 'username'] ordering = ('username','slug') - actions = [make_download] + actions = [make_download,make_archive] admin.site.register(File,FileAdmin) diff --git a/settings.py b/settings.py index 390e6c3..5482b95 100644 --- a/settings.py +++ b/settings.py @@ -58,6 +58,8 @@ # Examples: "http://media.lawrence.com/media/", "http://example.com/media/" MEDIA_URL = '/media/' +ARCHIVE_ROOT = os.path.join(MEDIA_ROOT,'archived') + # Absolute path to the directory static files should be collected to. # Don't put anything in this directory yourself; store your static files # in apps' "static/" subdirectories and in STATICFILES_DIRS. @@ -137,11 +139,17 @@ 'version': 1, 'disable_existing_loggers': False, 'handlers': { - 'mail_admins': { - 'level': 'ERROR', - 'class': 'django.utils.log.AdminEmailHandler' + 'mail_admins': { + 'level': 'ERROR', + 'filters': ['require_debug_false'], + 'class': 'django.utils.log.AdminEmailHandler' } }, + 'filters': { + 'require_debug_false': { + '()': 'django.utils.log.RequireDebugFalse' + } + }, 'loggers': { 'django.request': { 'handlers': ['mail_admins'], @@ -149,4 +157,4 @@ 'propagate': True, }, } -} +} \ No newline at end of file diff --git a/settings_dev.py b/settings_dev.py new file mode 100644 index 0000000..23fdb0c --- /dev/null +++ b/settings_dev.py @@ -0,0 +1,159 @@ +import os + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +# uncomment this on production server and DEBUG=False +#ALLOWED_HOSTS = ['ml.moldiscovery.com','ajax.googleapis.com'] + +SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + +ADMINS = ( + ('Fabrizio Buratta', 'fabrizio@moldiscovery.com'), +) + +MANAGERS = ADMINS + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': os.path.join(SITE_ROOT, 'db'), # Or path to database file if using sqlite3. + 'USER': '', # Not used with sqlite3. + 'PASSWORD': '', # Not used with sqlite3. + 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '', # Set to empty string for default. Not used with sqlite3. + } +} + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# On Unix systems, a value of None will cause Django to use the same +# timezone as the operating system. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = 'Europe/Rome' + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'en-us' + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +# If you set this to False, Django will not format dates, numbers and +# calendars according to the current locale +USE_L10N = True + +# Absolute filesystem path to the directory that will hold user-uploaded files. +# Example: "/home/media/media.lawrence.com/media/" +MEDIA_ROOT = os.path.abspath(os.path.dirname(__file__)) + '/media/' + +ARCHIVE_ROOT = os.path.join(MEDIA_ROOT,'archived') + +# URL that handles the media served from MEDIA_ROOT. Make sure to use a +# trailing slash. +# Examples: "http://media.lawrence.com/media/", "http://example.com/media/" +MEDIA_URL = '/media/' + +# Absolute path to the directory static files should be collected to. +# Don't put anything in this directory yourself; store your static files +# in apps' "static/" subdirectories and in STATICFILES_DIRS. +# Example: "/home/media/media.lawrence.com/static/" +STATIC_ROOT = os.path.abspath(os.path.dirname(__file__)) + '/static/' + +# URL prefix for static files. +# Example: "http://media.lawrence.com/static/" +STATIC_URL = '/static/' + +# URL prefix for admin static files -- CSS, JavaScript and images. +# Make sure to use a trailing slash. +# Examples: "http://foo.com/static/admin/", "/static/admin/". +ADMIN_MEDIA_PREFIX = '/static/admin/' + +# Additional locations of static files +STATICFILES_DIRS = ( + # Put strings here, like "/home/html/static" or "C:/www/django/static". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) + +# List of finder classes that know how to find static files in +# various locations. +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', +# 'django.contrib.staticfiles.finders.DefaultStorageFinder', +) + +# Make this unique, and don't share it with anybody. +SECRET_KEY = '9%$in^gpdaig@v3or_to&_z(=n)3)$f1mr3hf9e#kespy2ajlo' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', +# 'django.template.loaders.eggs.Loader', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', +) + +ROOT_URLCONF = 'urls' + +TEMPLATE_DIRS = ( + # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'fileupload', + # Uncomment the next line to enable the admin: + 'django.contrib.admin', + # Uncomment the next line to enable admin documentation: + # 'django.contrib.admindocs', +) + +# A sample logging configuration. The only tangible logging +# performed by this configuration is to send an email to +# the site admins on every HTTP 500 error. +# See http://docs.djangoproject.com/en/dev/topics/logging for +# more details on how to customize your logging configuration. +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'handlers': { + 'mail_admins': { + 'level': 'ERROR', + 'filters': ['require_debug_false'], + 'class': 'django.utils.log.AdminEmailHandler' + } + }, + 'filters': { + 'require_debug_false': { + '()': 'django.utils.log.RequireDebugFalse' + } + }, + 'loggers': { + 'django.request': { + 'handlers': ['mail_admins'], + 'level': 'ERROR', + 'propagate': True, + }, + } +} From 8a106d5c82180d0c53b7f528a1d2c195229fe3bb Mon Sep 17 00:00:00 2001 From: root Date: Wed, 10 Aug 2016 12:46:08 +0000 Subject: [PATCH 45/57] added wsgi file and minor fixes --- core/wsgi.py | 58 ++++++++++++++ settings.py | 9 ++- static/css/jquery.fileupload-ui.css | 114 ++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 core/wsgi.py create mode 100644 static/css/jquery.fileupload-ui.css diff --git a/core/wsgi.py b/core/wsgi.py new file mode 100644 index 0000000..5151301 --- /dev/null +++ b/core/wsgi.py @@ -0,0 +1,58 @@ +""" +WSGI config for finto project. + +This module contains the WSGI application used by Django's development server +and any production WSGI deployments. It should expose a module-level variable +named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover +this application via the ``WSGI_APPLICATION`` setting. + +Usually you will have the standard Django WSGI application here, but it also +might make sense to replace the whole Django WSGI application with a custom one +that later delegates to the Django one. For example, you could introduce WSGI +middleware here, or combine a Django application with an application of another +framework. + +""" +import os +import sys +import site + +ALLDIRS = ['/var/www/djuploader/lib/python2.7/site-packages'] + +path = '/var/www/djuploader/dj-src' +if path not in sys.path: + sys.path.append(path) + +# Remember original sys.path. +prev_sys_path = list(sys.path) + +# Add each new site-packages directory. +for directory in ALLDIRS: + site.addsitedir(directory) + +# Reorder sys.path so new directories at the front. +new_sys_path = [] +for item in list(sys.path): + if item not in prev_sys_path: + new_sys_path.append(item) + sys.path.remove(item) +sys.path[:0] = new_sys_path + +activate_this = '/var/www/djuploader/bin/activate_this.py' +execfile(activate_this, dict(__file__=activate_this)) + +# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks +# if running multiple sites in the same mod_wsgi process. To fix this, use +# mod_wsgi daemon mode with each site in its own daemon process, or use +# os.environ["DJANGO_SETTINGS_MODULE"] = "finto.settings" +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") + +# This application object is used by any WSGI server configured to use this +# file. This includes Django's development server, if the WSGI_APPLICATION +# setting points here. +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() + +# Apply WSGI middleware here. +# from helloworld.wsgi import HelloWorldApplication +# application = HelloWorldApplication(application) diff --git a/settings.py b/settings.py index 5482b95..7b0689f 100644 --- a/settings.py +++ b/settings.py @@ -3,11 +3,11 @@ DEBUG = False TEMPLATE_DEBUG = DEBUG -ALLOWED_HOSTS = ['ml.moldiscovery.com','fileserver.lan','ajax.googleapis.com'] +ALLOWED_HOSTS = ['www2.moldiscovery.com','localhost','127.0.0.1','ajax.googleapis.com'] SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) -SERVER_EMAIL = 'admin@ml.moldiscovery.com' +SERVER_EMAIL = 'admin@www2.moldiscovery.com' ADMINS = ( ('SysAdmin', 'fabrizio@moldiscovery.com'), @@ -51,7 +51,8 @@ # Absolute filesystem path to the directory that will hold user-uploaded files. # Example: "/home/media/media.lawrence.com/media/" -MEDIA_ROOT = os.path.abspath(os.path.dirname(__file__)) + '/media/' +#MEDIA_ROOT = os.path.abspath(os.path.dirname(__file__)) + '/media/' +MEDIA_ROOT = '/var/media-storage/' # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash. @@ -157,4 +158,4 @@ 'propagate': True, }, } -} \ No newline at end of file +} diff --git a/static/css/jquery.fileupload-ui.css b/static/css/jquery.fileupload-ui.css new file mode 100644 index 0000000..693862f --- /dev/null +++ b/static/css/jquery.fileupload-ui.css @@ -0,0 +1,114 @@ +@charset "UTF-8"; +/* + * jQuery File Upload UI Plugin CSS 8.8.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +.fileinput-button { + position: relative; + overflow: hidden; +} +.fileinput-button input { + position: absolute; + top: 0; + right: 0; + margin: 0; + opacity: 0; + filter: alpha(opacity=0); + transform: translate(-300px, 0) scale(4); + font-size: 23px; + direction: ltr; + cursor: pointer; +} +.fileupload-buttonbar .btn, +.fileupload-buttonbar .toggle { + margin-bottom: 5px; +} +.progress-animated .progress-bar, +.progress-animated .bar { + background: url(../img/progressbar.gif) !important; + filter: none; +} + + +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { + background: none repeat scroll 0 0 #005491; + border: 1px solid #515091; + color: #EEEEEE; + font-weight: bold; + margin: 0px; +} + +.ui-widget-content { + border: 1px solid #555555; + height: 14px; + margin-bottom: 10px; + width: 80%; + background: #000000 url(../img/progressbar.gif) 50% 50% repeat; + color: #ffffff; +} + +.ui-widget-header { +border: 1px solid #798E9B; +/*background: #388532 url(images/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x;*/ +background: #005491 url(../img/ui-bg_highlight-soft_44_444444_1x100.png) 50% 50% repeat-x; +color: #ffffff; +font-weight: bold; +} + +.ui-widget { + font-size: 0.92em; +} + +.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { + border-bottom-right-radius: 6px; +} +.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { + border-bottom-left-radius: 6px; +} + +.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { + border-top-right-radius: 6px; +} +.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { + border-top-left-radius: 6px; +} + +/*.fileupload-loading { + float: right; + width: 32px; + height: 32px; + background: url(../img/loading.gif) center no-repeat; + background-size: contain; + display: none; +}*/ + +.fileupload-processing .fileupload-loading { + display: block; +} +.files audio, +.files video { + max-width: 300px; +} + +@media (max-width: 767px) { + .fileupload-buttonbar .toggle, + .files .toggle, + .files .btn span { + display: none; + } + .files .name { + width: 80px; + word-wrap: break-word; + } + .files audio, + .files video { + max-width: 80px; + } +} From 700759029520954a3f198b6fe47dab956990aa84 Mon Sep 17 00:00:00 2001 From: fburatta Date: Fri, 12 Aug 2016 08:25:18 +0200 Subject: [PATCH 46/57] fix file removal on the disk --- fileupload/models.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/fileupload/models.py b/fileupload/models.py index 9a09f77..95041c0 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -1,5 +1,10 @@ # encoding: utf-8 from django.db import models +# Receive the pre_delete signal and delete the file associated with the model instance. +from django.db.models.signals import post_delete +from django.dispatch.dispatcher import receiver + + def upload_dir_path(instance, filename): return 'uploaded_files/%s/%s' % (instance.username, filename) @@ -26,7 +31,13 @@ def save(self, *args, **kwargs): self.slug = self.file.name super(File, self).save(*args, **kwargs) - def delete(self, *args, **kwargs): - """delete -- Remove to leave file.""" - self.file.delete(False) - super(File, self).delete(*args, **kwargs) + # use post_delete signal instead + #def delete(self, *args, **kwargs): + # """delete -- Remove to leave file.""" + # self.file.delete(False) + # super(File, self).delete(*args, **kwargs) + +@receiver(post_delete, sender=File) +def File_delete(sender, instance, **kwargs): + # Pass false so FileField doesn't save the model. + instance.file.delete(False) From 11a96c4a4d5178ec52807132e86970e799fdab73 Mon Sep 17 00:00:00 2001 From: fab Date: Fri, 12 Aug 2016 07:25:10 +0000 Subject: [PATCH 47/57] added apache and selinux configurations --- deploy/apache/apache.conf | 52 +++++++++++++++++++++++++++++++++ deploy/selinux/djuploader2.0.te | 12 ++++++++ 2 files changed, 64 insertions(+) create mode 100644 deploy/apache/apache.conf create mode 100644 deploy/selinux/djuploader2.0.te diff --git a/deploy/apache/apache.conf b/deploy/apache/apache.conf new file mode 100644 index 0000000..0612f85 --- /dev/null +++ b/deploy/apache/apache.conf @@ -0,0 +1,52 @@ +# WSGISocketPrefix +WSGISocketPrefix /var/run/wsgi +WSGIPythonPath /path_to_app:/path_to_virtualenv/lib/python2.7/site-packages + +################### +# web uploads +# + +# config from http://wiki.apache.org/httpd/NameBasedSSLVHosts + SSLEngine on + SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP + + SSLCertificateFile /etc/ssl/certs/cert.com.crt + SSLCertificateKeyFile /etc/ssl/certs/cert.com.key + SSLCertificateChainFile /etc/ssl/certs/StandardSSLCA.pem + SSLVerifyClient None + + ServerName "foo" + ServerAdmin "webmaster@foo" + + CustomLog "/var/log/httpd/upload-access.log" combined + ErrorLog "/var/log/httpd/upload-error.log" + + # Django file uploader + ################################################### + Alias /media/ /var/media-storage/ + AliasMatch ^/([^/]*\.css) /path_to_app/static/css/$1 + Alias /static/ /path_to_app/static/ + + + Require all granted + + + + Require all denied + + + WSGIScriptAlias /secureupload /path_to_app/core/wsgi.py + + + SSLRequireSSL + + + Require all granted + + + + +# END WEBUPLOADS +################# + +# /* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/deploy/selinux/djuploader2.0.te b/deploy/selinux/djuploader2.0.te new file mode 100644 index 0000000..9e96269 --- /dev/null +++ b/deploy/selinux/djuploader2.0.te @@ -0,0 +1,12 @@ + +module djuploader 1.0; + +require { + type httpd_t; + type var_t; + class file { getattr unlink }; +} + +#============= httpd_t ============== +allow httpd_t var_t:file unlink; +allow httpd_t var_t:file getattr; From bded78e8b48c433aa26c0c68e3b2e59affa544f2 Mon Sep 17 00:00:00 2001 From: fab Date: Mon, 22 Aug 2016 08:52:12 +0000 Subject: [PATCH 48/57] hostname changed and related fixes to jquery scripts and django config --- fileupload/admin.py | 4 ++-- fileupload/static/js/main.js | 2 +- fileupload/views.py | 6 +++--- settings.py | 2 +- static/css/jquery.fileupload-ui.css | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index 3504d2e..c8d3c6b 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -24,8 +24,8 @@ def make_download(modeladmin, request, queryset): tarred = tarfile.open(fileobj=response, mode='w:gz') - if not validate_size(queryset,500000000): - messages.warning(request, "Download group is too big, unselect some files or select just 1, max size of multple download: 500 MB") + if not validate_size(queryset,1000000000): + messages.warning(request, "Download group is too big, unselect some files or select just 1, max size of multple download: 1.0 GB") else: diff --git a/fileupload/static/js/main.js b/fileupload/static/js/main.js index 47d960a..3a2add2 100644 --- a/fileupload/static/js/main.js +++ b/fileupload/static/js/main.js @@ -40,7 +40,7 @@ $(function () { // Uncomment the following to send cross-domain cookies: //xhrFields: {withCredentials: true}, //url: $('#fileupload').fileupload('option', 'url'), - url: 'https://ml.moldiscovery.com:8888/uploader/upload/view/', + url: 'https://upload.moldiscovery.com/secureupload/upload/view/', dataType: 'json', context: $('#fileupload')[0] }).always(function () { diff --git a/fileupload/views.py b/fileupload/views.py index cf799f6..0be5568 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -13,7 +13,7 @@ def send_email(response,user): - FROMADDR = "uploads@ml.moldiscovery.com" + FROMADDR = "uploads@www2.moldiscovery.com" LOGIN = FROMADDR #PASSWORD = "" TOADDRS = ["fabrizio@moldiscovery.com"] @@ -23,7 +23,7 @@ def send_email(response,user): for file in response['files']: msg_content += "File Uploaded: "+ file['name'] + '\r\n' msg_content += "File Size: "+ str(file['size']) + ' bytes\r\n' - msg_content += "Download: https://ml.moldiscovery.com:8888/uploader"+ file['url'] + '\r\n\r\n' + msg_content += "Download: https://www2.moldiscovery.com/secureupload/admin/" + '\r\n\r\n' msg = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" % (FROMADDR, ", ".join(TOADDRS), SUBJECT) ) @@ -31,7 +31,7 @@ def send_email(response,user): server = smtplib.SMTP('localhost', 25) #server.set_debuglevel(1) - server.ehlo("ml.moldiscovery.com") + server.ehlo("www2.moldiscovery.com") #server.starttls() #server.login(LOGIN, PASSWORD) server.sendmail(FROMADDR, TOADDRS, msg) diff --git a/settings.py b/settings.py index 7b0689f..7b0832d 100644 --- a/settings.py +++ b/settings.py @@ -3,7 +3,7 @@ DEBUG = False TEMPLATE_DEBUG = DEBUG -ALLOWED_HOSTS = ['www2.moldiscovery.com','localhost','127.0.0.1','ajax.googleapis.com'] +ALLOWED_HOSTS = ['upload.moldiscovery.com','www2.moldiscovery.com','localhost','127.0.0.1','ajax.googleapis.com'] SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) diff --git a/static/css/jquery.fileupload-ui.css b/static/css/jquery.fileupload-ui.css index 693862f..6d96259 100644 --- a/static/css/jquery.fileupload-ui.css +++ b/static/css/jquery.fileupload-ui.css @@ -80,14 +80,14 @@ font-weight: bold; border-top-left-radius: 6px; } -/*.fileupload-loading { +.fileupload-loading { float: right; width: 32px; height: 32px; background: url(../img/loading.gif) center no-repeat; background-size: contain; display: none; -}*/ +} .fileupload-processing .fileupload-loading { display: block; From 14070e290c6bcc6e171a590207498183dcf7acbf Mon Sep 17 00:00:00 2001 From: fab Date: Fri, 24 Jan 2020 13:52:45 +0000 Subject: [PATCH 49/57] give some advise on max file upload size cause: systemd privateTMP for httpd --- fileupload/templates/fileupload/file_jquery_form.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fileupload/templates/fileupload/file_jquery_form.html b/fileupload/templates/fileupload/file_jquery_form.html index b190ed6..1571158 100644 --- a/fileupload/templates/fileupload/file_jquery_form.html +++ b/fileupload/templates/fileupload/file_jquery_form.html @@ -50,7 +50,10 @@

- +

Molecular Discovery Secure File Upload. ( TIP: Compress your files when possible. )

Molecular Discovery Secure File Upload. + MAX cumulative files upload size: 4 GB + TIP: compress or chunck big files before uploading +

From 6c601ac4776f1d458a3c78cdacf62493ad2653c3 Mon Sep 17 00:00:00 2001 From: fab Date: Fri, 24 Jan 2020 14:16:56 +0000 Subject: [PATCH 50/57] minor --- fileupload/templates/fileupload/file_jquery_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileupload/templates/fileupload/file_jquery_form.html b/fileupload/templates/fileupload/file_jquery_form.html index 1571158..e1d5c68 100644 --- a/fileupload/templates/fileupload/file_jquery_form.html +++ b/fileupload/templates/fileupload/file_jquery_form.html @@ -51,7 +51,7 @@ From a6c9defad8032d947e4bbe9995154a7d0579e48c Mon Sep 17 00:00:00 2001 From: fburatta Date: Thu, 14 Mar 2024 08:42:34 +0100 Subject: [PATCH 51/57] added Date field migration --- fileupload/admin.py | 8 +++-- fileupload/migrations/0001_initial.py | 36 +++++++++++++++++++ .../0002_auto__add_field_file_date.py | 33 +++++++++++++++++ fileupload/migrations/__init__.py | 0 fileupload/models.py | 14 +++----- requirements.txt | 5 +-- settings_dev.py | 1 + 7 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 fileupload/migrations/0001_initial.py create mode 100644 fileupload/migrations/0002_auto__add_field_file_date.py create mode 100644 fileupload/migrations/__init__.py diff --git a/fileupload/admin.py b/fileupload/admin.py index c8d3c6b..b9e6c7f 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -6,6 +6,7 @@ from django.contrib import messages from django.conf import settings import os.path, time +import datetime as dt def validate_size(files, maxsize): total_size = 0 @@ -74,13 +75,14 @@ def file_size(obj): file_size.short_description = 'Size' def last_modified(obj): - date_text = "%s" % time.ctime(os.path.getmtime(settings.MEDIA_ROOT+obj.file.name)) + date_text = "%s" % dt.datetime.fromtimestamp(os.path.getmtime(settings.MEDIA_ROOT+obj.file.name)) return date_text class FileAdmin(admin.ModelAdmin): - list_display = ('slug','username', file_size, last_modified) + list_display = ('slug','username', 'date', file_size, last_modified) + list_filter = ('username',) search_fields = ['slug', 'username'] - ordering = ('username','slug') + ordering = ('username','slug', 'date') actions = [make_download,make_archive] diff --git a/fileupload/migrations/0001_initial.py b/fileupload/migrations/0001_initial.py new file mode 100644 index 0000000..3d87f52 --- /dev/null +++ b/fileupload/migrations/0001_initial.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'File' + db.create_table(u'fileupload_file', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)), + ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50, blank=True)), + ('username', self.gf('django.db.models.fields.CharField')(max_length=50)), + )) + db.send_create_signal(u'fileupload', ['File']) + + + def backwards(self, orm): + # Deleting model 'File' + db.delete_table(u'fileupload_file') + + + models = { + u'fileupload.file': { + 'Meta': {'object_name': 'File'}, + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + } + } + + complete_apps = ['fileupload'] \ No newline at end of file diff --git a/fileupload/migrations/0002_auto__add_field_file_date.py b/fileupload/migrations/0002_auto__add_field_file_date.py new file mode 100644 index 0000000..45648fa --- /dev/null +++ b/fileupload/migrations/0002_auto__add_field_file_date.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'File.date' + db.add_column(u'fileupload_file', 'date', + self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'File.date' + db.delete_column(u'fileupload_file', 'date') + + + models = { + u'fileupload.file': { + 'Meta': {'object_name': 'File'}, + 'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + } + } + + complete_apps = ['fileupload'] \ No newline at end of file diff --git a/fileupload/migrations/__init__.py b/fileupload/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/fileupload/models.py b/fileupload/models.py index 95041c0..8f40fa6 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -1,4 +1,5 @@ # encoding: utf-8 +from datetime import datetime from django.db import models # Receive the pre_delete signal and delete the file associated with the model instance. from django.db.models.signals import post_delete @@ -10,13 +11,8 @@ def upload_dir_path(instance, filename): return 'uploaded_files/%s/%s' % (instance.username, filename) class File(models.Model): - """This is a small demo using just two fields. The slug field is really not - necessary, but makes the code simpler. ImageField depends on PIL or - pillow (where Pillow is easily installable in a virtualenv. If you have - problems installing pillow, use a more generic FileField instead. - - """ file = models.FileField(upload_to=upload_dir_path) + date = models.DateTimeField(default=datetime.now, blank=True) slug = models.SlugField(max_length=50, blank=True, verbose_name="file name") username = models.CharField(max_length=50) @@ -27,9 +23,9 @@ def __unicode__(self): def get_absolute_url(self): return ('upload-new', ) - def save(self, *args, **kwargs): - self.slug = self.file.name - super(File, self).save(*args, **kwargs) + # def save(self, *args, **kwargs): + # self.slug = self.file.name + # super(File, self).save(*args, **kwargs) # use post_delete signal instead #def delete(self, *args, **kwargs): diff --git a/requirements.txt b/requirements.txt index 23cb63a..8790390 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ -django<1.6 -pillow +django==1.5.12 +pillow==6.2.2 +South==1.0.2 diff --git a/settings_dev.py b/settings_dev.py index 23fdb0c..4806e13 100644 --- a/settings_dev.py +++ b/settings_dev.py @@ -125,6 +125,7 @@ 'fileupload', # Uncomment the next line to enable the admin: 'django.contrib.admin', + 'south' # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', ) From c3d16a83dd2337152b2a436b4b7d13f2982cb407 Mon Sep 17 00:00:00 2001 From: fburatta Date: Thu, 14 Mar 2024 08:48:09 +0100 Subject: [PATCH 52/57] update db objects date with files last mod date --- utils/update_datefield.py | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 utils/update_datefield.py diff --git a/utils/update_datefield.py b/utils/update_datefield.py new file mode 100644 index 0000000..f8ca3e4 --- /dev/null +++ b/utils/update_datefield.py @@ -0,0 +1,41 @@ +import datetime as dt +import os +from fileupload.models import File +from django.conf import settings + + +def sync_slug(allobj): + """ + fill slug field from file name when missing + """ + for obj in allobj: + obj.slug = os.path.basename(obj.file.name) + obj.save() + print("fix missing slug: %s") % obj.slug + +db_files = File.objects.all() +uploads_path = os.path.join(settings.MEDIA_ROOT,'uploaded_files') +users = set() + +sync_slug(db_files) + +for f in db_files: + users.add(f.username) + +for user_dir in users: + user_files = os.listdir(os.path.join(uploads_path, user_dir)) + print(user_dir + " " + str(len(user_files))) + for fname in user_files: + # only if there are duplicated + print("processa "+ " dir: "+user_dir +" name: " + fname) + qset = File.objects.filter(username=user_dir, slug=fname) + + if not qset: + print("ERROR: file %s/%s not found") % (user_dir, fname) + + if len(qset) > 1: + print("%s/%s is duplicated") % (user_dir, fname) + + obj = qset[0] + obj.date = dt.datetime.fromtimestamp(os.path.getmtime(os.path.join(uploads_path, user_dir,obj.slug))) + obj.save() \ No newline at end of file From bed1a6a36ea7d690288ee00a0bd1e951ce7e410c Mon Sep 17 00:00:00 2001 From: fburatta Date: Thu, 14 Mar 2024 11:25:05 +0100 Subject: [PATCH 53/57] avoid admin crash if files not found --- fileupload/admin.py | 18 +++++++++++++----- fileupload/models.py | 6 +++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index b9e6c7f..d1e01e7 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -69,14 +69,22 @@ def make_archive(modeladmin, request, queryset): def file_size(obj): - if obj.file.size < 1000000: - return ("%s bytes" % (obj.file.size)) - return ("%s MBs" % (obj.file.size/1000000)) + try: + if obj.file.size < 1000000: + return ("%s bytes" % (obj.file.size)) + return ("%s MBs" % (obj.file.size/1000000)) + except OSError: + return ("File Not found") + file_size.short_description = 'Size' def last_modified(obj): - date_text = "%s" % dt.datetime.fromtimestamp(os.path.getmtime(settings.MEDIA_ROOT+obj.file.name)) - return date_text + date_text = "File Not Found" + filepath = settings.MEDIA_ROOT+obj.file.name + if os.path.exists(filepath): + date_text = "%s" % dt.datetime.fromtimestamp(os.path.getmtime(filepath)) + + return date_text class FileAdmin(admin.ModelAdmin): list_display = ('slug','username', 'date', file_size, last_modified) diff --git a/fileupload/models.py b/fileupload/models.py index 8f40fa6..3fcee50 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -23,9 +23,9 @@ def __unicode__(self): def get_absolute_url(self): return ('upload-new', ) - # def save(self, *args, **kwargs): - # self.slug = self.file.name - # super(File, self).save(*args, **kwargs) + def save(self, *args, **kwargs): + self.slug = self.file.name + super(File, self).save(*args, **kwargs) # use post_delete signal instead #def delete(self, *args, **kwargs): From e3322ae467b453644857ecc1975ec8461a4e8299 Mon Sep 17 00:00:00 2001 From: fburatta Date: Thu, 14 Mar 2024 12:21:26 +0100 Subject: [PATCH 54/57] details --- fileupload/admin.py | 7 ++++--- utils/update_datefield.py | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fileupload/admin.py b/fileupload/admin.py index d1e01e7..c924e8d 100644 --- a/fileupload/admin.py +++ b/fileupload/admin.py @@ -78,18 +78,19 @@ def file_size(obj): file_size.short_description = 'Size' +# deprecated def last_modified(obj): date_text = "File Not Found" filepath = settings.MEDIA_ROOT+obj.file.name - if os.path.exists(filepath): + if os.path.exists(filepath): date_text = "%s" % dt.datetime.fromtimestamp(os.path.getmtime(filepath)) return date_text class FileAdmin(admin.ModelAdmin): - list_display = ('slug','username', 'date', file_size, last_modified) + list_display = ('slug','username', 'date', file_size) list_filter = ('username',) - search_fields = ['slug', 'username'] + search_fields = ['slug', 'username', 'date'] ordering = ('username','slug', 'date') actions = [make_download,make_archive] diff --git a/utils/update_datefield.py b/utils/update_datefield.py index f8ca3e4..809a589 100644 --- a/utils/update_datefield.py +++ b/utils/update_datefield.py @@ -29,13 +29,10 @@ def sync_slug(allobj): # only if there are duplicated print("processa "+ " dir: "+user_dir +" name: " + fname) qset = File.objects.filter(username=user_dir, slug=fname) - if not qset: print("ERROR: file %s/%s not found") % (user_dir, fname) - if len(qset) > 1: print("%s/%s is duplicated") % (user_dir, fname) - obj = qset[0] obj.date = dt.datetime.fromtimestamp(os.path.getmtime(os.path.join(uploads_path, user_dir,obj.slug))) obj.save() \ No newline at end of file From e194c7ff0fe57aad17546ec2a87dd7f6227a0dac Mon Sep 17 00:00:00 2001 From: fburatta Date: Thu, 14 Mar 2024 15:52:14 +0100 Subject: [PATCH 55/57] readme update --- README.md | 39 +++++++++++++++++++++------------------ utils/update_datefield.py | 3 +++ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 8f185a9..863f189 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,8 @@ -[jQuery-File-Upload](http://aquantum-demo.appspot.com/file-upload) is developed by Sebastian Tschan, with the source available on [github](https://github.com/blueimp/jQuery-File-Upload). Example code is [ported to Django](https://github.com/sigurdga/django-jquery-file-upload) by Sigurd Gartmann ([sigurdga on github](https://github.com/sigurdga/)). +Disclaimer +========== -Introduction -============ - -This is a small example on how to setup Sebastian Tschan's jQuery File Upload in Django. He has a working demo on his [webpage](http://aquantum-demo.appspot.com/file-upload) and a [github repository](https://github.com/blueimp/jQuery-File-Upload) with an example on how to do it in PHP. - -Here, you'll find a minimal Django project with a minimal app. You can run the example standalone by cloning the repository, running the migrations and starting the server. - -I want to give a thank to [Sebastian Tschan](https://github.com/blueimp), the original author, [Etay Cohen-Solal](https://github.com/et-cs), for the latest major update, and [Jørgen Bergquist](https://github.com/bergquis) for helping me over the first hurdles. - -Features -======== +This project is a fork -* Drag and drop files -* Select multiple files -* Cancel upload -* Delete uploaded file (from database only) -* No flash (or other browser plugins) needed -* … more at the [upstream's features page](http://aquantum-demo.appspot.com/file-upload#features) Requirements ============ @@ -37,6 +22,24 @@ Installation * python manage.py runserver * go to localhost:8000/upload/new/ and upload some files +Developing with docker +====================== + $ docker run -ti --name uploaderdevel -p 8000:8000 -v /workdir/django_uploader:/devel python:2.7.18 bash + $ pip install -r requirements.txt + $ python manage.py runserver 0.0.0.0:8000 + +Database migrations +=================== + +From existing DB + $ python manage.py schemamigration fileupload --initial + $ python manage.py migrate --fake + + +Generate migration and apply + $ python manage.py schemamigration fileupload --auto + $ python manage.py migrate fileupload + License ======= MIT, as the original project. See LICENSE.txt. diff --git a/utils/update_datefield.py b/utils/update_datefield.py index 809a589..b894412 100644 --- a/utils/update_datefield.py +++ b/utils/update_datefield.py @@ -1,3 +1,6 @@ +# This script can be invoked from python manage.py shell. It's aim is to update the Date Field of the fileupload model +# with the dates of existing files in the media storage and associated to the model object + import datetime as dt import os from fileupload.models import File From eef1d0087cda21ae97ecc40801e7ccfdab5c8643 Mon Sep 17 00:00:00 2001 From: fburatta Date: Mon, 18 Mar 2024 11:47:35 +0100 Subject: [PATCH 56/57] fix date null on creation DB error --- README.md | 1 + fileupload/models.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 863f189..a5596da 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Developing with docker ====================== $ docker run -ti --name uploaderdevel -p 8000:8000 -v /workdir/django_uploader:/devel python:2.7.18 bash $ pip install -r requirements.txt + $ export DJANGO_SETTINGS_MODULE=settings_dev $ python manage.py runserver 0.0.0.0:8000 Database migrations diff --git a/fileupload/models.py b/fileupload/models.py index 3fcee50..aff009f 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -12,7 +12,7 @@ def upload_dir_path(instance, filename): class File(models.Model): file = models.FileField(upload_to=upload_dir_path) - date = models.DateTimeField(default=datetime.now, blank=True) + date = models.DateTimeField(auto_now_add=True, blank=True) slug = models.SlugField(max_length=50, blank=True, verbose_name="file name") username = models.CharField(max_length=50) From 2562e32ce1301cb4c618ace3c364a167fd1c24d1 Mon Sep 17 00:00:00 2001 From: fburatta Date: Mon, 18 Mar 2024 11:50:26 +0100 Subject: [PATCH 57/57] forgot migration file --- .../0003_auto__chg_field_file_date.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 fileupload/migrations/0003_auto__chg_field_file_date.py diff --git a/fileupload/migrations/0003_auto__chg_field_file_date.py b/fileupload/migrations/0003_auto__chg_field_file_date.py new file mode 100644 index 0000000..24d9c92 --- /dev/null +++ b/fileupload/migrations/0003_auto__chg_field_file_date.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'File.date' + db.alter_column(u'fileupload_file', 'date', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True)) + + def backwards(self, orm): + + # Changing field 'File.date' + db.alter_column(u'fileupload_file', 'date', self.gf('django.db.models.fields.DateTimeField')()) + + models = { + u'fileupload.file': { + 'Meta': {'object_name': 'File'}, + 'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + } + } + + complete_apps = ['fileupload'] \ No newline at end of file

Molecular Discovery Secure File Upload. - MAX cumulative files upload size: 4 GB + MAX aggregated files upload size: 4 GB TIP: compress or chunck big files before uploading