404 on illegal package name (#2682)

* 404 on illegal package name * Fix similar cases * Formatting --------- Co-authored-by: Cuihtlauac ALVARADO <[email protected]>
ocaml · Sep 6, 2024 · 4e72a7a · 4e72a7a
1 parent 3348a3f
commit 4e72a7a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/src/ocamlorg_package/lib/ocamlorg_package.ml b/src/ocamlorg_package/lib/ocamlorg_package.ml
@@ -1,6 +1,12 @@
 module Import = Import
 open Import
-module Name = OpamPackage.Name
+
+module Name = struct
+  include OpamPackage.Name
+
+  let of_string_opt str = try Some (of_string str) with _ -> None
+end
+
 module Version = OpamPackage.Version
 module Info = Info
 module Statistics = Packages_stats

diff --git a/src/ocamlorg_package/lib/ocamlorg_package.mli b/src/ocamlorg_package/lib/ocamlorg_package.mli
@@ -12,6 +12,7 @@ module Name : sig
   val compare : t -> t -> int
   val to_string : t -> string
   val of_string : string -> t
+  val of_string_opt : string -> t option
 
   module Map : OpamStd.MAP with type key := t
 end

diff --git a/src/ocamlorg_web/lib/handler.ml b/src/ocamlorg_web/lib/handler.ml
@@ -797,6 +797,7 @@ let is_ocaml_yet t id req =
            category.packages)
     |> List.filter_map (fun (p : Data.Is_ocaml_yet.package) ->
            let name = Ocamlorg_package.Name.of_string p.name in
+           (* FIXME: Failure *)
            match Ocamlorg_package.get_latest t name with
            | Some x -> Some x
            | None ->
@@ -913,7 +914,9 @@ let packages_autocomplete_fragment t req =
   | _ -> Dream.html ""
 
 let package_overview t kind req =
-  let name = Ocamlorg_package.Name.of_string @@ Dream.param req "name" in
+  let</>? name =
+    Ocamlorg_package.Name.of_string_opt @@ Dream.param req "name"
+  in
   let version_from_url = Dream.param req "version" in
   let</>? package, frontend_package =
     Package_helper.of_name_version t name version_from_url
@@ -1043,15 +1046,19 @@ let package_overview t kind req =
        ~search_index_digest ~toc ~deps_and_conflicts frontend_package)
 
 let package_versions t _kind req =
-  let name = Ocamlorg_package.Name.of_string @@ Dream.param req "name" in
+  let</>? name =
+    Ocamlorg_package.Name.of_string_opt @@ Dream.param req "name"
+  in
   let version_from_url = Dream.param req "version" in
   let</>? _package, frontend_package =
     Package_helper.of_name_version t name version_from_url
   in
   Dream.html (Ocamlorg_frontend.package_versions frontend_package)
 
 let package_documentation t kind req =
-  let name = Ocamlorg_package.Name.of_string @@ Dream.param req "name" in
+  let</>? name =
+    Ocamlorg_package.Name.of_string_opt @@ Dream.param req "name"
+  in
   let version_from_url = Dream.param req "version" in
   let</>? package, frontend_package =
     Package_helper.of_name_version t name version_from_url
@@ -1185,7 +1192,9 @@ let package_documentation t kind req =
            ~content:doc.content frontend_package)
 
 let package_file t kind req =
-  let name = Ocamlorg_package.Name.of_string @@ Dream.param req "name" in
+  let</>? name =
+    Ocamlorg_package.Name.of_string_opt @@ Dream.param req "name"
+  in
   let version_from_url = Dream.param req "version" in
   let</>? package, frontend_package =
     Package_helper.of_name_version t name version_from_url
@@ -1210,7 +1219,9 @@ let package_file t kind req =
        ~search_index_digest ~content_title:path ~toc frontend_package)
 
 let package_search_index t kind req =
-  let name = Ocamlorg_package.Name.of_string @@ Dream.param req "name" in
+  let</>? name =
+    Ocamlorg_package.Name.of_string_opt @@ Dream.param req "name"
+  in
   let version_from_url = Dream.param req "version" in
   let</>? package, _ = Package_helper.of_name_version t name version_from_url in
   let open Lwt.Syntax in