More security, middleware upgrade, dj-reg.2.5

core/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-06-20 17:43
+# Generated by Django 1.11.29 on 2020-06-20 21:27
 from __future__ import unicode_literals
 
 from django.conf import settings

core/view_surveys.py

@@ -1,13 +1,16 @@
-from django.conf import settings
-#from . import fileAbstraction
-from django.shortcuts import render_to_response
-from django.http import HttpResponse, Http404
 import os, stat
 import re
-from troggle.core.models_survex import SurvexScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile
-import parsers.surveys
 import urllib.request, urllib.parse, urllib.error
 
+from django.conf import settings
+from django.shortcuts import render_to_response
+from django.http import HttpResponse, Http404
+
+from troggle.core.models_survex import SurvexScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile
+from troggle.flatpages import views as flatviews
+import parsers.surveys
+#from . import fileAbstraction
+
 def fa_readFile(*path):
     try:
         f = open(os.path.join(settings.FILES, *path))
@@ -15,22 +18,13 @@ def fa_readFile(*path):
         f = urllib.request.urlopen(settings.FILES+"download/")
     return f.read()
     
-def getMimeType(extension):
-    try:
-        return {"txt": "text/plain",
-                "html": "text/html",
-                }[extension]
-    except:
-        print("unknown file type")
-        return "text/plain"
-
 def upload(request, path):
     pass
 
 def download(request, path):
     #try:
         
-        return HttpResponse(fa_readFile(path), content_type=getMimeType(path.split(".")[-1]))
+        return HttpResponse(fa_readFile(path), content_type=flatviews.getmimetype(path))
     #except:
     #    raise Http404
 
@@ -82,7 +76,8 @@ def surveyscansfolder(request, path):
 def surveyscansingle(request, path, file):
     survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.parse.unquote(path))
     survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file)
-    return HttpResponse(content=open(survexscansingle.ffile,"rb"), content_type=getMimeType(path.split(".")[-1]))
+    print("SSS {} {} :{}:".format(path, file, flatviews.getmimetype(file)))
+    return HttpResponse(content=open(survexscansingle.ffile,"rb"), content_type=flatviews.getmimetype(file))
     #return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings })
 
 def expofilessingle(request, filepath):
@@ -92,7 +87,7 @@ def expofilessingle(request, filepath):
 
 def cssfilessingle(request, filepath):
     fn=urllib.parse.unquote(filepath)
-    return HttpResponse(content=open(settings.MEDIA_ROOT+fn,"rb"),content_type="text/css")
+    return HttpResponse(content=open(settings.MEDIA_ROOT+fn,"r"),content_type="text/css")
 
 def surveyscansfolders(request):
     survexscansfolders = SurvexScansFolder.objects.all()