From 4965f1eae5bb56c47c7acf295822afb1108f624e Mon Sep 17 00:00:00 2001

From: "Richard W.M. Jones" <rjones@redhat.com>

Date: Fri, 13 Oct 2017 17:01:04 +0100

Subject: [PATCH] v2v: vCenter: Split up get_session_cookie function.

This is a small refactoring where we split get_session_cookie into a

function to fetch the URL and a function to parse the cookie.

(cherry picked from commit 2052fb7d1f9a173d71ab88358281def0c6b03f06)

---

 v2v/vCenter.ml | 106 ++++++++++++++++++++++++++++++++-------------------------

 1 file changed, 59 insertions(+), 47 deletions(-)

diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml

index 341a40b25..7fc0811a4 100644

--- a/v2v/vCenter.ml

+++ b/v2v/vCenter.ml

@@ -124,6 +124,45 @@ let rec map_source ?readahead ?password dcPath uri scheme server path =

     sslverify = sslverify }

 and get_session_cookie password scheme uri sslverify https_url =

+  let status, headers, dump_response =

+    fetch_headers_from_url password scheme uri sslverify https_url in

+

+  if status = "401" then (

+    dump_response stderr;

+    if uri.uri_user <> None then

+      error (f_"vcenter: incorrect username or password")

+    else

+      error (f_"vcenter: incorrect username or password.  You might need to specify the username in the URI like this: %s://USERNAME@[etc]")

+            scheme

+  );

+

+  if status = "404" then (

+    dump_response stderr;

+    error (f_"vcenter: URL not found: %s") https_url

+  );

+

+  if status <> "200" then (

+    dump_response stderr;

+    error (f_"vcenter: invalid response from server")

+  );

+

+  (* Get the cookie. *)

+  let rec loop = function

+    | [] ->

+       dump_response stderr;

+       warning (f_"vcenter: could not read session cookie from the vCenter Server, conversion may consume all sessions on the server and fail part way through");

+       None

+    | ("set-cookie", cookie) :: _ ->

+       let cookie, _ = String.split ";" cookie in

+       Some cookie

+

+    | _ :: headers ->

+       loop headers

+  in

+  loop headers

+

+(* Fetch the status and reply headers from a URL. *)

+and fetch_headers_from_url password scheme uri sslverify https_url =

   let curl_args = ref [

     "head", None;

     "silent", None;

@@ -153,53 +192,26 @@ and get_session_cookie password scheme uri sslverify https_url =

   if verbose () then dump_response stderr;

+  let statuses, headers =

+    List.partition (

+      fun line ->

+        let len = String.length line in

+        len >= 12 && String.sub line 0 5 = "HTTP/"

+    ) lines in

+

   (* Look for the last HTTP/x.y NNN status code in the output. *)

-  let status = ref "" in

-  List.iter (

-    fun line ->

-      let len = String.length line in

-      if len >= 12 && String.sub line 0 5 = "HTTP/" then

-        status := String.sub line 9 3

-  ) lines;

-  let status = !status in

-  if status = "" then (

-    dump_response stderr;

-    error (f_"vcenter: no status code in output of ‘curl’ command.  Is ‘curl’ installed?")

-  );

-

-  if status = "401" then (

-    dump_response stderr;

-    if uri.uri_user <> None then

-      error (f_"vcenter: incorrect username or password")

-    else

-      error (f_"vcenter: incorrect username or password.  You might need to specify the username in the URI like this: %s://USERNAME@[etc]")

-            scheme

-  );

-

-  if status = "404" then (

-    dump_response stderr;

-    error (f_"vcenter: URL not found: %s") https_url

-  );

-

-  if status <> "200" then (

-    dump_response stderr;

-    error (f_"vcenter: invalid response from server")

-  );

-

-  (* Get the cookie. *)

-  let rec loop = function

+  let status =

+    match statuses with

     | [] ->

        dump_response stderr;

-       warning (f_"vcenter: could not read session cookie from the vCenter Server, conversion may consume all sessions on the server and fail part way through");

-       None

-    | line :: lines ->

-       let len = String.length line in

-       if len >= 12 && String.sub line 0 12 = "Set-Cookie: " then (

-         let line = String.sub line 12 (len-12) in

-         let cookie, _ = String.split ";" line in

-         Some cookie

-       )

-       else

-         loop lines

-  in

-  loop lines

+       error (f_"vcenter: no status code in output of ‘curl’ command.  Is ‘curl’ installed?")

+    | ss -> String.sub (List.hd (List.rev ss)) 9 3 in

+

+  let headers =

+    List.map (

+      fun header ->

+        let h, c = String.split ": " header in

+        String.lowercase_ascii h, c

+    ) headers in

+

+  status, headers, dump_response

-- 

2.14.3