xapi-stdext-std: Replace String.has_substr with Astring's is_infix

Not only it's more efficient, but it's also more ergonomic

Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.safont@vates.tech>

Author: psafont

ocaml/libs/sexpr/sExpr.ml

@@ -28,7 +28,7 @@ let is_escape_char = function '\\' | '\'' -> true | _ -> false
 (* XXX: This escapes "'c'" and "\'c\'" to "\\'c\\'".
  * They are both unescaped as "'c'". They have been ported
  * to make sure that this corner case is left unchanged.
- * It is worth investigating the use of 
+ * It is worth investigating the use of
  * - Astring.String.Ascii.escape_string
  * - Astring.String.Ascii.unescape
  * that have guaranteed invariants and optimised performances *)

ocaml/libs/xapi-stdext/lib/xapi-stdext-std/xstringext.ml

@@ -58,17 +58,6 @@ module String = struct
     else
       s
 
-  (** has_substr str sub returns true if sub is a substring of str. Simple, naive, slow. *)
-  let has_substr str sub =
-    if String.length sub > String.length str then
-      false
-    else
-      let result = ref false in
-      for start = 0 to String.length str - String.length sub do
-        if String.sub str start (String.length sub) = sub then result := true
-      done ;
-      !result
-
   (** find all occurences of needle in haystack and return all their respective index *)
   let find_all needle haystack =
     let m = String.length needle and n = String.length haystack in

ocaml/libs/xapi-stdext/lib/xapi-stdext-std/xstringext.mli

@@ -31,9 +31,6 @@ module String : sig
   val rtrim : string -> string
   (** FIXME document me|remove me if similar to strip *)
 
-  val has_substr : string -> string -> bool
-  (** True if sub is a substr of str *)
-
   val replace : string -> string -> string -> string
   (** replace all [f] substring in [s] by [t] *)
 

ocaml/libs/xapi-stdext/lib/xapi-stdext-std/xstringext_test.ml

@@ -13,10 +13,6 @@
 
 module XString = Xapi_stdext_std.Xstringext.String
 
-let test_boolean tested_f (name, case, expected) =
-  let check () = Alcotest.(check bool) name expected (tested_f case) in
-  (name, `Quick, check)
-
 let test_string tested_f (name, case, expected) =
   let check () = Alcotest.(check string) name expected (tested_f case) in
   (name, `Quick, check)
@@ -74,26 +70,6 @@ let test_split_f =
   let tests = List.map test specs in
   ("split_f", tests)
 
-let test_has_substr =
-  let spec =
-    [
-      ("", "", true)
-    ; ("", "foo bar", true)
-    ; ("f", "foof", true)
-    ; ("foofo", "foof", false)
-    ; ("foof", "foof", true)
-    ; ("f", "foof", true)
-    ; ("fo", "foof", true)
-    ; ("of", "foof", true)
-    ; ("ff", "foof", false)
-    ]
-  in
-  let test (contained, container, expected) =
-    let name = Printf.sprintf {|"%s" in "%s"|} contained container in
-    test_boolean (XString.has_substr container) (name, contained, expected)
-  in
-  ("has_substr", List.map test spec)
-
 let test_rtrim =
   let spec =
     [
@@ -115,5 +91,4 @@ let test_rtrim =
   ("rtrim", List.map test spec)
 
 let () =
-  Alcotest.run "Xstringext"
-    [test_split; test_split_f; test_has_substr; test_rtrim]
+  Alcotest.run "Xstringext" [test_split; test_split_f; test_rtrim]

ocaml/quicktest/quicktest_http.ml

@@ -99,7 +99,7 @@ module Cookies = struct
       match body with
       | first_line :: _ ->
           D.warn "expected = [%s]; received = [%s]" expected first_line ;
-          Xapi_stdext_std.Xstringext.String.has_substr first_line expected
+          Astring.String.is_infix ~affix:first_line expected
       | _ ->
           false
     in
@@ -210,9 +210,7 @@ module HTML_Escaping = struct
   let bad_command_exp = "<>'\\"&"
 
   let html_escaping expected cmd =
-    let check_result b =
-      Xapi_stdext_std.Xstringext.String.has_substr b expected
-    in
+    let check_result = Astring.String.is_infix ~affix:expected in
     let _, _, _, body = Uds.http_command Xapi_globs.unix_domain_socket cmd in
     match body with
     | first_line :: _ ->

ocaml/xapi/extauth_plugin_ADpbis.ml

@@ -238,7 +238,7 @@ module AuthADlw : Auth_signature.AUTH_MODULE = struct
       pbis_cmd ^ " " ^ List.fold_left (fun p pp -> p ^ " " ^ pp) " " pbis_args
     in
     let debug_cmd =
-      if Stringext.has_substr debug_cmd "--password" then
+      if Astring.String.is_infix ~affix:"--password" debug_cmd then
         "(omitted for security)"
       else
         debug_cmd

ocaml/xapi/map_check.ml

@@ -113,7 +113,7 @@ let assert_value ~field ~key ~attr ~value =
           | Some v ->
               if acc = "" then
                 v
-              else if Xapi_stdext_std.Xstringext.String.has_substr acc v then
+              else if Astring.String.is_infix ~affix:v acc then
                 err value
               else
                 v ^ "," ^ acc

ocaml/xapi/rbac_audit.ml

@@ -362,8 +362,7 @@ and
 
 let has_to_audit action =
   let has_side_effect action =
-    not (Xapi_stdext_std.Xstringext.String.has_substr action ".get")
-    (* TODO: a bit slow? *)
+    not (Astring.String.is_infix ~affix:".get" action)
   in
   (!Xapi_globs.log_getter || has_side_effect action)
   && not
@@ -471,7 +470,7 @@ let allowed_pre_fn ~__context ~action ?args () =
     if
       has_to_audit action
       (* for now, we only cache arg results for destroy actions *)
-      && Xapi_stdext_std.Xstringext.String.has_substr action ".destroy"
+      && Astring.String.is_infix ~affix:".destroy" action
     then
       let args' = add_dummy_args __context action args in
       Some (sexpr_of_parameters __context action args')