Forbide response 20 with an empty mime type.

Author: Tim-ats-d

mehari-eio/file.ml

@@ -1,6 +1,6 @@
 let not_found = Mehari.(response not_found "")
 
-let response_document ?mime path =
+let response_document ?(mime = Mehari.app_octet_stream) path =
   try
     let chunk_size = 16384 in
     let body =
@@ -24,7 +24,7 @@ let response_document ?mime path =
               in
               loop ()))
     in
-    Option.value mime ~default:Mehari.no_mime |> Mehari.response_body body
+    Mehari.response_body body mime
   with Eio.Io _ -> not_found
 
 include

mehari-lwt-unix/file.ml

@@ -89,10 +89,9 @@ let read_chunks path =
 
 let not_found = Mehari_io.respond Mehari.not_found ""
 
-let respond_document ?mime path =
+let respond_document ?(mime = Mehari.app_octet_stream) path =
   let* exists = Lwt_unix.file_exists path in
   if exists then
-    let mime = Option.value mime ~default:Mehari.no_mime in
     let* chunks = read_chunks path in
     let* cs = chunks () in
     Mehari_io.respond_body (Mehari.seq (fun () -> cs)) mime

mehari/mehari.ml

@@ -32,7 +32,6 @@ let page = Response.page
 let make_mime = Mime.make_mime
 let from_filename = Mime.from_filename
 let from_content = Mime.from_content
-let no_mime = Mime.no_mime
 let gemini = Mime.gemini
 let app_octet_stream = Mime.app_octet_stream
 let plaintext = Mime.plaintext

mehari/mehari.mli

@@ -205,6 +205,8 @@ val make_mime : ?charset:string -> string -> mime
     [charset]. Charset defaults to [utf-8] if mime type begins with
     [text/].
 
+    @raise Invalid_argument if [mime] is an empty string
+
     @see < https://www.rfc-editor.org/rfc/rfc2046#section-4.1.2 >
       For a description of the "charset" parameter. *)
 
@@ -220,9 +222,6 @@ val from_content : ?charset:string -> tree:Conan.Tree.t -> string -> mime option
     performing a mime lookup based on content [c]. [tree] is the tree used to
     build the MIME database. *)
 
-val no_mime : mime
-(** Represents the absence of a mime. This is a shortcut for [make_mime ""]. *)
-
 val gemini : ?charset:string -> ?lang:string list -> unit -> mime
 (** [gemini ?charset ?lang ()] is [text/gemini; charset=...; lang=...].
 
@@ -373,8 +372,8 @@ module type FS = sig
   (** Same as {!val:Mehari.response} but respond with content of given
       [filename] and use given {!type:Mehari.mime} as mime type.
       If [filename] is not present on filesystem, responds with
-      {!val:Mehari.not_found}. If [mime] parameter is not supplied, use
-      {!val:Mehari.no_mime} as mime type. *)
+      {!val:Mehari.not_found}. If [mime] parameter is not supplied, document is
+      served as {!val:Mehari.app_octet_stream}. *)
 
   val static :
     ?handler:(dir_path -> handler) ->
@@ -399,6 +398,9 @@ module type FS = sig
   will be generated by calling [dir_listing [ filename; ... ] request].
   [index] is default on [index.gmi].
 
+  Mime type of the served ressource is guessed by checking file name.
+  Note that file names of the form [*.gmi] will be served as [text/gemini].
+
   [show_hidden] decides whether hidden files should be listed. It defaults to
   [false] for security reasons. *)
 end

mehari/mime.ml

@@ -1,16 +1,16 @@
 type t = { mime : string; charset : string option; lang : string list }
 
-let make_mime ?charset mime =
-  {
-    mime;
-    charset =
-      (match charset with
-      | None when String.starts_with ~prefix:"text/" mime -> Some "utf-8"
-      | _ -> None);
-    lang = [];
-  }
-
-let no_mime = make_mime ""
+let make_mime ?charset = function
+  | "" -> raise (Invalid_argument "Mehari.make_mime")
+  | mime ->
+      {
+        mime;
+        charset =
+          (match charset with
+          | None when String.starts_with ~prefix:"text/" mime -> Some "utf-8"
+          | _ -> None);
+        lang = [];
+      }
 
 let gemini ?charset ?(lang = []) () =
   { (make_mime ?charset "text/gemini") with lang }

mehari/static.ml

@@ -50,11 +50,10 @@ module Make (Dir : DIR) (Addr : Types.T) :
     let fname = Request.param req 1 in
     let mime =
       match Mime.from_filename fname with
-      | None when Filename.check_suffix fname ".gmi" -> Mime.gemini ()
-      | None -> Mime.no_mime
-      | Some m -> m
+      | None when Filename.check_suffix fname ".gmi" -> Some (Mime.gemini ())
+      | (None | Some _) as m -> m
     in
-    Dir.response_document ~mime path
+    Dir.response_document ?mime path
 
   let parent_path =
     Re.(compile (seq [ Re.group (seq [ rep1 any; char '/' ]); rep1 any ]))