Feature/UI sideload (#2658)

* ui sideloading

* remove subtlecrypto import

* fix parser

* misc fixes

* allow docker pull during compat conversion

core/startos/src/backup/os.rs

@@ -85,6 +85,7 @@ impl OsBackupV0 {
                     ssh_key::Algorithm::Ed25519,
                 )?,
                 tor_key: TorSecretKeyV3::from(self.tor_key.0),
+                compat_s9pk_key: ed25519_dalek::SigningKey::generate(&mut rand::thread_rng()),
             },
             ui: self.ui,
         })
@@ -113,6 +114,7 @@ impl OsBackupV1 {
                 root_ca_cert: self.root_ca_cert.0,
                 ssh_key: ssh_key::PrivateKey::from(Ed25519Keypair::from_seed(&self.net_key.0)),
                 tor_key: TorSecretKeyV3::from(ed25519_expand_key(&self.net_key.0)),
+                compat_s9pk_key: ed25519_dalek::SigningKey::from_bytes(&self.net_key),
             },
             ui: self.ui,
         }
@@ -124,13 +126,14 @@ impl OsBackupV1 {
 #[serde(rename = "kebab-case")]
 
 struct OsBackupV2 {
-    server_id: String,                 // uuidv4
-    hostname: String,                  // <adjective>-<noun>
-    root_ca_key: Pem<PKey<Private>>,   // PEM Encoded OpenSSL Key
-    root_ca_cert: Pem<X509>,           // PEM Encoded OpenSSL X509 Certificate
-    ssh_key: Pem<ssh_key::PrivateKey>, // PEM Encoded OpenSSH Key
-    tor_key: TorSecretKeyV3,           // Base64 Encoded Ed25519 Expanded Secret Key
-    ui: Value,                         // JSON Value
+    server_id: String,                               // uuidv4
+    hostname: String,                                // <adjective>-<noun>
+    root_ca_key: Pem<PKey<Private>>,                 // PEM Encoded OpenSSL Key
+    root_ca_cert: Pem<X509>,                         // PEM Encoded OpenSSL X509 Certificate
+    ssh_key: Pem<ssh_key::PrivateKey>,               // PEM Encoded OpenSSH Key
+    tor_key: TorSecretKeyV3,                         // Base64 Encoded Ed25519 Expanded Secret Key
+    compat_s9pk_key: Pem<ed25519_dalek::SigningKey>, // PEM Encoded ED25519 Key
+    ui: Value,                                       // JSON Value
 }
 impl OsBackupV2 {
     fn project(self) -> OsBackup {
@@ -143,6 +146,7 @@ impl OsBackupV2 {
                 root_ca_cert: self.root_ca_cert.0,
                 ssh_key: self.ssh_key.0,
                 tor_key: self.tor_key,
+                compat_s9pk_key: self.compat_s9pk_key.0,
             },
             ui: self.ui,
         }
@@ -155,6 +159,7 @@ impl OsBackupV2 {
             root_ca_cert: Pem(backup.account.root_ca_cert.clone()),
             ssh_key: Pem(backup.account.ssh_key.clone()),
             tor_key: backup.account.tor_key.clone(),
+            compat_s9pk_key: Pem(backup.account.compat_s9pk_key.clone()),
             ui: backup.ui.clone(),
         }
     }

core/startos/src/backup/restore.rs

@@ -156,16 +156,14 @@ async fn restore_packages(
     let mut tasks = BTreeMap::new();
     for id in ids {
         let backup_dir = backup_guard.clone().package_backup(&id);
+        let s9pk_path = backup_dir.path().join(&id).with_extension("s9pk");
         let task = ctx
             .services
             .install(
                 ctx.clone(),
-                S9pk::open(
-                    backup_dir.path().join(&id).with_extension("s9pk"),
-                    Some(&id),
-                )
-                .await?,
+                || S9pk::open(s9pk_path, Some(&id)),
                 Some(backup_dir),
+                None,
             )
             .await?;
         tasks.insert(id, task);

core/startos/src/backup/target/mod.rs

@@ -7,6 +7,7 @@ use clap::Parser;
 use color_eyre::eyre::eyre;
 use digest::generic_array::GenericArray;
 use digest::OutputSizeUser;
+use exver::Version;
 use models::PackageId;
 use rpc_toolkit::{from_fn_async, Context, HandlerExt, ParentHandler};
 use serde::{Deserialize, Serialize};
@@ -194,7 +195,7 @@ pub async fn list(ctx: RpcContext) -> Result<BTreeMap<BackupTargetId, BackupTarg
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BackupInfo {
-    pub version: VersionString,
+    pub version: Version,
     pub timestamp: Option<DateTime<Utc>>,
     pub package_backups: BTreeMap<PackageId, PackageBackupInfo>,
 }
@@ -204,7 +205,7 @@ pub struct BackupInfo {
 pub struct PackageBackupInfo {
     pub title: String,
     pub version: VersionString,
-    pub os_version: VersionString,
+    pub os_version: Version,
     pub timestamp: DateTime<Utc>,
 }
 
@@ -223,9 +224,9 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
         "TIMESTAMP",
     ]);
     table.add_row(row![
-        "EMBASSY OS",
-        info.version.as_str(),
-        info.version.as_str(),
+        "StartOS",
+        &info.version.to_string(),
+        &info.version.to_string(),
         &if let Some(ts) = &info.timestamp {
             ts.to_string()
         } else {
@@ -236,7 +237,7 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) {
         let row = row![
             &*id,
             info.version.as_str(),
-            info.os_version.as_str(),
+            &info.os_version.to_string(),
             &info.timestamp.to_string(),
         ];
         table.add_row(row);