Config download file name, require auth for config upload, support legacy file access

Author: jcoffland

src/py/bbctrl/Config.py

@@ -31,7 +31,6 @@
 import copy
 import glob
 import re
-import socket
 import datetime
 
 from . import util
@@ -273,15 +272,10 @@ def reset(self):
         self.ctrl.events.emit('invalidate-all')
 
 
-    def get_filename(self):
-        fmt = socket.gethostname() + '-%Y%m%d-%H%M%S.json'
-        return datetime.datetime.now().strftime(fmt)
-
-
     def backup(self):
         path = 'upload/configs'
         if not os.path.exists(path): os.makedirs(path)
-        path += '/' + self.get_filename()
+        path += '/' + util.get_config_filename()
 
         with open(path, 'w') as f:
             json.dump(self.load(), f, indent = 2, separators = (',', ': '))

src/py/bbctrl/FileSystemHandler.py

@@ -50,15 +50,23 @@ def get_fs(self): return self.get_ctrl().fs
     def delete(self, path): self.get_fs().delete(clean_path(path))
 
 
-    def put(self, path):
-        path = clean_path(path)
+    def put(self, path = None):
+        if path is not None:
+            path = clean_path(path)
+
+            if 'file' in self.request.files:
+                self.get_fs().mkdir(os.path.dirname(path))
+                file = self.request.files['file'][0]
+                self.get_fs().write(path, file['body'])
+
+            else: self.get_fs().mkdir(clean_path(path))
 
-        if 'file' in self.request.files:
-            self.get_fs().mkdir(os.path.dirname(path))
-            file = self.request.files['file'][0]
+        elif 'gcode' in self.request.files: # Backwards compatibility
+            file = self.request.files['gcode'][0]
+            path = 'Home/' + clean_path(os.path.basename(file['filename']))
             self.get_fs().write(path, file['body'])
 
-        else: self.get_fs().mkdir(path)
+        os.sync()
 
 
     @gen.coroutine

src/py/bbctrl/Web.py

@@ -178,7 +178,8 @@ def put(self, device, action):
 
 class ConfigDownloadHandler(APIHandler):
     def set_default_headers(self):
-        filename = self.get_ctrl().config.get_filename()
+        # NOTE get_ctrl() not accessible from here because it needs get_cookie()
+        filename = util.get_config_filename()
         self.set_header('Content-Type', 'application/octet-stream')
         self.set_header('Content-Disposition',
                         'attachment; filename="%s"' % filename)
@@ -195,6 +196,7 @@ def get(self, action):
 
 
     def put(self, action):
+        self.authorize()
         if   action == 'save':   self.get_ctrl().config.save(self.json)
         elif action == 'reset':  self.get_ctrl().config.reset()
         elif action == 'backup': self.get_ctrl().config.backup()
@@ -522,6 +524,7 @@ def __init__(self, args, ioloop):
             (r'/api/upgrade',                   UpgradeHandler),
             (r'/api/usb/eject/(.*)',            USBEjectHandler),
             (r'/api/fs/(.*)',                   FileSystemHandler),
+            (r'/api/file',                      FileSystemHandler), # Compat
             (r'/api/macro/(\d+)',               MacroHandler),
             (r'/api/(path)/(.*)',               PathHandler),
             (r'/api/(positions)/(.*)',          PathHandler),

src/py/bbctrl/util.py

@@ -28,6 +28,7 @@
 from datetime import datetime
 import pkg_resources
 from pkg_resources import Requirement, resource_filename
+import socket
 
 
 _version = pkg_resources.require('bbctrl')[0].version
@@ -53,5 +54,9 @@ def version_less(a, b): return parse_version(a) < parse_version(b)
 def timestamp(): return datetime.now().strftime('%Y%m%d-%H%M%S')
 
 
+def get_config_filename():
+  return socket.gethostname() + datetime.now().strftime('-%Y%m%d-%H%M%S.json')
+
+
 def timestamp_to_iso8601(ts):
   return datetime.fromtimestamp(ts).replace(microsecond = 0).isoformat() + 'Z'