Update unikernel with new build from builds.robur.coop

albatross.ml

@@ -1,3 +1,7 @@
+let ( let* ) = Result.bind
+
+module String_set = Set.Make (String)
+
 module Make (T : Mirage_time.S) (P : Mirage_clock.PCLOCK) (S : Tcpip.Stack.V4V6) =
 struct
   module TLS = Tls_mirage.Make (S.TCP)
@@ -91,6 +95,130 @@ struct
             }
     | Error (`Msg err) -> Error err
 
+  let manifest_devices_match ~bridges ~block_devices binary =
+    let cachet =
+      let map () ~pos len =
+        if pos >= String.length binary || len <= 0 then
+          (Cachet.Bstr.empty :> Cachet.bigstring)
+        else
+          let len = min len (max 0 (String.length binary - pos)) in
+          let b : Cachet.bigstring =
+            Bigarray.Array1.create Bigarray.char Bigarray.c_layout len
+          in
+          for i = 0 to len - 1 do
+            b.{i} <- binary.[pos + i]
+          done;
+          b
+      in
+      Cachet.make ~cachesize:8 ~map ()
+    in
+    let* mft : Solo5_elftool.mft = Solo5_elftool.query_manifest cachet in
+    let req_bridges =
+      List.map (fun (name, _, _) -> name) bridges |> String_set.of_list
+    and req_block_devices =
+      List.map (fun (name, _, _) -> name) block_devices |> String_set.of_list
+    and mft_bridges =
+      List.filter_map
+        (function Solo5_elftool.Dev_net_basic name -> Some name | _ -> None)
+        mft.Solo5_elftool.entries
+      |> String_set.of_list
+    and mft_block_devices =
+      List.filter_map
+        (function Solo5_elftool.Dev_block_basic name -> Some name | _ -> None)
+        mft.Solo5_elftool.entries
+      |> String_set.of_list
+    in
+    let req_only_bridges = String_set.(diff req_bridges mft_bridges |> elements)
+    and mft_only_bridges = String_set.(diff mft_bridges req_bridges |> elements)
+    and req_only_blocks =
+      String_set.(diff req_block_devices mft_block_devices |> elements)
+    and mft_only_blocks =
+      String_set.(diff mft_block_devices req_block_devices |> elements)
+    in
+    match
+      (req_only_bridges, mft_only_bridges, req_only_blocks, mft_only_blocks)
+    with
+    | [], [], [], [] -> Ok ()
+    | req_only_bridges, [], [], [] ->
+        Error
+          (`Msg
+             ("Extra network interfaces specified: "
+             ^ String.concat ", " req_only_bridges
+             ^ ". Please remove them from the 'network_interfaces' list of \
+                your configuration."))
+    | [], mft_only_bridges, [], [] ->
+        Error
+          (`Msg
+             ("Missing required network interfaces: "
+             ^ String.concat ", " mft_only_bridges
+             ^ ". Please add them to the 'network_interfaces' list of your \
+                configuration."))
+    | [], [], req_only_blocks, [] ->
+        Error
+          (`Msg
+             ("Extra block devices specified: "
+             ^ String.concat ", " req_only_blocks
+             ^ ". Please remove them from the 'block_devices' list of your \
+                configuration."))
+    | [], [], [], mft_only_blocks ->
+        Error
+          (`Msg
+             ("Missing required block devices: "
+             ^ String.concat ", " mft_only_blocks
+             ^ ". Please add them to the 'block_devices' list of your \
+                configuration."))
+    | req_only_bridges, [], req_only_blocks, [] ->
+        Error
+          (`Msg
+             ("Extra network interfaces: "
+             ^ String.concat ", " req_only_bridges
+             ^ " and extra block devices: "
+             ^ String.concat ", " req_only_blocks
+             ^ ". Please remove them from the 'network_interfaces' lists and \
+                'block_devices' list of your configuration."))
+    | [], mft_only_bridges, [], mft_only_blocks ->
+        Error
+          (`Msg
+             ("Missing network interfaces: "
+             ^ String.concat ", " mft_only_bridges
+             ^ " and missing block devices: "
+             ^ String.concat ", " mft_only_blocks
+             ^ ". Please add them to the 'network_interfaces' lists and \
+                'block_devices' list of your configuration."))
+    | req_only_bridges, [], [], mft_only_blocks ->
+        Error
+          (`Msg
+             ("Extra network interfaces: "
+             ^ String.concat ", " req_only_bridges
+             ^ " and missing block devices: "
+             ^ String.concat ", " mft_only_blocks
+             ^ ". Please remove the network interfaces from the \
+                'network_interfaces' list and add the block devices to the \
+                'block_devices' list of your configuration."))
+    | [], mft_only_bridges, req_only_blocks, [] ->
+        Error
+          (`Msg
+             ("Missing network interfaces: "
+             ^ String.concat ", " mft_only_bridges
+             ^ " and extra block devices: "
+             ^ String.concat ", " req_only_blocks
+             ^ ". Please add the network interfaces to the \
+                'network_interfaces' list and remove the block devices from \
+                the 'block_devices' list of your configuration."))
+    | req_only_bridges, mft_only_bridges, req_only_blocks, mft_only_blocks ->
+        Error
+          (`Msg
+             ("Missing network interfaces: "
+             ^ String.concat ", " req_only_bridges
+             ^ " and missing block devices: "
+             ^ String.concat ", " req_only_blocks
+             ^ " while also having extra network interfaces: "
+             ^ String.concat ", " mft_only_bridges
+             ^ " and extra block devices: "
+             ^ String.concat ", " mft_only_blocks
+             ^ ". Please update 'network_interfaces' and 'block_devices' \
+                accordingly."))
+
   let key_ids exts pub issuer =
     let open X509 in
     let auth = (Some (Public_key.id issuer), General_name.empty, None) in

