Merge branch 'hotfix/0.26.1'

Author: Roey Darwish Dror

flask_app/app.yml

@@ -1,4 +1,4 @@
 app_name: scotty
-APP_VERSION: 0.26.0
+APP_VERSION: 0.26.1
 SECURITY_PASSWORD_HASH: sha512_crypt
 SQLALCHEMY_TRACK_MODIFICATIONS: false

flask_app/blueprints/beams.py

@@ -96,11 +96,15 @@ def create(user):
     if not is_valid_hostname(request.json['beam']['host']):
         return 'Invalid hostname', http.client.CONFLICT
 
+    directory = request.json['beam']['directory']
+    if directory == '/':
+        return 'Invalid beam directory', http.client.CONFLICT
+
     beam = Beam(
         start=current_timeline.datetime.utcnow(), size=0,
         host=request.json['beam']['host'],
         comment=request.json['beam'].get('comment'),
-        directory=request.json['beam']['directory'],
+        directory=directory,
         initiator=user.id,
         error=None,
         combadge_contacted=False,
@@ -164,7 +168,7 @@ def update(beam_id):
     else:
         json = request.json
 
-    if 'completed' in request.json:
+    if 'completed' in json:
         beam.completed = json['completed']
         beam.error = json.get('error', None)
 

tests/slashconf.py

@@ -207,6 +207,7 @@ def download_dir(tempdir):
 @slash.fixture
 def beam(scotty, local_beam_dir):
     beam = scotty.get_beam(scotty.beam_up(local_beam_dir))
+    assert beam.completed
     return BeamInfo(beam, None)
 
 

tests/test_deployment/test__sanity.py

@@ -1,10 +1,19 @@
 import subprocess
-
+import http.client
+import slash
+from requests.exceptions import HTTPError
 
 def test_sanity(scotty):
     scotty.sanity_check()
 
 
+def test_forbid_root_beam(scotty):
+    with slash.assert_raises(HTTPError) as e:
+        scotty.beam_up("/")
+
+    assert e.exception.response.status_code == http.client.CONFLICT
+
+
 def test_independent_beam(beam, local_beam_dir, download_dir):
     for file_ in beam.beam.iter_files():
         file_.download(download_dir)