Refactor/sdk init (#2947)

* fixes for main

* refactor package initialization

* fixes from testing

* more fixes

* beta.21

* do not use instanceof

* closes #2921

* beta22

* allow disabling kiosk

* migration

* fix /etc/shadow

* actionRequest -> task

* beta.23

core/startos/src/version/update_details/v0_4_0.md

@@ -17,7 +17,7 @@ v0.4.0 is a complete rewrite of StartOS, almost nothing survived. After nearly s
 ## Changelog
 
 - [Improve user interface](#user-interface)
-- [Add transaltions](#translations)
+- [Add translations](#translations)
 - [Switch to lxc-based container runtime](#lxc)
 - [Update s9pk archive format](#s9pk-archive-format)
 - [Improve Actions](#actions)

core/startos/src/version/v0_3_6_alpha_0.rs

@@ -355,6 +355,7 @@ impl VersionT for Version {
                         .install(
                             ctx.clone(),
                             || crate::s9pk::load(file.clone(), || Ok(key.de()?.0), None),
+                            None,
                             None::<crate::util::Never>,
                             None,
                         )

core/startos/src/version/v0_4_0_alpha_2.rs

@@ -27,7 +27,7 @@ impl VersionT for Version {
     fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
     fn down(self, _db: &mut Value) -> Result<(), Error> {

core/startos/src/version/v0_4_0_alpha_3.rs

@@ -27,7 +27,7 @@ impl VersionT for Version {
     fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
-    fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+    fn up(self, _db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
         Ok(())
     }
     fn down(self, _db: &mut Value) -> Result<(), Error> {

core/startos/src/version/v0_4_0_alpha_4.rs

@@ -2,7 +2,9 @@ use exver::{PreReleaseSegment, VersionRange};
 
 use super::v0_3_5::V0_3_0_COMPAT;
 use super::{v0_4_0_alpha_3, VersionT};
+use crate::context::RpcContext;
 use crate::prelude::*;
+use crate::util::io::create_file_mod;
 
 lazy_static::lazy_static! {
     static ref V0_4_0_alpha_4: exver::Version = exver::Version::new(
@@ -27,7 +29,76 @@ impl VersionT for Version {
     fn compat(self) -> &'static VersionRange {
         &V0_3_0_COMPAT
     }
+    #[instrument]
     fn up(self, db: &mut Value, _: Self::PreUpRes) -> Result<(), Error> {
+        db["public"]["serverInfo"]
+            .as_object_mut()
+            .or_not_found("public.serverInfo")?
+            .insert("kiosk".into(), Value::Bool(false));
+        for (_, pde) in db["public"]["packageData"]
+            .as_object_mut()
+            .into_iter()
+            .flat_map(|m| m.iter_mut())
+        {
+            let Some(pde) = pde.as_object_mut() else {
+                continue;
+            };
+            let Some(mut tasks) = pde.remove("requestedActions").and_then(|ar| {
+                if let Value::Object(ar) = ar {
+                    Some(ar)
+                } else {
+                    None
+                }
+            }) else {
+                continue;
+            };
+            for (_, task_entry) in tasks.iter_mut() {
+                let Some(task_entry) = task_entry.as_object_mut() else {
+                    continue;
+                };
+                let Some(task) = task_entry.remove("request") else {
+                    continue;
+                };
+                task_entry.insert("task".into(), task);
+            }
+            pde.insert("tasks".into(), Value::Object(tasks));
+        }
+        Ok(())
+    }
+    async fn post_up(self, _ctx: &RpcContext) -> Result<(), Error> {
+        use tokio::io::AsyncWriteExt;
+
+        if tokio::fs::metadata("/media/startos/config/overlay/etc/shadow")
+            .await
+            .is_ok()
+        {
+            let mut hash = None;
+            let shadow_contents = tokio::fs::read_to_string("/etc/shadow").await?;
+            let mut shadow_file =
+                create_file_mod("/media/startos/config/overlay/etc/shadow", 0o640).await?;
+            for line in shadow_contents.lines() {
+                match line.split_once(":") {
+                    Some((user, rest)) if user == "start9" || user == "kiosk" => {
+                        let (h, rest) = rest.split_once(":").ok_or_else(|| {
+                            Error::new(eyre!("malformed /etc/shadow"), ErrorKind::ParseSysInfo)
+                        })?;
+                        if user == "start9" {
+                            hash = Some(h.to_owned());
+                        }
+                        let h = hash.as_deref().unwrap_or(h);
+                        shadow_file
+                            .write_all(format!("{user}:{h}:{rest}\n").as_bytes())
+                            .await?;
+                    }
+                    _ => {
+                        shadow_file.write_all(line.as_bytes()).await?;
+                        shadow_file.write_all(b"\n").await?;
+                    }
+                }
+            }
+            shadow_file.sync_all().await?;
+            tokio::fs::copy("/media/startos/config/overlay/etc/shadow", "/etc/shadow").await?;
+        }
         Ok(())
     }
     fn down(self, _db: &mut Value) -> Result<(), Error> {