Merged with the default branch.

test/test_static_chroot.py

@@ -25,6 +25,16 @@ class TestStaticChroot(TestApplicationProto):
             }
         )
 
+    def update_action(self, share, chroot):
+        return self.conf(
+            {"share": share, "chroot": chroot}, 'routes/0/action',
+        )
+
+    def get_custom(self, uri, host):
+        return self.get(
+            url=uri, headers={'Host': host, 'Connection': 'close'}
+        )['status']
+
     def test_static_chroot(self, temp_dir):
         assert self.get(url='/dir/file')['status'] == 200, 'default chroot'
         assert self.get(url='/index.html')['status'] == 200, 'default chroot 2'
@@ -41,6 +51,30 @@ class TestStaticChroot(TestApplicationProto):
         assert self.get(url='/index.html')['status'] == 403, 'chroot 403 2'
         assert self.get(url='/file')['status'] == 403, 'chroot 403'
 
+    def test_share_chroot_array(self, temp_dir):
+        assert 'success' in self.conf(
+            {
+                "share": ["/blah", temp_dir + "/assets$uri"],
+                "chroot": temp_dir + "/assets/dir",
+            },
+            'routes/0/action',
+        ), 'configure share array'
+        assert self.get(url='/dir/file')['status'] == 200, 'share array'
+
+        assert 'success' in self.update_action(
+            ["/blah", temp_dir + '/assets$uri'], temp_dir + '/assets/$host'
+        )
+        assert self.get_custom('/dir/file', 'dir') == 200, 'array variable'
+
+        assert 'success' in self.conf(
+            {
+                "share": ["/blah", "/blah2"],
+                "chroot": temp_dir + "/assets/dir",
+            },
+            'routes/0/action',
+        ), 'configure share array bad'
+        assert self.get()['status'] != 200, 'share array bad'
+
     def test_static_chroot_permission(self, is_su, temp_dir):
         if is_su:
             pytest.skip('does\'t work under root')
@@ -98,6 +132,81 @@ class TestStaticChroot(TestApplicationProto):
 
         assert self.get(url=self.test_path)['status'] == 200, 'relative'
 
