[host] added GuestEnvironment struct

The GuestEnvironment struct contains two blobs of data. One identifiable as a guest binary,
and one undifferentiated guest blob. This GuestEnvironment is now used to create a new
sandbox in place of just a guest binary. There are TryFrom impls to be able to convert from
a guest binary to a GuestEnvironment, so this isn't a breaking change.

Signed-off-by: danbugs <[email protected]>

Author: danbugs

src/hyperlight_host/src/sandbox/uninitialized.rs

@@ -123,15 +123,52 @@ impl
     }
 }
 
-/// A `GuestBinary` is either a buffer containing the binary or a path to the binary
-#[derive(Debug)]
+/// A `GuestBinary` is either a buffer or the file path to some data (e.g., a guest binary).
+#[derive(Debug, Clone)]
 pub enum GuestBinary<'a> {
-    /// A buffer containing the guest binary
+    /// A buffer containing the GuestBinary
     Buffer(&'a [u8]),
-    /// A path to the guest binary
+    /// A path to the GuestBinary
     FilePath(String),
 }
 
+/// A `GuestEnvironment` is a structure that contains the guest binary and an optional GuestBinary.
+#[derive(Debug, Clone)]
+pub struct GuestEnvironment<'a> {
+    /// The guest binary, which can be a file path or a buffer.
+    pub guest_binary: GuestBinary<'a>,
+    /// An optional guest blob, which can be used to provide additional data to the guest.
+    pub guest_blob: Option<&'a [u8]>,
+}
+
+impl<'a> GuestEnvironment<'a> {
+    /// Creates a new `GuestEnvironment` with the given guest binary and an optional guest blob.
+    pub fn new(guest_binary: GuestBinary<'a>, guest_blob: Option<&'a [u8]>) -> Self {
+        GuestEnvironment {
+            guest_binary,
+            guest_blob,
+        }
+    }
+}
+
+impl<'a> From<&'a GuestBinary<'a>> for GuestEnvironment<'a> {
+    fn from(guest_binary: &'a GuestBinary<'a>) -> Self {
+        GuestEnvironment {
+            guest_binary: guest_binary.clone(),
+            guest_blob: None,
+        }
+    }
+}
+
+impl<'a> From<GuestBinary<'a>> for GuestEnvironment<'a> {
+    fn from(bin: GuestBinary<'a>) -> Self {
+        GuestEnvironment {
+            guest_binary: bin,
+            guest_blob: None,
+        }
+    }
+}
+
 impl UninitializedSandbox {
     /// Create a new sandbox configured to run the binary at path
     /// `bin_path`.
@@ -142,17 +179,23 @@ impl UninitializedSandbox {
     /// The err attribute is used to emit an error should the Result be an error, it uses the std::`fmt::Debug trait` to print the error.
     #[instrument(
         err(Debug),
-        skip(guest_binary),
+        skip(env),
         parent = Span::current()
     )]
-    pub fn new(guest_binary: GuestBinary, cfg: Option<SandboxConfiguration>) -> Result<Self> {
+    pub fn new<'a>(
+        env: impl Into<GuestEnvironment<'a>>,
+        cfg: Option<SandboxConfiguration>,
+    ) -> Result<Self> {
         #[cfg(feature = "build-metadata")]
         log_build_details();
 
         // hyperlight is only supported on Windows 11 and Windows Server 2022 and later
         #[cfg(target_os = "windows")]
         check_windows_version()?;
 
+        let env: GuestEnvironment<'_> = env.into();
+        let guest_binary = env.guest_binary;
+
         // If the guest binary is a file make sure it exists
         let guest_binary = match guest_binary {
             GuestBinary::FilePath(binary_path) => {