albatross_json.ml

@@ -1,8 +1,7 @@
 open Utils.Json
 
 let unikernel_info (unikernel_name, info) =
-  let typ = function `Solo5 -> `String "solo5"
-  and fail_behaviour = function
+  let fail_behaviour = function
     | `Quit -> `String "quit"
     | `Restart ex ->
         let els =
@@ -33,33 +32,25 @@ let unikernel_info (unikernel_name, info) =
     in
     `List (List.map block bs)
   and bridges bs =
-    let bridge (name, dev, mac) =
+    let bridge (name, dev, _) =
       let dev = Option.value ~default:name dev in
-      let mac =
-        Option.value ~default:(Vmm_core.Name.mac unikernel_name dev) mac
-      in
-      `Assoc
-        [
-          ("name", `String name);
-          ("host_device", `String dev);
-          ("mac", `String (Macaddr.to_string mac));
-        ]
+      `Assoc [ ("name", `String name); ("host_device", `String dev) ]
     in
     `List (List.map bridge bs)
   and argv args =
     `List (List.map (fun a -> `String a) (Option.value ~default:[] args))
-  and digest d = `String (Ohex.encode d) in
+  in
   `Assoc
     [
-      ("name", `String (Vmm_core.Name.to_string unikernel_name));
-      ("typ", typ info.Vmm_core.Unikernel.typ);
-      ("fail_behaviour", fail_behaviour info.fail_behaviour);
+      ( "name",
+        `String (Option.value ~default:"" (Vmm_core.Name.name unikernel_name))
+      );
+      ("fail_behaviour", fail_behaviour info.Vmm_core.Unikernel.fail_behaviour);
       ("cpuid", cpuid info.cpuid);
       ("memory", memory info.memory);
       ("block_devices", block_devices info.block_devices);
       ("network_interfaces", bridges info.bridges);
       ("arguments", argv info.argv);
-      ("digest", digest info.digest);
     ]
 
 let unikernel_infos is = `List (List.map unikernel_info is)

assets/main.js

@@ -920,11 +920,59 @@ async function updateToken(value) {
 			buttonLoading(tokenButton, false, "Update Token")
 		}
 	} catch (error) {
-		postAlert("bg-secondary-300", data.data);
+		postAlert("bg-secondary-300", error);
 		buttonLoading(tokenButton, false, "Update Token")
 	}
 }
 
+async function updateUnikernel(job, build, unikernel_name) {
+	const updateButton = document.getElementById("update-unikernel-button");
+	const unikernelArguments = document.getElementById("unikernel-arguments").value;
+	const argumentsToggle = document.getElementById("arguments-toggle").checked;
+	const molly_csrf = document.getElementById("molly-csrf").value;
+	const formAlert = document.getElementById("unikernel-arguments-alert");
+	if (argumentsToggle && !unikernelArguments) {
+		postAlert("bg-secondary-300", "You must give arguments for this build else switch 'Update the configuration for this build' off");
+		buttonLoading(updateButton, false, "Proceed to update")
+		return;
+	}
+	try {
+		buttonLoading(updateButton, true, "Updating...")
+		const response = await fetch("/api/unikernel/update", {
+			method: 'POST',
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(
+				{
+					"job": job,
+					"build": build,
+					"unikernel_name": unikernel_name,
+					"unikernel_arguments": argumentsToggle ? JSON.parse(unikernelArguments) : null,
+					"molly_csrf": molly_csrf
+				})
+		})
+		const data = await response.json();
+		if (data.status === 200) {
+			postAlert("bg-primary-300", "Unikernel updated succesfully");
+			setTimeout(() => window.location.reload(), 1000);
+			buttonLoading(updateButton, false, "Proceed to update")
+		} else {
+			postAlert("bg-secondary-300", data.data);
+			formAlert.classList.remove("hidden", "text-primary-500");
+			formAlert.classList.add("text-secondary-500");
+			formAlert.textContent = data.data
+			buttonLoading(updateButton, false, "Proceed to update")
+		}
+	} catch (error) {
+		postAlert("bg-secondary-300", error);
+		formAlert.classList.remove("hidden", "text-primary-500");
+		formAlert.classList.add("text-secondary-500");
+		formAlert.textContent = data.data
+		buttonLoading(updateButton, false, "Proceed to update")
+	}
+}
+
 function isValidName(s) {
 	const length = s.length;
 	if (length === 0 || length >= 64) return false;

config.ml

@@ -23,6 +23,7 @@ let mollymawk =
       package "duration";
       package ~min:"0.2.0" "ohex";
       package "http-mirage-client";
+      package "solo5-elftool" ~min:"0.4.0";
     ]
   in
   main ~packages "Unikernel.Main"