[Libguestfs] [PATCH v2 06/11] v2v: nbdkit: Add support for nbdkit-curl-plugin.

[Richard W.M. Jones]

---
 v2v/nbdkit.ml  | 23 +++++++++++++++++++++++
 v2v/nbdkit.mli | 13 +++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/v2v/nbdkit.ml b/v2v/nbdkit.ml
index d21c862b3..4bbb8f043 100644
--- a/v2v/nbdkit.ml
+++ b/v2v/nbdkit.ml
@@ -261,6 +261,29 @@ let create_ssh ~password ?port ~server ?user path =
 
   common_create "ssh" (get_args ()) []
 
+(* Create an nbdkit module specialized for reading from Curl sources. *)
+let create_curl ?cookie ~password ?(sslverify=true) ?user url =
+  let add_arg, get_args =
+    let args = ref [] in
+    let add_arg a = List.push_front a args in
+    let get_args () = List.rev !args in
+    add_arg, get_args in
+
+  Option.may (fun s -> add_arg (sprintf "user=%s" s)) user;
+  (match password with
+   | NoPassword -> ()
+   | AskForPassword -> add_arg "password=-"
+   | PasswordFile password_file ->
+      add_arg (sprintf "password=+%s" password_file)
+  );
+  (* https://bugzilla.redhat.com/show_bug.cgi?id=1146007#c10 *)
+  add_arg "timeout=2000";
+  Option.may (fun s -> add_arg (sprintf "cookie=%s" s)) cookie;
+  if not sslverify then add_arg "sslverify=false";
+  add_arg (sprintf "url=%s" url);
+
+  common_create "curl" (get_args ()) []
+
 let run { args; env } =
   (* Create a temporary directory where we place the sockets. *)
   let tmpdir =
diff --git a/v2v/nbdkit.mli b/v2v/nbdkit.mli
index 36faff03b..efbb62f98 100644
--- a/v2v/nbdkit.mli
+++ b/v2v/nbdkit.mli
@@ -59,6 +59,19 @@ val create_ssh : password:password ->
 
     Note this doesn't run nbdkit yet, it just creates the object. *)
 
+val create_curl : ?cookie:string ->
+                  password:password ->
+                  ?sslverify:bool ->
+                  ?user:string ->
+                  string -> t
+(** Create a nbdkit object using the Curl plugin.  The required
+    string parameter is the URL.
+
+    This can fail (calling [error]) for a variety of reasons, such
+    as nbdkit not being available, wrong version, missing plugin, etc.
+
+    Note this doesn't run nbdkit yet, it just creates the object. *)
+
 val run : t -> string
 (** Start running nbdkit.
 
-- 
2.22.0