+    def test_static_chroot_varibales(self, temp_dir):
+        assert 'success' in self.update_action(
+            temp_dir + '/assets$uri', temp_dir + '/assets/$host'
+        )
+        assert self.get_custom('/dir/file', 'dir') == 200
+
+        assert 'success' in self.update_action(
+            temp_dir + '/assets$uri', temp_dir + '/assets/${host}'
+        )
+        assert self.get_custom('/dir/file', 'dir') == 200
+
+    def test_static_chroot_varibales_buildin_start(self, temp_dir):
+        assert 'success' in self.update_action(
+            temp_dir + '/assets/dir/$host', '$uri/assets/dir'
+        )
+
+        assert self.get_custom(temp_dir, 'file') == 200
+
+    def test_static_chroot_varibales_buildin_mid(self, temp_dir):
+        assert 'success' in self.update_action(
+            temp_dir + '/assets$uri', temp_dir + '/$host/dir'
+        )
+
+        assert self.get_custom('/dir/file', 'assets') == 200
+
+    def test_static_chroot_varibales_buildin_end(self, temp_dir):
+        assert 'success' in self.update_action(
+            temp_dir + '/assets$uri', temp_dir + '/assets/$host'
+        )
+
+        assert self.get_custom('/dir/file', 'dir') == 200
+
+    def test_static_chroot_slash(self, temp_dir):
+        assert 'success' in self.conf(
+            {
+                "share": temp_dir + "/assets$uri",
+                "chroot": temp_dir + "/assets/dir/",
+            },
+            'routes/0/action',
+        ), 'configure chroot slash end'
+
+        assert self.get(url='/dir/file')['status'] == 200, 'slash end'
+        assert self.get(url='/dirxfile')['status'] == 403, 'slash end bad'
+
+        assert 'success' in self.conf(
+            {
+                "share": temp_dir + "/assets$uri",
+                "chroot": temp_dir + "/assets/dir",
+            },
+            'routes/0/action',
+        ), 'configure chroot no slash end'
+
+        assert self.get(url='/dir/file')['status'] == 200, 'no slash end'
+
+        assert 'success' in self.conf(
+            {
+                "share": temp_dir + "/assets$uri",
+                "chroot": temp_dir + "/assets/dir/",
+            },
+            'routes/0/action',
+        ), 'configure chroot slash end 2'
+
+        assert self.get(url='/dir/file')['status'] == 200, 'slash end 2'
+        assert self.get(url='/dirxfile')['status'] == 403, 'slash end 2 bad'
+
+        assert 'success' in self.conf(
+            {
+                "share": temp_dir + "///assets/////$uri",
+                "chroot": temp_dir + "//assets////dir///",
+            },
+            'routes/0/action',
+        ), 'configure chroot multiple slashes'
+
+        assert self.get(url='/dir/file')['status'] == 200, 'multiple slashes'
+
     def test_static_chroot_invalid(self, temp_dir):
         assert 'error' in self.conf(
             {"share": temp_dir, "chroot": True}, 'routes/0/action',
@@ -108,3 +217,10 @@ class TestStaticChroot(TestApplicationProto):
         assert 'error' in self.conf(
             {"share": temp_dir, "mount": "True"}, 'routes/0/action',
         ), 'configure mount error'
+
+        assert 'error' in self.update_action(
+            temp_dir + '/assets$uri', temp_dir + '/assets/d$r$uri'
+        )
+        assert 'error' in self.update_action(
+            temp_dir + '/assets$uri', temp_dir + '/assets/$$uri'
+        )

test/test_static_share.py

@@ -0,0 +1,73 @@
+import os
+from pathlib import Path
+
+import pytest
+
+from unit.applications.proto import TestApplicationProto
+
+
+class TestStaticShare(TestApplicationProto):
+    prerequisites = {}
+
+    @pytest.fixture(autouse=True)
+    def setup_method_fixture(self, temp_dir):
+        os.makedirs(temp_dir + '/assets/dir')
+        os.makedirs(temp_dir + '/assets/dir2')
+
+        Path(temp_dir + '/assets/dir/file').write_text('1')
+        Path(temp_dir + '/assets/dir2/file2').write_text('2')
+
+        assert 'success' in self.conf(
+            {
+                "listeners": {"*:7080": {"pass": "routes"}},
+                "routes": [{"action": {"share": temp_dir + "/assets$uri"}}],
+                "applications": {},
+            }
+        )
+
+    def action_update(self, conf):
+        assert 'success' in self.conf(conf, 'routes/0/action')
+
+    def test_share_array(self, temp_dir):
+        assert self.get(url='/dir/file')['body'] == '1'
+        assert self.get(url='/dir2/file2')['body'] == '2'
+
+        self.action_update({"share": [temp_dir + "/assets/dir$uri"]})
+
+        assert self.get(url='/file')['body'] == '1'
+        assert self.get(url='/file2')['status'] == 404
+
+        self.action_update(
+            {
+                "share": [
+                    temp_dir + "/assets/dir$uri",
+                    temp_dir + "/assets/dir2$uri",
+                ]
+            }
+        )
+
+        assert self.get(url='/file')['body'] == '1'
+        assert self.get(url='/file2')['body'] == '2'
+
+        self.action_update(
+            {
+                "share": [
+                    temp_dir + "/assets/dir2$uri",
+                    temp_dir + "/assets/dir3$uri",
+                ]
+            }
+        )
+
+        assert self.get(url='/file')['status'] == 404
+        assert self.get(url='/file2')['body'] == '2'
+
+    def test_share_array_fallback(self):
+        self.action_update(
+            {"share": ["/blah", "/blah2"], "fallback": {"return": 201}}
+        )
+
+        assert self.get()['status'] == 201
+
+    def test_share_array_invalid(self):
+        assert 'error' in self.conf({"share": []}, 'routes/0/action')
+        assert 'error' in self.conf({"share": {}}, 'routes/0/action')

test/test_static_variables.py

@@ -0,0 +1,80 @@
+import os
+from pathlib import Path
+
+import pytest
+
+from unit.applications.proto import TestApplicationProto
+
+
+class TestStaticVariables(TestApplicationProto):
+    prerequisites = {}
+
+    @pytest.fixture(autouse=True)
+    def setup_method_fixture(self, temp_dir):
+        os.makedirs(temp_dir + '/assets/dir')
+        os.makedirs(temp_dir + '/assets/d$r')
+        Path(temp_dir + '/assets/index.html').write_text('0123456789')
+        Path(temp_dir + '/assets/dir/file').write_text('file')
+        Path(temp_dir + '/assets/d$r/file').write_text('d$r')
+
+        self._load_conf(
+            {
+                "listeners": {"*:7080": {"pass": "routes"}},
+                "routes": [{"action": {"share": temp_dir + "/assets$uri"}}],
+            }
+        )
+
+    def update_share(self, share):
+        if isinstance(share, list):
+            return self.conf(share, 'routes/0/action/share')
+
+        return self.conf('"' + share + '"', 'routes/0/action/share')
+
+    def test_static_varibales(self, temp_dir):
+        assert self.get(url='/index.html')['status'] == 200
+        assert self.get(url='/d$r/file')['status'] == 200
+
+        assert 'success' in self.update_share('$uri')
+        assert self.get(url=temp_dir + '/assets/index.html')['status'] == 200
+
+        assert 'success' in self.update_share(temp_dir + '/assets${uri}')
+        assert self.get(url='/index.html')['status'] == 200
+
+    def test_static_varibales_array(self, temp_dir):
+        assert 'success' in self.update_share(
+            [temp_dir + '/assets$uri', '$uri']
+        )
+
+        assert self.get(url='/dir/file')['status'] == 200
+        assert self.get(url=temp_dir + '/assets/index.html')['status'] == 200
+        assert self.get(url='/blah')['status'] == 404
+
+        assert 'success' in self.conf(
+            {
+                "share": [temp_dir + '/assets$uri', '$uri'],
+                "fallback": {"return": 201},
+            },
+            'routes/0/action',
+        )
+
+        assert self.get(url='/dir/file')['status'] == 200
+        assert self.get(url=temp_dir + '/assets/index.html')['status'] == 200
+        assert self.get(url='/dir/blah')['status'] == 201
+
+    def test_static_varibales_buildin_start(self, temp_dir):
+        assert 'success' in self.update_share('$uri/assets/index.html')
+        assert self.get(url=temp_dir)['status'] == 200
+
+    def test_static_varibales_buildin_mid(self, temp_dir):
+        assert 'success' in self.update_share(temp_dir + '$uri/index.html')
+        assert self.get(url='/assets')['status'] == 200
+
+    def test_static_varibales_buildin_end(self):
+        assert self.get(url='/index.html')['status'] == 200
+
+    def test_static_varibales_invalid(self, temp_dir):
+        assert 'error' in self.update_share(temp_dir + '/assets/d$r$uri')
+        assert 'error' in self.update_share(temp_dir + '/assets/$$uri')
+        assert 'error' in self.update_share(
+            [temp_dir + '/assets$uri', temp_dir + '/assets/dir', '$$uri']
+        )