software/dufs: serve index.html files instead of directory index

0a35458f · Jérome Perrin · 165e3aa6 · 0a35458f · 0a35458f · 0a35458f
Commit 0a35458f authored Jan 16, 2024 by Jérome Perrin
Showing with 22 additions and 1 deletion

software/dufs/buildout.hash.cfg software/dufs/buildout.hash.cfg +1 -1

software/dufs/instance.cfg.in software/dufs/instance.cfg.in +1 -0

software/dufs/test/test.py software/dufs/test/test.py +20 -0

No files found.
--- a/software/dufs/buildout.hash.cfg
+++ b/software/dufs/buildout.hash.cfg
@@ -15,4 +15,4 @@

 [instance.cfg.in]
 filename = instance.cfg.in
-md5sum = 6edf5c64bf25dfd2e6e8a4e74c9b9812
+md5sum = b7da4404a3a773a8aafb88ab9785ea72
--- a/software/dufs/instance.cfg.in
+++ b/software/dufs/instance.cfg.in
@@ -155,6 +155,7 @@ command-line =
    --enable-cors
    --bind ${:ip}
    --port ${:port}
+    --render-try-index
    --allow-all
    --auth-method basic
    --auth ${admin-password:user}:${admin-password:passwd}@/:rw

--- a/software/dufs/test/test.py
+++ b/software/dufs/test/test.py
@@ -91,6 +91,26 @@ class TestFileServer(SlapOSInstanceTestCase):
      self.assertNotIn('secret', resp.text)
      self.assertEqual(resp.status_code, requests.codes.ok)

+  def test_index(self):
+    pub = pathlib.Path(self.computer_partition_root_path) / 'srv' / 'www' / 'pub'
+    (pub / 'with-index').mkdir()
+    (pub / 'with-index' / 'index.html').write_text('<html>Hello !</html>')
+    self.assertEqual(
+      requests.get(
+        urllib.parse.urljoin(self.connection_parameters['public-url'], 'with-index/'),
+        verify=self.ca_cert,
+      ).text,
+      '<html>Hello !</html>')
+
+    (pub / 'without-index').mkdir()
+    (pub / 'without-index' / 'file.txt').write_text('Hello !')
+    self.assertIn(
+      'file.txt',
+      requests.get(
+        urllib.parse.urljoin(self.connection_parameters['public-url'], 'without-index/'),
+        verify=self.ca_cert,
+      ).text)
+
  def test_upload_file_refused_without_auth(self):
    parsed_upload_url = urllib.parse.urlparse(self.connection_parameters['upload-url'])
    # upload-url has username:password, remove it