Promote tests

Eio doesn't allow filesystem operations to escape the current directory.
This is a safety feature but might break applications.
The tests are changed to avoid the symlinks pointing outside of the
current directory that Dune creates.

Author: Julow

src/server/ocsigen_response.ml

@@ -70,23 +70,18 @@ let respond_not_found ?uri () =
 let respond_file ?headers ?(status = `OK) fname =
   let exception Isnt_a_file in
   try
+    let sw = Stdlib.Option.get (Fiber.get Ocsigen_lib.current_switch) in
+    let env = Stdlib.Option.get (Fiber.get Ocsigen_lib.env) in
     (* Copied from [cohttp-lwt-unix] and adapted to [Body]. *)
+    let file_path = Eio.Path.( / ) env#cwd fname in
     let file_size =
       (* Check this isn't a directory first *)
-      let s =
-        Eio.Path.stat ~follow:true
-          (Eio.Path.( / ) (Stdlib.Option.get (Fiber.get Ocsigen_lib.env))#cwd
-             fname)
-      in
+      let s = Eio.Path.stat ~follow:true file_path in
       if s.Eio.File.Stat.kind <> `Regular_file
       then raise Isnt_a_file
       else s.size
     in
-    let ic =
-      let sw = Stdlib.Option.get (Fiber.get Ocsigen_lib.current_switch) in
-      let env = Stdlib.Option.get (Fiber.get Ocsigen_lib.env) in
-      Eio.Path.(open_in ~sw (env#cwd / fname))
-    in
+    let ic = Eio.Path.open_in ~sw file_path in
     let encoding = Http.Transfer.Fixed (Optint.Int63.to_int64 file_size) in
     let stream write =
       let buf = Cstruct.create 16384 in

test/extensions/deflatemod.t/index.html

@@ -1,33 +1,42 @@
   $ source ../../server-test-helpers.sh
   $ run_server ./test.exe
   ocsigen:main: [WARNING] Command pipe created
-  ocsigen:access:  connection for local-test from  (curl/8.12.1): /index.html
+  cohttp.eio: [INFO] unix:: accept connection
+  ocsigen:access:  connection for local-test from  (curl/8.13.0): /index.html
   ocsigen:ext: [INFO] host found! local-test:0 matches .* 
   ocsigen:ext:staticmod: [INFO] Is it a static file?
   ocsigen:local-file: [INFO] Testing "./index.html".
   ocsigen:local-file: [INFO] checking if file index.html can be sent
   ocsigen:ext: [INFO] Compiling exclusion regexp $^
   ocsigen:local-file: [INFO] Returning "./index.html".
-  ocsigen:access:  connection for local-test from  (curl/8.12.1): /index.html
+  cohttp.eio: [INFO] unix:: disconnected
+  cohttp.eio: [INFO] unix:: accept connection
+  ocsigen:access:  connection for local-test from  (curl/8.13.0): /index.html
   ocsigen:ext: [INFO] host found! local-test:0 matches .* 
   ocsigen:ext:staticmod: [INFO] Is it a static file?
   ocsigen:local-file: [INFO] Testing "./index.html".
   ocsigen:local-file: [INFO] checking if file index.html can be sent
   ocsigen:local-file: [INFO] Returning "./index.html".
-  ocsigen:access:  connection for local-test from  (curl/8.12.1): /empty_dir/
+  cohttp.eio: [INFO] unix:: disconnected
+  cohttp.eio: [INFO] unix:: accept connection
+  ocsigen:access:  connection for local-test from  (curl/8.13.0): /empty_dir/
   ocsigen:ext: [INFO] host found! local-test:0 matches .* 
   ocsigen:ext:staticmod: [INFO] Is it a static file?
   ocsigen:local-file: [INFO] Testing "./empty_dir/".
   ocsigen:local-file: [INFO] Testing "./empty_dir/index.html" as possible index.
   ocsigen:local-file: [INFO] No index and no listing
-  ocsigen:access:  connection for local-test from  (curl/8.12.1): /doesnt_exists.html
+  cohttp.eio: [INFO] unix:: disconnected
+  cohttp.eio: [INFO] unix:: accept connection
+  ocsigen:access:  connection for local-test from  (curl/8.13.0): /doesnt_exists.html
   ocsigen:ext: [INFO] host found! local-test:0 matches .* 
   ocsigen:ext:staticmod: [INFO] Is it a static file?
   ocsigen:local-file: [INFO] Testing "./doesnt_exists.html".
+  cohttp.eio: [INFO] unix:: disconnected
   application: [WARNING] Command received: shutdown
 
 First response is not compressed:
 
+  $ echo "Hello world" > index.html
   $ curl_ "index.html"
   HTTP/1.1 200 OK
   content-type: text/html