diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml index c174e2350..60b642e19 100644 --- a/.github/workflows/startos-iso.yaml +++ b/.github/workflows/startos-iso.yaml @@ -41,11 +41,11 @@ on: push: branches: - master - - next + - next/* pull_request: branches: - master - - next + - next/* env: NODEJS_VERSION: "18.15.0" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 000000000..c6082ac25 --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,31 @@ +name: Automated Tests + +on: + push: + branches: + - master + - next/* + pull_request: + branches: + - master + - next/* + +env: + NODEJS_VERSION: "18.15.0" + ENVIRONMENT: dev-unstable + +jobs: + test: + name: Run Automated Tests + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + + - uses: actions/setup-node@v3 + with: + node-version: ${{ env.NODEJS_VERSION }} + + - name: Build And Run Tests + run: make test diff --git a/.gitignore b/.gitignore index b97eb7334..d33151e91 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ secrets.db /results /dpkg-workdir /compiled.tar -/compiled-*.tar \ No newline at end of file +/compiled-*.tar +/firmware \ No newline at end of file diff --git a/Makefile b/Makefile index 0d2639dc3..65d4d79dd 100644 --- a/Makefile +++ b/Makefile @@ -8,14 +8,15 @@ ARCH := $(shell if [ "$(PLATFORM)" = "raspberrypi" ]; then echo aarch64; else ec IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo iso; fi) BINS := core/target/$(ARCH)-unknown-linux-gnu/release/startbox core/target/aarch64-unknown-linux-musl/release/container-init core/target/x86_64-unknown-linux-musl/release/container-init WEB_UIS := web/dist/raw/ui web/dist/raw/setup-wizard web/dist/raw/diagnostic-ui web/dist/raw/install-wizard -BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts +FIRMWARE_ROMS := ./firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json) +BUILD_SRC := $(shell git ls-files build) build/lib/depends build/lib/conflicts $(FIRMWARE_ROMS) DEBIAN_SRC := $(shell git ls-files debian/) IMAGE_RECIPE_SRC := $(shell git ls-files image-recipe/) STARTD_SRC := core/startos/startd.service $(BUILD_SRC) COMPAT_SRC := $(shell git ls-files system-images/compat/) UTILS_SRC := $(shell git ls-files system-images/utils/) BINFMT_SRC := $(shell git ls-files system-images/binfmt/) -CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) web/dist/static +CORE_SRC := $(shell git ls-files core) $(shell git ls-files --recurse-submodules patch-db) web/dist/static web/patchdb-ui-seed.json $(GIT_HASH_FILE) WEB_SHARED_SRC := $(shell git ls-files web/projects/shared) $(shell ls -p web/ | grep -v / | sed 's/^/web\//g') web/node_modules web/config.json patch-db/client/dist web/patchdb-ui-seed.json WEB_UI_SRC := $(shell git ls-files web/projects/ui) WEB_SETUP_WIZARD_SRC := $(shell git ls-files web/projects/setup-wizard) @@ -48,7 +49,7 @@ endif .DELETE_ON_ERROR: -.PHONY: all metadata install clean format sdk snapshots uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole +.PHONY: all metadata install clean format sdk snapshots uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole test all: $(ALL_TARGETS) @@ -72,6 +73,7 @@ clean: rm -rf dpkg-workdir rm -rf image-recipe/deb rm -rf results + rm -rf build/lib/firmware rm -f ENVIRONMENT.txt rm -f PLATFORM.txt rm -f GIT_HASH.txt @@ -80,6 +82,9 @@ clean: format: cd core && cargo +nightly fmt +test: $(CORE_SRC) $(ENVIRONMENT_FILE) + cd core && cargo build && cargo test + sdk: cd core && ./install-sdk.sh @@ -131,6 +136,8 @@ install: $(ALL_TARGETS) $(call cp,system-images/compat/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/compat.tar) $(call cp,system-images/utils/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/utils.tar) $(call cp,system-images/binfmt/docker-images/$(ARCH).tar,$(DESTDIR)/usr/lib/startos/system-images/binfmt.tar) + + $(call cp,firmware/$(PLATFORM),$(DESTDIR)/usr/lib/startos/firmware) update-overlay: $(ALL_TARGETS) @echo "\033[33m!!! THIS WILL ONLY REFLASH YOUR DEVICE IN MEMORY !!!\033[0m" @@ -162,6 +169,9 @@ upload-ota: results/$(BASENAME).squashfs build/lib/depends build/lib/conflicts: build/dpkg-deps/* build/dpkg-deps/generate.sh +$(FIRMWARE_ROMS): build/lib/firmware.json download-firmware.sh $(PLATFORM_FILE) + ./download-firmware.sh $(PLATFORM) + system-images/compat/docker-images/$(ARCH).tar: $(COMPAT_SRC) core/Cargo.lock cd system-images/compat && make docker-images/$(ARCH).tar && touch docker-images/$(ARCH).tar @@ -175,7 +185,7 @@ snapshots: core/snapshot-creator/Cargo.toml cd core/ && ARCH=aarch64 ./build-v8-snapshot.sh cd core/ && ARCH=x86_64 ./build-v8-snapshot.sh -$(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) web/patchdb-ui-seed.json +$(BINS): $(CORE_SRC) $(ENVIRONMENT_FILE) cd core && ARCH=$(ARCH) ./build-prod.sh touch $(BINS) diff --git a/build/lib/firmware.json b/build/lib/firmware.json new file mode 100644 index 000000000..9637aa70a --- /dev/null +++ b/build/lib/firmware.json @@ -0,0 +1,13 @@ +[ + { + "id": "pureboot-librem_mini_v2-basic_usb_autoboot_blob_jail-Release-28.3", + "platform": ["x86_64"], + "system-product-name": "librem_mini_v2", + "bios-version": { + "semver-prefix": "PureBoot-Release-", + "semver-range": "<28.3" + }, + "url": "https://source.puri.sm/firmware/releases/-/raw/master/librem_mini_v2/custom/pureboot-librem_mini_v2-basic_usb_autoboot_blob_jail-Release-28.3.rom.gz", + "shasum": "5019bcf53f7493c7aa74f8ef680d18b5fc26ec156c705a841433aaa2fdef8f35" + } +] diff --git a/build/lib/firmware/librem_mini_v2/PureBoot-Release-28.1.rom.gz b/build/lib/firmware/librem_mini_v2/PureBoot-Release-28.1.rom.gz deleted file mode 100644 index 3e5376759..000000000 Binary files a/build/lib/firmware/librem_mini_v2/PureBoot-Release-28.1.rom.gz and /dev/null differ diff --git a/build/lib/scripts/dhclient-exit-hook b/build/lib/scripts/dhclient-exit-hook index 5580a00b5..8c4a97746 100755 --- a/build/lib/scripts/dhclient-exit-hook +++ b/build/lib/scripts/dhclient-exit-hook @@ -1 +1 @@ -embassy-cli net dhcp update $interface \ No newline at end of file +start-cli net dhcp update $interface \ No newline at end of file diff --git a/core/Cargo.lock b/core/Cargo.lock index 8e3d423ab..cc7698271 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4238,6 +4238,9 @@ name = "semver" version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +dependencies = [ + "serde", +] [[package]] name = "semver-parser" @@ -4921,7 +4924,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.5" +version = "0.3.5-rev.1" dependencies = [ "aes", "async-compression", @@ -5000,6 +5003,7 @@ dependencies = [ "rpc-toolkit", "rust-argon2", "scopeguard", + "semver 1.0.20", "serde", "serde_json", "serde_with", diff --git a/core/js-engine/src/lib.rs b/core/js-engine/src/lib.rs index 2da463ce2..b0b9bea37 100644 --- a/core/js-engine/src/lib.rs +++ b/core/js-engine/src/lib.rs @@ -1201,11 +1201,11 @@ mod fns { #[tokio::test] async fn test_is_subset() { - assert!( - !is_subset("/home/drbonez", "/home/drbonez/code/fakedir/../../..") - .await - .unwrap() - ) + let home = std::env::var("HOME").unwrap(); + let home = Path::new(&home); + assert!(!is_subset(home, &home.join("code/fakedir/../../..")) + .await + .unwrap()) } } diff --git a/core/models/src/id/interface.rs b/core/models/src/id/interface.rs index d062a3648..b9b32dd4a 100644 --- a/core/models/src/id/interface.rs +++ b/core/models/src/id/interface.rs @@ -1,11 +1,18 @@ use std::path::Path; +use std::str::FromStr; use serde::{Deserialize, Deserializer, Serialize}; -use crate::Id; +use crate::{Id, InvalidId}; #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)] pub struct InterfaceId(Id); +impl FromStr for InterfaceId { + type Err = InvalidId; + fn from_str(s: &str) -> Result { + Ok(Self(Id::try_from(s.to_owned())?)) + } +} impl From for InterfaceId { fn from(id: Id) -> Self { Self(id) diff --git a/core/startos/.sqlx/query-350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962.json b/core/startos/.sqlx/query-350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962.json new file mode 100644 index 000000000..c451ce9f3 --- /dev/null +++ b/core/startos/.sqlx/query-350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM tor WHERE package = $1 AND interface = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [] + }, + "hash": "350ab82048fb4a049042e4fdbe1b8c606ca400e43e31b9a05d2937217e0f6962" +} diff --git a/core/startos/.sqlx/query-b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1.json b/core/startos/.sqlx/query-b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1.json new file mode 100644 index 000000000..e2e8a1620 --- /dev/null +++ b/core/startos/.sqlx/query-b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1.json @@ -0,0 +1,12 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE account SET tor_key = NULL, network_key = gen_random_bytes(32)", + "describe": { + "columns": [], + "parameters": { + "Left": [] + }, + "nullable": [] + }, + "hash": "b81592b3a74940ab56d41537484090d45cfa4c85168a587b1a41dc5393cccea1" +} diff --git a/core/startos/.sqlx/query-dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524.json b/core/startos/.sqlx/query-dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524.json new file mode 100644 index 000000000..2fc8ad1ba --- /dev/null +++ b/core/startos/.sqlx/query-dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM network_keys WHERE package = $1 AND interface = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Text" + ] + }, + "nullable": [] + }, + "hash": "dfc23b7e966c3853284753a7e934351ba0cae3825988b3e0ecd3b6781bcff524" +} diff --git a/core/startos/Cargo.toml b/core/startos/Cargo.toml index da6ac6a4e..65d01b1db 100644 --- a/core/startos/Cargo.toml +++ b/core/startos/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ name = "start-os" readme = "README.md" repository = "https://github.com/Start9Labs/start-os" -version = "0.3.5" +version = "0.3.5-rev.1" license = "MIT" [lib] @@ -128,6 +128,7 @@ rpassword = "7.2.0" rpc-toolkit = "0.2.2" rust-argon2 = "2.0.0" scopeguard = "1.1" # because avahi-sys fucks your shit up +semver = { version = "1.0.20", features = ["serde"] } serde = { version = "1.0", features = ["derive", "rc"] } serde_cbor = { package = "ciborium", version = "0.2.1" } serde_json = "1.0" @@ -169,6 +170,9 @@ zeroize = "1.6.0" [profile.test] opt-level = 3 +[profile.dev] +opt-level = 3 + [profile.dev.package.backtrace] opt-level = 3 diff --git a/core/startos/src/bins/mod.rs b/core/startos/src/bins/mod.rs index c391338fe..f9c88cae9 100644 --- a/core/startos/src/bins/mod.rs +++ b/core/startos/src/bins/mod.rs @@ -18,7 +18,7 @@ fn select_executable(name: &str) -> Option { match name { #[cfg(feature = "avahi-alias")] "avahi-alias" => Some(avahi_alias::main), - #[cfg(feature = "js_engine")] + #[cfg(feature = "js-engine")] "start-deno" => Some(start_deno::main), #[cfg(feature = "cli")] "start-cli" => Some(start_cli::main), @@ -36,24 +36,14 @@ fn select_executable(name: &str) -> Option { pub fn startbox() { let args = std::env::args().take(2).collect::>(); - if let Some(x) = args + let executable = args .get(0) .and_then(|s| Path::new(&*s).file_name()) - .and_then(|s| s.to_str()) - .and_then(|s| select_executable(&s)) - { - x() - } else if let Some(x) = args.get(1).and_then(|s| select_executable(&s)) { + .and_then(|s| s.to_str()); + if let Some(x) = executable.and_then(|s| select_executable(&s)) { x() } else { - eprintln!( - "unknown executable: {}", - args.get(0) - .filter(|x| &**x != "startbox") - .or_else(|| args.get(1)) - .map(|s| s.as_str()) - .unwrap_or("N/A") - ); + eprintln!("unknown executable: {}", executable.unwrap_or("N/A")); std::process::exit(1); } } diff --git a/core/startos/src/bins/start_deno.rs b/core/startos/src/bins/start_deno.rs index 0be507082..8f5a1451a 100644 --- a/core/startos/src/bins/start_deno.rs +++ b/core/startos/src/bins/start_deno.rs @@ -4,7 +4,7 @@ use serde_json::Value; use crate::procedure::js_scripts::ExecuteArgs; use crate::s9pk::manifest::PackageId; -use crate::util::serde::{display_serializable, parse_stdin_deserializable}; +use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat}; use crate::version::{Current, VersionT}; use crate::Error; @@ -23,6 +23,9 @@ fn deno_api() -> Result<(), Error> { #[command(cli_only, display(display_serializable))] async fn execute( #[arg(stdin, parse(parse_stdin_deserializable))] arg: ExecuteArgs, + #[allow(unused_variables)] + #[arg(long = "format")] + format: Option, ) -> Result, Error> { let ExecuteArgs { procedure, @@ -41,6 +44,9 @@ async fn execute( #[command(cli_only, display(display_serializable))] async fn sandbox( #[arg(stdin, parse(parse_stdin_deserializable))] arg: ExecuteArgs, + #[allow(unused_variables)] + #[arg(long = "format")] + format: Option, ) -> Result, Error> { let ExecuteArgs { procedure, diff --git a/core/startos/src/bins/start_init.rs b/core/startos/src/bins/start_init.rs index 0440e0ad6..1cb070851 100644 --- a/core/startos/src/bins/start_init.rs +++ b/core/startos/src/bins/start_init.rs @@ -3,48 +3,64 @@ use std::path::{Path, PathBuf}; use std::sync::Arc; use std::time::Duration; +use helpers::NonDetachingJoinHandle; use tokio::process::Command; use tracing::instrument; use crate::context::rpc::RpcContextConfig; use crate::context::{DiagnosticContext, InstallContext, SetupContext}; -use crate::disk::fsck::RepairStrategy; +use crate::disk::fsck::{RepairStrategy, RequiresReboot}; use crate::disk::main::DEFAULT_PASSWORD; use crate::disk::REPAIR_DISK_PATH; use crate::firmware::update_firmware; use crate::init::STANDBY_MODE_PATH; use crate::net::web_server::WebServer; use crate::shutdown::Shutdown; -use crate::sound::CHIME; +use crate::sound::{BEP, CHIME}; use crate::util::Invoke; use crate::{Error, ErrorKind, ResultExt, PLATFORM}; #[instrument(skip_all)] async fn setup_or_init(cfg_path: Option) -> Result, Error> { - if update_firmware().await?.0 { - return Ok(Some(Shutdown { - export_args: None, - restart: true, - })); + let song = NonDetachingJoinHandle::from(tokio::spawn(async { + loop { + BEP.play().await.unwrap(); + BEP.play().await.unwrap(); + tokio::time::sleep(Duration::from_secs(30)).await; + } + })); + + match update_firmware().await { + Ok(RequiresReboot(true)) => { + return Ok(Some(Shutdown { + export_args: None, + restart: true, + })) + } + Err(e) => { + tracing::warn!("Error performing firmware update: {e}"); + tracing::debug!("{e:?}"); + } + _ => (), } Command::new("ln") .arg("-sf") .arg("/usr/lib/startos/scripts/fake-apt") .arg("/usr/local/bin/apt") - .invoke(crate::ErrorKind::OpenSsh) + .invoke(crate::ErrorKind::Filesystem) .await?; Command::new("ln") .arg("-sf") .arg("/usr/lib/startos/scripts/fake-apt") .arg("/usr/local/bin/apt-get") - .invoke(crate::ErrorKind::OpenSsh) + .invoke(crate::ErrorKind::Filesystem) .await?; Command::new("ln") .arg("-sf") .arg("/usr/lib/startos/scripts/fake-apt") .arg("/usr/local/bin/aptitude") - .invoke(crate::ErrorKind::OpenSsh) + .invoke(crate::ErrorKind::Filesystem) .await?; Command::new("make-ssl-cert") @@ -74,6 +90,7 @@ async fn setup_or_init(cfg_path: Option) -> Result, Er ) .await?; + drop(song); tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this CHIME.play().await?; @@ -100,8 +117,10 @@ async fn setup_or_init(cfg_path: Option) -> Result, Er ) .await?; + drop(song); tokio::time::sleep(Duration::from_secs(1)).await; // let the record state that I hate this CHIME.play().await?; + ctx.shutdown .subscribe() .recv() @@ -152,6 +171,7 @@ async fn setup_or_init(cfg_path: Option) -> Result, Er } tracing::info!("Loaded Disk"); crate::init::init(&cfg).await?; + drop(song); } Ok(None) diff --git a/core/startos/src/context/rpc.rs b/core/startos/src/context/rpc.rs index f235572e4..5358a59ba 100644 --- a/core/startos/src/context/rpc.rs +++ b/core/startos/src/context/rpc.rs @@ -4,6 +4,7 @@ use std::ops::Deref; use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; +use std::time::Duration; use helpers::to_tmp_path; use josekit::jwk::Jwk; @@ -25,7 +26,7 @@ use crate::db::model::{CurrentDependents, Database, PackageDataEntryMatchModelRe use crate::db::prelude::PatchDbExt; use crate::dependencies::compute_dependency_config_errs; use crate::disk::OsPartitionInfo; -use crate::init::init_postgres; +use crate::init::{check_time_is_synchronized, init_postgres}; use crate::install::cleanup::{cleanup_failed, uninstall}; use crate::manager::ManagerMap; use crate::middleware::auth::HashSessionToken; @@ -174,6 +175,19 @@ impl RpcContext { let tor_proxy_url = format!("socks5h://{tor_proxy}"); let devices = lshw().await?; let ram = get_mem_info().await?.total.0 as u64 * 1024 * 1024; + + if !db.peek().await.as_server_info().as_ntp_synced().de()? { + let db = db.clone(); + tokio::spawn(async move { + while !check_time_is_synchronized().await.unwrap() { + tokio::time::sleep(Duration::from_secs(30)).await; + } + db.mutate(|v| v.as_server_info_mut().as_ntp_synced_mut().ser(&true)) + .await + .unwrap() + }); + } + let seed = Arc::new(RpcContextSeed { is_closed: AtomicBool::new(false), datadir: base.datadir().to_path_buf(), diff --git a/core/startos/src/db/model.rs b/core/startos/src/db/model.rs index e1c1767ec..344d5abb3 100644 --- a/core/startos/src/db/model.rs +++ b/core/startos/src/db/model.rs @@ -22,6 +22,7 @@ use crate::net::utils::{get_iface_ipv4_addr, get_iface_ipv6_addr}; use crate::prelude::*; use crate::s9pk::manifest::{Manifest, PackageId}; use crate::status::Status; +use crate::util::cpupower::{Governor}; use crate::util::Version; use crate::version::{Current, VersionT}; use crate::{ARCH, PLATFORM}; @@ -83,6 +84,7 @@ impl Database { .join(":"), ntp_synced: false, zram: true, + governor: None, }, package_data: AllPackageData::default(), ui: serde_json::from_str(include_str!(concat!( @@ -134,6 +136,7 @@ pub struct ServerInfo { pub ntp_synced: bool, #[serde(default)] pub zram: bool, + pub governor: Option, } #[derive(Debug, Deserialize, Serialize, HasModel)] diff --git a/core/startos/src/disk/fsck/mod.rs b/core/startos/src/disk/fsck/mod.rs index 2a67a6fb3..6758ddd58 100644 --- a/core/startos/src/disk/fsck/mod.rs +++ b/core/startos/src/disk/fsck/mod.rs @@ -11,7 +11,7 @@ use crate::Error; pub mod btrfs; pub mod ext4; -#[derive(Debug, Clone, Copy)] +#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize)] #[must_use] pub struct RequiresReboot(pub bool); impl std::ops::BitOrAssign for RequiresReboot { diff --git a/core/startos/src/firmware.rs b/core/startos/src/firmware.rs index 9f3e3c52c..7f9a4a273 100644 --- a/core/startos/src/firmware.rs +++ b/core/startos/src/firmware.rs @@ -1,16 +1,63 @@ +use std::collections::BTreeSet; use std::path::Path; use async_compression::tokio::bufread::GzipDecoder; +use clap::ArgMatches; +use rpc_toolkit::command; +use serde::{Deserialize, Serialize}; use tokio::fs::File; -use tokio::io::{AsyncRead, BufReader}; +use tokio::io::BufReader; use tokio::process::Command; use crate::disk::fsck::RequiresReboot; use crate::prelude::*; use crate::util::Invoke; +use crate::PLATFORM; +/// Part of the Firmware, look there for more about +#[derive(Clone, Deserialize, Serialize)] +#[serde(rename_all = "kebab-case")] +pub struct VersionMatcher { + /// Strip this prefix on the version matcher + semver_prefix: Option, + /// Match the semver to this range + semver_range: Option, + /// Strip this suffix on the version matcher + semver_suffix: Option, +} + +/// Inside a file that is firmware.json, we +/// wanted a structure that could help decide what to do +/// for each of the firmware versions +#[derive(Clone, Deserialize, Serialize)] +#[serde(rename_all = "kebab-case")] +pub struct Firmware { + id: String, + /// This is the platform(s) the firmware was built for + platform: BTreeSet, + /// This usally comes from the dmidecode + system_product_name: Option, + /// The version comes from dmidecode, then we decide if it matches + bios_version: Option, + /// the hash of the firmware rom.gz + shasum: String, +} + +fn display_firmware_update_result(arg: RequiresReboot, _: &ArgMatches) { + if arg.0 { + println!("Firmware successfully updated! Reboot to apply changes."); + } else { + println!("No firmware update available."); + } +} + +/// We wanted to make sure during every init +/// that the firmware was the correct and updated for +/// systems like the Pure System that a new firmware +/// was released and the updates where pushed through the pure os. +#[command(rename = "update-firmware", display(display_firmware_update_result))] pub async fn update_firmware() -> Result { - let product_name = String::from_utf8( + let system_product_name = String::from_utf8( Command::new("dmidecode") .arg("-s") .arg("system-product-name") @@ -19,52 +66,84 @@ pub async fn update_firmware() -> Result { )? .trim() .to_owned(); - if product_name.is_empty() { + let bios_version = String::from_utf8( + Command::new("dmidecode") + .arg("-s") + .arg("bios-version") + .invoke(ErrorKind::Firmware) + .await?, + )? + .trim() + .to_owned(); + if system_product_name.is_empty() || bios_version.is_empty() { return Ok(RequiresReboot(false)); } - let firmware_dir = Path::new("/usr/lib/startos/firmware").join(&product_name); - if tokio::fs::metadata(&firmware_dir).await.is_ok() { - let current_firmware = String::from_utf8( - Command::new("dmidecode") - .arg("-s") - .arg("bios-version") - .invoke(ErrorKind::Firmware) - .await?, - )? - .trim() - .to_owned(); - if tokio::fs::metadata(firmware_dir.join(format!("{current_firmware}.rom.gz"))) - .await - .is_err() - && tokio::fs::metadata(firmware_dir.join(format!("{current_firmware}.rom"))) - .await - .is_err() - { - let mut firmware_read_dir = tokio::fs::read_dir(&firmware_dir).await?; - while let Some(entry) = firmware_read_dir.next_entry().await? { - let filename = entry.file_name().to_string_lossy().into_owned(); - let rdr: Option> = - if filename.ends_with(".rom.gz") { - Some(Box::new(GzipDecoder::new(BufReader::new( - File::open(entry.path()).await?, - )))) - } else if filename.ends_with(".rom") { - Some(Box::new(File::open(entry.path()).await?)) - } else { - None - }; - if let Some(mut rdr) = rdr { - Command::new("flashrom") - .arg("-p") - .arg("internal") - .arg("-w-") - .input(Some(&mut rdr)) - .invoke(ErrorKind::Firmware) - .await?; - return Ok(RequiresReboot(true)); + + let firmware_dir = Path::new("/usr/lib/startos/firmware"); + + for firmware in serde_json::from_str::>( + &tokio::fs::read_to_string("/usr/lib/startos/firmware.json").await?, + ) + .with_kind(ErrorKind::Deserialization)? + { + let id = firmware.id; + let matches_product_name = firmware + .system_product_name + .map_or(true, |spn| spn == system_product_name); + let matches_bios_version = firmware + .bios_version + .map_or(Some(true), |bv| { + let mut semver_str = bios_version.as_str(); + if let Some(prefix) = &bv.semver_prefix { + semver_str = semver_str.strip_prefix(prefix)?; } - } + if let Some(suffix) = &bv.semver_suffix { + semver_str = semver_str.strip_suffix(suffix)?; + } + let semver = semver_str + .split(".") + .filter_map(|v| v.parse().ok()) + .chain(std::iter::repeat(0)) + .take(3) + .collect::>(); + let semver = semver::Version::new(semver[0], semver[1], semver[2]); + Some( + bv.semver_range + .as_ref() + .map_or(true, |r| r.matches(&semver)), + ) + }) + .unwrap_or(false); + if firmware.platform.contains(&*PLATFORM) && matches_product_name && matches_bios_version { + let filename = format!("{id}.rom.gz"); + let firmware_path = firmware_dir.join(&filename); + Command::new("sha256sum") + .arg("-c") + .input(Some(&mut std::io::Cursor::new(format!( + "{} {}", + firmware.shasum, + firmware_path.display() + )))) + .invoke(ErrorKind::Filesystem) + .await?; + let mut rdr = if tokio::fs::metadata(&firmware_path).await.is_ok() { + GzipDecoder::new(BufReader::new(File::open(&firmware_path).await?)) + } else { + return Err(Error::new( + eyre!("Firmware {id}.rom.gz not found in {firmware_dir:?}"), + ErrorKind::NotFound, + )); + }; + Command::new("flashrom") + .arg("-p") + .arg("internal") + .arg("-w-") + .input(Some(&mut rdr)) + .invoke(ErrorKind::Firmware) + .await?; + return Ok(RequiresReboot(true)); } } + Ok(RequiresReboot(false)) } diff --git a/core/startos/src/init.rs b/core/startos/src/init.rs index 288149f37..74c3767e3 100644 --- a/core/startos/src/init.rs +++ b/core/startos/src/init.rs @@ -4,7 +4,7 @@ use std::path::Path; use std::time::{Duration, SystemTime}; use color_eyre::eyre::eyre; -use helpers::NonDetachingJoinHandle; + use models::ResultExt; use rand::random; use sqlx::{Pool, Postgres}; @@ -18,9 +18,9 @@ use crate::disk::mount::util::unmount; use crate::install::PKG_ARCHIVE_DIR; use crate::middleware::auth::LOCAL_AUTH_COOKIE_PATH; use crate::prelude::*; -use crate::sound::BEP; + use crate::util::cpupower::{ - current_governor, get_available_governors, set_governor, GOVERNOR_PERFORMANCE, + get_available_governors, get_preferred_governor, set_governor, }; use crate::util::docker::{create_bridge_network, CONTAINER_DATADIR, CONTAINER_TOOL}; use crate::util::Invoke; @@ -96,44 +96,64 @@ pub async fn init_postgres(datadir: impl AsRef) -> Result<(), Error> { let pg_version_string = pg_version.to_string(); let pg_version_path = db_dir.join(&pg_version_string); - if tokio::fs::metadata(&pg_version_path).await.is_err() { - let conf_dir = Path::new("/etc/postgresql").join(pg_version.to_string()); - let conf_dir_tmp = { - let mut tmp = conf_dir.clone(); - tmp.set_extension("tmp"); - tmp - }; - if tokio::fs::metadata(&conf_dir).await.is_ok() { - Command::new("mv") - .arg(&conf_dir) - .arg(&conf_dir_tmp) - .invoke(ErrorKind::Filesystem) - .await?; - } - let mut old_version = pg_version; - while old_version > 13 - /* oldest pg version included in startos */ + if exists + // maybe migrate + { + let incomplete_path = db_dir.join(format!("{pg_version}.migration.incomplete")); + if tokio::fs::metadata(&incomplete_path).await.is_ok() // previous migration was incomplete + && tokio::fs::metadata(&pg_version_path).await.is_ok() { - old_version -= 1; - let old_datadir = db_dir.join(old_version.to_string()); - if tokio::fs::metadata(&old_datadir).await.is_ok() { - Command::new("pg_upgradecluster") - .arg(old_version.to_string()) - .arg("main") - .invoke(crate::ErrorKind::Database) - .await?; - break; - } + tokio::fs::remove_dir_all(&pg_version_path).await?; } - if tokio::fs::metadata(&conf_dir).await.is_ok() { + if tokio::fs::metadata(&pg_version_path).await.is_err() + // need to migrate + { + let conf_dir = Path::new("/etc/postgresql").join(pg_version.to_string()); + let conf_dir_tmp = { + let mut tmp = conf_dir.clone(); + tmp.set_extension("tmp"); + tmp + }; if tokio::fs::metadata(&conf_dir).await.is_ok() { - tokio::fs::remove_dir_all(&conf_dir).await?; + Command::new("mv") + .arg(&conf_dir) + .arg(&conf_dir_tmp) + .invoke(ErrorKind::Filesystem) + .await?; } - Command::new("mv") - .arg(&conf_dir_tmp) - .arg(&conf_dir) - .invoke(ErrorKind::Filesystem) - .await?; + let mut old_version = pg_version; + while old_version > 13 + /* oldest pg version included in startos */ + { + old_version -= 1; + let old_datadir = db_dir.join(old_version.to_string()); + if tokio::fs::metadata(&old_datadir).await.is_ok() { + tokio::fs::File::create(&incomplete_path) + .await? + .sync_all() + .await?; + Command::new("pg_upgradecluster") + .arg(old_version.to_string()) + .arg("main") + .invoke(crate::ErrorKind::Database) + .await?; + break; + } + } + if tokio::fs::metadata(&conf_dir).await.is_ok() { + if tokio::fs::metadata(&conf_dir).await.is_ok() { + tokio::fs::remove_dir_all(&conf_dir).await?; + } + Command::new("mv") + .arg(&conf_dir_tmp) + .arg(&conf_dir) + .invoke(ErrorKind::Filesystem) + .await?; + } + tokio::fs::remove_file(&incomplete_path).await?; + } + if tokio::fs::metadata(&incomplete_path).await.is_ok() { + unreachable!() // paranoia } } @@ -230,18 +250,6 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { || &*server_info.version < &emver::Version::new(0, 3, 2, 0) || (*ARCH == "x86_64" && &*server_info.version < &emver::Version::new(0, 3, 4, 0)); - let song = if should_rebuild { - Some(NonDetachingJoinHandle::from(tokio::spawn(async { - loop { - BEP.play().await.unwrap(); - BEP.play().await.unwrap(); - tokio::time::sleep(Duration::from_secs(60)).await; - } - }))) - } else { - None - }; - let log_dir = cfg.datadir().join("main/logs"); if tokio::fs::metadata(&log_dir).await.is_err() { tokio::fs::create_dir_all(&log_dir).await?; @@ -318,12 +326,13 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { tracing::info!("Created Docker Network"); } + let datadir = cfg.datadir(); tracing::info!("Loading System Docker Images"); - crate::install::load_images("/usr/lib/startos/system-images").await?; + crate::install::rebuild_from("/usr/lib/startos/system-images", &datadir).await?; tracing::info!("Loaded System Docker Images"); tracing::info!("Loading Package Docker Images"); - crate::install::load_images(cfg.datadir().join(PKG_ARCHIVE_DIR)).await?; + crate::install::rebuild_from(datadir.join(PKG_ARCHIVE_DIR), &datadir).await?; tracing::info!("Loaded Package Docker Images"); } @@ -333,6 +342,7 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { .arg("run") .arg("-d") .arg("--rm") + .arg("--init") .arg("--network=start9") .arg("--name=netdummy") .arg("start9/x_system/utils:latest") @@ -354,28 +364,27 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { .await?; tracing::info!("Enabled Docker QEMU Emulation"); - if current_governor() - .await? - .map(|g| &g != &GOVERNOR_PERFORMANCE) - .unwrap_or(false) - { - tracing::info!("Setting CPU Governor to \"{}\"", GOVERNOR_PERFORMANCE); - if get_available_governors() - .await? - .contains(&GOVERNOR_PERFORMANCE) - { - set_governor(&GOVERNOR_PERFORMANCE).await?; - tracing::info!("Set CPU Governor"); + let governor = if let Some(governor) = &server_info.governor { + if get_available_governors().await?.contains(governor) { + Some(governor) } else { - tracing::warn!("CPU Governor \"{}\" Not Available", GOVERNOR_PERFORMANCE) + tracing::warn!("CPU Governor \"{governor}\" Not Available"); + None } + } else { + get_preferred_governor().await? + }; + if let Some(governor) = governor { + tracing::info!("Setting CPU Governor to \"{governor}\""); + set_governor(governor).await?; + tracing::info!("Set CPU Governor"); } - let mut time_not_synced = true; + server_info.ntp_synced = false; let mut not_made_progress = 0u32; for _ in 0..1800 { if check_time_is_synchronized().await? { - time_not_synced = false; + server_info.ntp_synced = true; break; } let t = SystemTime::now(); @@ -392,7 +401,7 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { break; } } - if time_not_synced { + if !server_info.ntp_synced { tracing::warn!("Timed out waiting for system time to synchronize"); } else { tracing::info!("Syncronized system clock"); @@ -410,21 +419,6 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { restarting: false, }; - server_info.ntp_synced = if time_not_synced { - let db = db.clone(); - tokio::spawn(async move { - while !check_time_is_synchronized().await.unwrap() { - tokio::time::sleep(Duration::from_secs(30)).await; - } - db.mutate(|v| v.as_server_info_mut().as_ntp_synced_mut().ser(&true)) - .await - .unwrap() - }); - false - } else { - true - }; - db.mutate(|v| { v.as_server_info_mut().ser(&server_info)?; Ok(()) @@ -447,8 +441,6 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { }?; } - drop(song); - tracing::info!("System initialized."); Ok(InitResult { secret_store, db }) diff --git a/core/startos/src/install/mod.rs b/core/startos/src/install/mod.rs index e2089608e..01f405e7b 100644 --- a/core/startos/src/install/mod.rs +++ b/core/startos/src/install/mod.rs @@ -891,102 +891,11 @@ pub async fn install_s9pk( } tracing::info!("Install {}@{}: Fetched Dependency Info", pkg_id, version); - let public_dir_path = ctx - .datadir - .join(PKG_PUBLIC_DIR) - .join(pkg_id) - .join(version.as_str()); - tokio::fs::create_dir_all(&public_dir_path).await?; - - tracing::info!("Install {}@{}: Unpacking LICENSE.md", pkg_id, version); - progress - .track_read_during(ctx.db.clone(), pkg_id, || async { - let license_path = public_dir_path.join("LICENSE.md"); - let mut dst = File::create(&license_path).await?; - tokio::io::copy(&mut rdr.license().await?, &mut dst).await?; - dst.sync_all().await?; - Ok(()) + let icon = progress + .track_read_during(ctx.db.clone(), pkg_id, || { + unpack_s9pk(&ctx.datadir, &manifest, rdr) }) .await?; - tracing::info!("Install {}@{}: Unpacked LICENSE.md", pkg_id, version); - - tracing::info!("Install {}@{}: Unpacking INSTRUCTIONS.md", pkg_id, version); - progress - .track_read_during(ctx.db.clone(), pkg_id, || async { - let instructions_path = public_dir_path.join("INSTRUCTIONS.md"); - let mut dst = File::create(&instructions_path).await?; - tokio::io::copy(&mut rdr.instructions().await?, &mut dst).await?; - dst.sync_all().await?; - Ok(()) - }) - .await?; - tracing::info!("Install {}@{}: Unpacked INSTRUCTIONS.md", pkg_id, version); - - let icon_filename = Path::new("icon").with_extension(manifest.assets.icon_type()); - let icon_path = public_dir_path.join(&icon_filename); - tracing::info!( - "Install {}@{}: Unpacking {}", - pkg_id, - version, - icon_path.display() - ); - let icon_buf = progress - .track_read_during(ctx.db.clone(), pkg_id, || async { - Ok(rdr.icon().await?.to_vec().await?) - }) - .await?; - let mut dst = File::create(&icon_path).await?; - dst.write_all(&icon_buf).await?; - dst.sync_all().await?; - let icon = DataUrl::from_vec( - mime(manifest.assets.icon_type()).unwrap_or("image/png"), - icon_buf, - ); - tracing::info!( - "Install {}@{}: Unpacked {}", - pkg_id, - version, - icon_filename.display() - ); - - tracing::info!("Install {}@{}: Unpacking Docker Images", pkg_id, version); - progress - .track_read_during(ctx.db.clone(), pkg_id, || async { - Command::new(CONTAINER_TOOL) - .arg("load") - .input(Some(&mut rdr.docker_images().await?)) - .invoke(ErrorKind::Docker) - .await - }) - .await?; - tracing::info!("Install {}@{}: Unpacked Docker Images", pkg_id, version,); - - tracing::info!("Install {}@{}: Unpacking Assets", pkg_id, version); - progress - .track_read_during(ctx.db.clone(), pkg_id, || async { - let asset_dir = asset_dir(&ctx.datadir, pkg_id, version); - if tokio::fs::metadata(&asset_dir).await.is_err() { - tokio::fs::create_dir_all(&asset_dir).await?; - } - let mut tar = tokio_tar::Archive::new(rdr.assets().await?); - tar.unpack(asset_dir).await?; - - let script_dir = script_dir(&ctx.datadir, pkg_id, version); - if tokio::fs::metadata(&script_dir).await.is_err() { - tokio::fs::create_dir_all(&script_dir).await?; - } - if let Some(mut hdl) = rdr.scripts().await? { - tokio::io::copy( - &mut hdl, - &mut File::create(script_dir.join("embassy.js")).await?, - ) - .await?; - } - - Ok(()) - }) - .await?; - tracing::info!("Install {}@{}: Unpacked Assets", pkg_id, version); progress.unpack_complete.store(true, Ordering::SeqCst); @@ -1107,6 +1016,8 @@ pub async fn install_s9pk( let mut auto_start = false; let mut configured = false; + let mut to_cleanup = None; + if let PackageDataEntry::Updating(PackageDataEntryUpdating { installed: prev, .. }) = &prev @@ -1148,7 +1059,7 @@ pub async fn install_s9pk( auto_start = prev.status.main.running(); } if &prev.manifest.version != version { - cleanup(&ctx, &prev.manifest.id, &prev.manifest.version).await?; + to_cleanup = Some((prev.manifest.id.clone(), prev.manifest.version.clone())); } } else if let PackageDataEntry::Restoring(PackageDataEntryRestoring { .. }) = prev { next.installed.marketplace_url = manifest @@ -1191,6 +1102,10 @@ pub async fn install_s9pk( }) .await?; + if let Some((id, version)) = to_cleanup { + cleanup(&ctx, &id, &version).await?; + } + if configured && manifest.config.is_some() { let breakages = BTreeMap::new(); let overrides = Default::default(); @@ -1237,15 +1152,103 @@ pub async fn install_s9pk( } #[instrument(skip_all)] -pub fn load_images<'a, P: AsRef + 'a + Send + Sync>( - datadir: P, +pub async fn unpack_s9pk( + datadir: impl AsRef, + manifest: &Manifest, + rdr: &mut S9pkReader, +) -> Result, Error> { + let datadir = datadir.as_ref(); + let pkg_id = &manifest.id; + let version = &manifest.version; + + let public_dir_path = datadir + .join(PKG_PUBLIC_DIR) + .join(pkg_id) + .join(version.as_str()); + tokio::fs::create_dir_all(&public_dir_path).await?; + + tracing::info!("Install {}@{}: Unpacking LICENSE.md", pkg_id, version); + let license_path = public_dir_path.join("LICENSE.md"); + let mut dst = File::create(&license_path).await?; + tokio::io::copy(&mut rdr.license().await?, &mut dst).await?; + dst.sync_all().await?; + tracing::info!("Install {}@{}: Unpacked LICENSE.md", pkg_id, version); + + tracing::info!("Install {}@{}: Unpacking INSTRUCTIONS.md", pkg_id, version); + let instructions_path = public_dir_path.join("INSTRUCTIONS.md"); + let mut dst = File::create(&instructions_path).await?; + tokio::io::copy(&mut rdr.instructions().await?, &mut dst).await?; + dst.sync_all().await?; + tracing::info!("Install {}@{}: Unpacked INSTRUCTIONS.md", pkg_id, version); + + let icon_filename = Path::new("icon").with_extension(manifest.assets.icon_type()); + let icon_path = public_dir_path.join(&icon_filename); + tracing::info!( + "Install {}@{}: Unpacking {}", + pkg_id, + version, + icon_path.display() + ); + let icon_buf = rdr.icon().await?.to_vec().await?; + let mut dst = File::create(&icon_path).await?; + dst.write_all(&icon_buf).await?; + dst.sync_all().await?; + let icon = DataUrl::from_vec( + mime(manifest.assets.icon_type()).unwrap_or("image/png"), + icon_buf, + ); + tracing::info!( + "Install {}@{}: Unpacked {}", + pkg_id, + version, + icon_filename.display() + ); + + tracing::info!("Install {}@{}: Unpacking Docker Images", pkg_id, version); + Command::new(CONTAINER_TOOL) + .arg("load") + .input(Some(&mut rdr.docker_images().await?)) + .invoke(ErrorKind::Docker) + .await?; + tracing::info!("Install {}@{}: Unpacked Docker Images", pkg_id, version,); + + tracing::info!("Install {}@{}: Unpacking Assets", pkg_id, version); + let asset_dir = asset_dir(datadir, pkg_id, version); + if tokio::fs::metadata(&asset_dir).await.is_ok() { + tokio::fs::remove_dir_all(&asset_dir).await?; + } + tokio::fs::create_dir_all(&asset_dir).await?; + let mut tar = tokio_tar::Archive::new(rdr.assets().await?); + tar.unpack(asset_dir).await?; + + let script_dir = script_dir(datadir, pkg_id, version); + if tokio::fs::metadata(&script_dir).await.is_err() { + tokio::fs::create_dir_all(&script_dir).await?; + } + if let Some(mut hdl) = rdr.scripts().await? { + tokio::io::copy( + &mut hdl, + &mut File::create(script_dir.join("embassy.js")).await?, + ) + .await?; + } + tracing::info!("Install {}@{}: Unpacked Assets", pkg_id, version); + + Ok(icon) +} + +#[instrument(skip_all)] +pub fn rebuild_from<'a>( + source: impl AsRef + 'a + Send + Sync, + datadir: impl AsRef + 'a + Send + Sync, ) -> BoxFuture<'a, Result<(), Error>> { async move { - let docker_dir = datadir.as_ref(); - if tokio::fs::metadata(&docker_dir).await.is_ok() { - ReadDirStream::new(tokio::fs::read_dir(&docker_dir).await?) + let source_dir = source.as_ref(); + let datadir = datadir.as_ref(); + if tokio::fs::metadata(&source_dir).await.is_ok() { + ReadDirStream::new(tokio::fs::read_dir(&source_dir).await?) .map(|r| { - r.with_ctx(|_| (crate::ErrorKind::Filesystem, format!("{:?}", &docker_dir))) + r.with_ctx(|_| (crate::ErrorKind::Filesystem, format!("{:?}", &source_dir))) }) .try_for_each(|entry| async move { let m = entry.metadata().await?; @@ -1260,26 +1263,21 @@ pub fn load_images<'a, P: AsRef + 'a + Send + Sync>( .arg("load") .input(Some(&mut File::open(&path).await?)) .invoke(ErrorKind::Docker) - .await + .await?; + Ok::<_, Error>(()) } Some("s9pk") => { - Command::new(CONTAINER_TOOL) - .arg("load") - .input(Some( - &mut S9pkReader::open(&path, true) - .await? - .docker_images() - .await?, - )) - .invoke(ErrorKind::Docker) - .await + let mut s9pk = S9pkReader::open(&path, true).await?; + unpack_s9pk(datadir, &s9pk.manifest().await?, &mut s9pk) + .await?; + Ok(()) } _ => unreachable!(), } } .await { - tracing::error!("Error loading docker images from s9pk: {e}"); + tracing::error!("Error unpacking {path:?}: {e}"); tracing::debug!("{e:?}"); } Ok(()) @@ -1287,7 +1285,7 @@ pub fn load_images<'a, P: AsRef + 'a + Send + Sync>( Ok(()) } } else if m.is_dir() { - load_images(entry.path()).await?; + rebuild_from(entry.path(), datadir).await?; Ok(()) } else { Ok(()) diff --git a/core/startos/src/lib.rs b/core/startos/src/lib.rs index 141ef1780..5fde6513f 100644 --- a/core/startos/src/lib.rs +++ b/core/startos/src/lib.rs @@ -1,5 +1,3 @@ -#![recursion_limit = "256"] - pub const DEFAULT_MARKETPLACE: &str = "https://registry.start9.com"; // pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com"; pub const BUFFER_SIZE: usize = 1024; @@ -107,6 +105,7 @@ pub fn main_api() -> Result<(), RpcError> { shutdown::restart, shutdown::rebuild, update::update_system, + firmware::update_firmware, ))] pub fn server() -> Result<(), RpcError> { Ok(()) diff --git a/core/startos/src/net/keys.rs b/core/startos/src/net/keys.rs index 624f3bcc4..504bd276d 100644 --- a/core/startos/src/net/keys.rs +++ b/core/startos/src/net/keys.rs @@ -1,14 +1,22 @@ +use std::collections::BTreeMap; + +use clap::ArgMatches; use color_eyre::eyre::eyre; use models::{Id, InterfaceId, PackageId}; use openssl::pkey::{PKey, Private}; use openssl::sha::Sha256; use openssl::x509::X509; use p256::elliptic_curve::pkcs8::EncodePrivateKey; -use sqlx::PgExecutor; +use rpc_toolkit::command; +use sqlx::{Acquire, PgExecutor}; use ssh_key::private::Ed25519PrivateKey; use torut::onion::{OnionAddressV3, TorSecretKeyV3}; use zeroize::Zeroize; +use crate::config::{configure, ConfigureContext}; +use crate::context::RpcContext; +use crate::control::restart; +use crate::disk::fsck::RequiresReboot; use crate::net::ssl::CertPair; use crate::prelude::*; use crate::util::crypto::ed25519_expand_key; @@ -271,3 +279,107 @@ pub fn test_keygen() { key.tor_key(); key.openssl_key_nistp256(); } + +fn display_requires_reboot(arg: RequiresReboot, _matches: &ArgMatches) { + if arg.0 { + println!("Server must be restarted for changes to take effect"); + } +} + +#[command(rename = "rotate-key", display(display_requires_reboot))] +pub async fn rotate_key( + #[context] ctx: RpcContext, + #[arg] package: Option, + #[arg] interface: Option, +) -> Result { + let mut pgcon = ctx.secret_store.acquire().await?; + let mut tx = pgcon.begin().await?; + if let Some(package) = package { + let Some(interface) = interface else { + return Err(Error::new( + eyre!("Must specify interface"), + ErrorKind::InvalidRequest, + )); + }; + sqlx::query!( + "DELETE FROM tor WHERE package = $1 AND interface = $2", + &package, + &interface, + ) + .execute(&mut *tx) + .await?; + sqlx::query!( + "DELETE FROM network_keys WHERE package = $1 AND interface = $2", + &package, + &interface, + ) + .execute(&mut *tx) + .await?; + let new_key = + Key::for_interface(&mut *tx, Some((package.clone(), interface.clone()))).await?; + let needs_config = ctx + .db + .mutate(|v| { + let installed = v + .as_package_data_mut() + .as_idx_mut(&package) + .or_not_found(&package)? + .as_installed_mut() + .or_not_found("installed")?; + let addrs = installed + .as_interface_addresses_mut() + .as_idx_mut(&interface) + .or_not_found(&interface)?; + if let Some(lan) = addrs.as_lan_address_mut().transpose_mut() { + lan.ser(&new_key.local_address())?; + } + if let Some(lan) = addrs.as_tor_address_mut().transpose_mut() { + lan.ser(&new_key.tor_address().to_string())?; + } + + if installed + .as_manifest() + .as_config() + .transpose_ref() + .is_some() + { + installed + .as_status_mut() + .as_configured_mut() + .replace(&false) + } else { + Ok(false) + } + }) + .await?; + tx.commit().await?; + if needs_config { + configure( + &ctx, + &package, + ConfigureContext { + breakages: BTreeMap::new(), + timeout: None, + config: None, + overrides: BTreeMap::new(), + dry_run: false, + }, + ) + .await?; + } else { + restart(ctx, package).await?; + } + Ok(RequiresReboot(false)) + } else { + sqlx::query!("UPDATE account SET tor_key = NULL, network_key = gen_random_bytes(32)") + .execute(&mut *tx) + .await?; + let new_key = Key::for_interface(&mut *tx, None).await?; + let url = format!("https://{}", new_key.tor_address()).parse()?; + ctx.db + .mutate(|v| v.as_server_info_mut().as_tor_address_mut().ser(&url)) + .await?; + tx.commit().await?; + Ok(RequiresReboot(true)) + } +} diff --git a/core/startos/src/net/mod.rs b/core/startos/src/net/mod.rs index 0b98c439a..50935fb18 100644 --- a/core/startos/src/net/mod.rs +++ b/core/startos/src/net/mod.rs @@ -22,7 +22,7 @@ pub mod wifi; pub const PACKAGE_CERT_PATH: &str = "/var/lib/embassy/ssl"; -#[command(subcommands(tor::tor, dhcp::dhcp, ssl::ssl))] +#[command(subcommands(tor::tor, dhcp::dhcp, ssl::ssl, keys::rotate_key))] pub fn net() -> Result<(), Error> { Ok(()) } diff --git a/core/startos/src/net/static_server.rs b/core/startos/src/net/static_server.rs index c4dca85f2..761566a2c 100644 --- a/core/startos/src/net/static_server.rs +++ b/core/startos/src/net/static_server.rs @@ -23,6 +23,7 @@ use tokio_util::io::ReaderStream; use crate::context::{DiagnosticContext, InstallContext, RpcContext, SetupContext}; use crate::core::rpc_continuations::RequestGuid; use crate::db::subscribe; +use crate::hostname::Hostname; use crate::install::PKG_PUBLIC_DIR; use crate::middleware::auth::{auth as auth_middleware, HasValidSession}; use crate::middleware::cors::cors; @@ -339,7 +340,8 @@ async fn main_embassy_ui(req: Request, ctx: RpcContext) -> Result { - cert_send(&ctx.account.read().await.root_ca_cert) + let account = ctx.account.read().await; + cert_send(&account.root_ca_cert, &account.hostname) } (&Method::GET, _) => { let uri_path = UiMode::Main.path( @@ -405,7 +407,7 @@ fn bad_request() -> Response { .unwrap() } -fn cert_send(cert: &X509) -> Result, Error> { +fn cert_send(cert: &X509, hostname: &Hostname) -> Result, Error> { let pem = cert.to_pem()?; Response::builder() .status(StatusCode::OK) @@ -417,8 +419,12 @@ fn cert_send(cert: &X509) -> Result, Error> { ) .to_lowercase(), ) - .header(http::header::CONTENT_TYPE, "application/x-pem-file") + .header(http::header::CONTENT_TYPE, "application/x-x509-ca-cert") .header(http::header::CONTENT_LENGTH, pem.len()) + .header( + http::header::CONTENT_DISPOSITION, + format!("attachment; filename={}.crt", &hostname.0), + ) .body(Body::from(pem)) .with_kind(ErrorKind::Network) } diff --git a/core/startos/src/net/tor.rs b/core/startos/src/net/tor.rs index 9926d3c6c..1bf4c5f44 100644 --- a/core/startos/src/net/tor.rs +++ b/core/startos/src/net/tor.rs @@ -53,11 +53,6 @@ lazy_static! { static ref PROGRESS_REGEX: Regex = Regex::new("PROGRESS=([0-9]+)").unwrap(); } -#[test] -fn random_key() { - println!("x'{}'", hex::encode(rand::random::<[u8; 32]>())); -} - #[command(subcommands(list_services, logs, reset))] pub fn tor() -> Result<(), Error> { Ok(()) @@ -684,6 +679,7 @@ impl TorControl { } #[tokio::test] +#[ignore] async fn test() { let mut conn = torut::control::UnauthenticatedConn::new( TcpStream::connect(SocketAddr::from(([127, 0, 0, 1], 9051))) diff --git a/core/startos/src/procedure/js_scripts.rs b/core/startos/src/procedure/js_scripts.rs index 2c11988ad..43553cee0 100644 --- a/core/startos/src/procedure/js_scripts.rs +++ b/core/startos/src/procedure/js_scripts.rs @@ -81,8 +81,12 @@ impl JsProcedure { _gid: ProcessGroupId, _rpc_client: Option>, ) -> Result, Error> { - Command::new("start-deno") - .arg("execute") + #[cfg(not(test))] + let mut cmd = Command::new("start-deno"); + #[cfg(test)] + let mut cmd = test_start_deno_command().await?; + + cmd.arg("execute") .input(Some(&mut std::io::Cursor::new(IoFormat::Json.to_vec( &ExecuteArgs { procedure: self.clone(), @@ -111,8 +115,12 @@ impl JsProcedure { timeout: Option, name: ProcedureName, ) -> Result, Error> { - Command::new("start-deno") - .arg("sandbox") + #[cfg(not(test))] + let mut cmd = Command::new("start-deno"); + #[cfg(test)] + let mut cmd = test_start_deno_command().await?; + + cmd.arg("sandbox") .input(Some(&mut std::io::Cursor::new(IoFormat::Json.to_vec( &ExecuteArgs { procedure: self.clone(), @@ -212,6 +220,26 @@ fn unwrap_known_error( } } +#[cfg(test)] +async fn test_start_deno_command() -> Result { + Command::new("cargo") + .arg("build") + .invoke(ErrorKind::Unknown) + .await?; + if tokio::fs::metadata("../target/debug/start-deno") + .await + .is_err() + { + Command::new("ln") + .arg("-rsf") + .arg("../target/debug/startbox") + .arg("../target/debug/start-deno") + .invoke(crate::ErrorKind::Filesystem) + .await?; + } + Ok(Command::new("../target/debug/start-deno")) +} + #[tokio::test] async fn js_action_execute() { let js_action = JsProcedure { args: vec![] }; diff --git a/core/startos/src/procedure/mod.rs b/core/startos/src/procedure/mod.rs index dc4852d7c..f3a528713 100644 --- a/core/startos/src/procedure/mod.rs +++ b/core/startos/src/procedure/mod.rs @@ -179,5 +179,7 @@ impl<'de> Deserialize<'de> for NoOutput { #[test] fn test_deser_no_output() { serde_json::from_str::("").unwrap(); - serde_json::from_str::>("{\"Ok\": null}").unwrap(); + serde_json::from_str::>("{\"Ok\": null}") + .unwrap() + .unwrap(); } diff --git a/core/startos/src/shutdown.rs b/core/startos/src/shutdown.rs index 7a34d1e94..e5ff969b6 100644 --- a/core/startos/src/shutdown.rs +++ b/core/startos/src/shutdown.rs @@ -54,6 +54,17 @@ impl Shutdown { tracing::error!("Error Stopping Docker: {}", e); tracing::debug!("{:?}", e); } + } else if CONTAINER_TOOL == "podman" { + if let Err(e) = Command::new("podman") + .arg("rm") + .arg("-f") + .arg("netdummy") + .invoke(crate::ErrorKind::Docker) + .await + { + tracing::error!("Error Stopping Podman: {}", e); + tracing::debug!("{:?}", e); + } } if let Some((guid, datadir)) = &self.export_args { if let Err(e) = export(guid, datadir).await { diff --git a/core/startos/src/system.rs b/core/startos/src/system.rs index 989cdc4aa..b5cd42844 100644 --- a/core/startos/src/system.rs +++ b/core/startos/src/system.rs @@ -1,3 +1,4 @@ +use std::collections::BTreeSet; use std::fmt; use chrono::Utc; @@ -20,11 +21,12 @@ use crate::logs::{ }; use crate::prelude::*; use crate::shutdown::Shutdown; +use crate::util::cpupower::{get_available_governors, set_governor, Governor}; use crate::util::serde::{display_serializable, IoFormat}; use crate::util::{display_none, Invoke}; use crate::{Error, ErrorKind, ResultExt}; -#[command(subcommands(zram))] +#[command(subcommands(zram, governor))] pub async fn experimental() -> Result<(), Error> { Ok(()) } @@ -85,6 +87,56 @@ pub async fn zram(#[context] ctx: RpcContext, #[arg] enable: bool) -> Result<(), Ok(()) } +#[derive(Debug, Deserialize, Serialize)] +pub struct GovernorInfo { + current: Option, + available: BTreeSet, +} + +fn display_governor_info(arg: GovernorInfo, matches: &ArgMatches) { + use prettytable::*; + + if matches.is_present("format") { + return display_serializable(arg, matches); + } + + let mut table = Table::new(); + table.add_row(row![bc -> "GOVERNORS"]); + for entry in arg.available { + if Some(&entry) == arg.current.as_ref() { + table.add_row(row![g -> format!("* {entry} (current)")]); + } else { + table.add_row(row![entry]); + } + } + table.print_tty(false).unwrap(); +} + +#[command(display(display_governor_info))] +pub async fn governor( + #[context] ctx: RpcContext, + #[allow(unused_variables)] + #[arg(long = "format")] + format: Option, + #[arg] set: Option, +) -> Result { + let available = get_available_governors().await?; + if let Some(set) = set { + if !available.contains(&set) { + return Err(Error::new( + eyre!("Governor {set} not available"), + ErrorKind::InvalidRequest, + )); + } + set_governor(&set).await?; + ctx.db + .mutate(|d| d.as_server_info_mut().as_governor_mut().ser(&Some(set))) + .await?; + } + let current = ctx.db.peek().await.as_server_info().as_governor().de()?; + Ok(GovernorInfo { current, available }) +} + #[derive(Serialize, Deserialize)] pub struct TimeInfo { now: String, @@ -841,6 +893,7 @@ async fn get_disk_info() -> Result { } #[tokio::test] +#[ignore] pub async fn test_get_temp() { println!("{}", get_temp().await.unwrap()) } @@ -856,6 +909,7 @@ pub async fn test_get_mem_info() { } #[tokio::test] +#[ignore] pub async fn test_get_disk_usage() { println!("{:?}", get_disk_info().await.unwrap()) } diff --git a/core/startos/src/util/cpupower.rs b/core/startos/src/util/cpupower.rs index a48502754..cc4ac5ef4 100644 --- a/core/startos/src/util/cpupower.rs +++ b/core/startos/src/util/cpupower.rs @@ -7,10 +7,20 @@ use tokio::process::Command; use crate::prelude::*; use crate::util::Invoke; -pub const GOVERNOR_PERFORMANCE: Governor = Governor(Cow::Borrowed("performance")); +pub const GOVERNOR_HEIRARCHY: &[Governor] = &[ + Governor(Cow::Borrowed("ondemand")), + Governor(Cow::Borrowed("schedutil")), + Governor(Cow::Borrowed("conservative")), +]; -#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)] +#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)] pub struct Governor(Cow<'static, str>); +impl std::str::FromStr for Governor { + type Err = std::convert::Infallible; + fn from_str(s: &str) -> Result { + Ok(Self(s.to_owned().into())) + } +} impl std::fmt::Display for Governor { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { self.0.fmt(f) @@ -29,13 +39,12 @@ impl std::borrow::Borrow for Governor { } pub async fn get_available_governors() -> Result, Error> { - let raw = String::from_utf8( - Command::new("cpupower") - .arg("frequency-info") - .arg("-g") - .invoke(ErrorKind::CpuSettings) - .await?, - )?; + let raw = Command::new("cpupower") + .arg("frequency-info") + .arg("-g") + .invoke(ErrorKind::CpuSettings) + .await + .map_or_else(|e| Ok(e.source.to_string()), String::from_utf8)?; let mut for_cpu: OrdMap> = OrdMap::new(); let mut current_cpu = None; for line in raw.lines() { @@ -114,6 +123,16 @@ pub async fn current_governor() -> Result, Error> { )) } +pub async fn get_preferred_governor() -> Result, Error> { + let governors = get_available_governors().await?; + for governor in GOVERNOR_HEIRARCHY { + if governors.contains(governor) { + return Ok(Some(governor)); + } + } + Ok(None) +} + pub async fn set_governor(governor: &Governor) -> Result<(), Error> { Command::new("cpupower") .arg("frequency-set") diff --git a/core/startos/src/version/mod.rs b/core/startos/src/version/mod.rs index 929d76dfc..4c6f157a5 100644 --- a/core/startos/src/version/mod.rs +++ b/core/startos/src/version/mod.rs @@ -14,8 +14,9 @@ mod v0_3_4_2; mod v0_3_4_3; mod v0_3_4_4; mod v0_3_5; +mod v0_3_5_1; -pub type Current = v0_3_5::Version; +pub type Current = v0_3_5_1::Version; #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)] #[serde(untagged)] @@ -26,6 +27,7 @@ enum Version { V0_3_4_3(Wrapper), V0_3_4_4(Wrapper), V0_3_5(Wrapper), + V0_3_5_1(Wrapper), Other(emver::Version), } @@ -47,6 +49,7 @@ impl Version { Version::V0_3_4_3(Wrapper(x)) => x.semver(), Version::V0_3_4_4(Wrapper(x)) => x.semver(), Version::V0_3_5(Wrapper(x)) => x.semver(), + Version::V0_3_5_1(Wrapper(x)) => x.semver(), Version::Other(x) => x.clone(), } } @@ -172,6 +175,7 @@ pub async fn init(db: &PatchDb, secrets: &PgPool) -> Result<(), Error> { Version::V0_3_4_3(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::V0_3_4_4(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::V0_3_5(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, + Version::V0_3_5_1(v) => v.0.migrate_to(&Current::new(), db.clone(), secrets).await?, Version::Other(_) => { return Err(Error::new( eyre!("Cannot downgrade"), @@ -208,6 +212,9 @@ mod tests { Just(Version::V0_3_4_1(Wrapper(v0_3_4_1::Version::new()))), Just(Version::V0_3_4_2(Wrapper(v0_3_4_2::Version::new()))), Just(Version::V0_3_4_3(Wrapper(v0_3_4_3::Version::new()))), + Just(Version::V0_3_4_4(Wrapper(v0_3_4_4::Version::new()))), + Just(Version::V0_3_5(Wrapper(v0_3_5::Version::new()))), + Just(Version::V0_3_5_1(Wrapper(v0_3_5_1::Version::new()))), em_version().prop_map(Version::Other), ] } diff --git a/core/startos/src/version/v0_3_5_1.rs b/core/startos/src/version/v0_3_5_1.rs new file mode 100644 index 000000000..c004dc8b6 --- /dev/null +++ b/core/startos/src/version/v0_3_5_1.rs @@ -0,0 +1,32 @@ +use async_trait::async_trait; +use emver::VersionRange; +use sqlx::PgPool; + +use super::v0_3_4::V0_3_0_COMPAT; +use super::{v0_3_5, VersionT}; +use crate::prelude::*; + +const V0_3_5_1: emver::Version = emver::Version::new(0, 3, 5, 1); + +#[derive(Clone, Debug)] +pub struct Version; + +#[async_trait] +impl VersionT for Version { + type Previous = v0_3_5::Version; + fn new() -> Self { + Version + } + fn semver(&self) -> emver::Version { + V0_3_5_1 + } + fn compat(&self) -> &'static VersionRange { + &V0_3_0_COMPAT + } + async fn up(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> { + Ok(()) + } + async fn down(&self, _db: PatchDb, _secrets: &PgPool) -> Result<(), Error> { + Ok(()) + } +} diff --git a/download-firmware.sh b/download-firmware.sh new file mode 100755 index 000000000..2457b3062 --- /dev/null +++ b/download-firmware.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +cd "$(dirname "${BASH_SOURCE[0]}")" + +set -e + +PLATFORM=$1 + +if [ -z "$PLATFORM" ]; then + >&2 echo "usage: $0 " + exit 1 +fi + +rm -rf ./firmware/$PLATFORM +mkdir -p ./firmware/$PLATFORM + +cd ./firmware/$PLATFORM + +mapfile -t firmwares <<< "$(jq -c ".[] | select(.platform[] | contains(\"$PLATFORM\"))" ../../build/lib/firmware.json)" +for firmware in "${firmwares[@]}"; do + if [ -n "$firmware" ]; then + id=$(echo "$firmware" | jq --raw-output '.id') + url=$(echo "$firmware" | jq --raw-output '.url') + shasum=$(echo "$firmware" | jq --raw-output '.shasum') + curl --fail -L -o "${id}.rom.gz" "$url" + echo "$shasum ${id}.rom.gz" | sha256sum -c + fi +done diff --git a/image-recipe/build.sh b/image-recipe/build.sh index bfc7921d9..836fc49ed 100755 --- a/image-recipe/build.sh +++ b/image-recipe/build.sh @@ -158,8 +158,8 @@ echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/tor.key.gpg] curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o config/archives/docker.key echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gpg] https://download.docker.com/linux/debian ${IB_SUITE} stable" > config/archives/docker.list -curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key -echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:kubic:libcontainers:unstable/Debian_Testing/ /" > config/archives/podman.list +curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key +echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/ /" > config/archives/podman.list # Dependencies @@ -344,4 +344,4 @@ elif [ "${IMAGE_TYPE}" = img ]; then mv $TARGET_NAME $RESULTS_DIR/$IMAGE_BASENAME.img -fi \ No newline at end of file +fi diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock index 0c646aebf..c1e0959fb 100644 --- a/system-images/compat/Cargo.lock +++ b/system-images/compat/Cargo.lock @@ -3800,9 +3800,12 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +dependencies = [ + "serde", +] [[package]] name = "serde" @@ -4399,7 +4402,7 @@ dependencies = [ [[package]] name = "start-os" -version = "0.3.5" +version = "0.3.5-rev.1" dependencies = [ "aes", "async-compression", @@ -4475,6 +4478,7 @@ dependencies = [ "rpc-toolkit", "rust-argon2 2.0.0", "scopeguard", + "semver", "serde", "serde_json", "serde_with", diff --git a/web/package-lock.json b/web/package-lock.json index 40a67f4d9..160cb31bb 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "startos-ui", - "version": "0.3.5", + "version": "0.3.5.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "startos-ui", - "version": "0.3.5", + "version": "0.3.5.1", "dependencies": { "@angular/animations": "^14.1.0", "@angular/common": "^14.1.0", diff --git a/web/package.json b/web/package.json index e001b4484..7784543fe 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "startos-ui", - "version": "0.3.5", + "version": "0.3.5.1", "author": "Start9 Labs, Inc", "homepage": "https://start9.com/", "scripts": { diff --git a/web/patchdb-ui-seed.json b/web/patchdb-ui-seed.json index 5e31b198b..0a678d4e8 100644 --- a/web/patchdb-ui-seed.json +++ b/web/patchdb-ui-seed.json @@ -1,6 +1,6 @@ { "name": null, - "ack-welcome": "0.3.5", + "ack-welcome": "0.3.5.1", "marketplace": { "selected-url": "https://registry.start9.com/", "known-hosts": { diff --git a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html index ed05ccb45..23bc7e1fd 100644 --- a/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html +++ b/web/projects/ui/src/app/modals/os-welcome/os-welcome.page.html @@ -12,6 +12,26 @@

This Release

+

0.3.5.1

+

+ View the complete + + release notes + + for more details. +

+
Highlights
+
    +
  • Revert perpetual performance mode for quieter fan
    • +
  • Minor bug fixes
    • +
+ +

Previous 0.3.5.x Releases

+

0.3.5

View the complete diff --git a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html index a76cdab34..49f65cc14 100644 --- a/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html +++ b/web/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html @@ -44,7 +44,7 @@ size="small" shape="round" color="primary" - href="https://docs.start9.com/0.3.5.x/user-manual/trust-ca#establishing-trust" + href="https://docs.start9.com/0.3.5.x/user-manual/trust-ca" target="_blank" noreferrer > @@ -100,7 +100,4 @@ diff --git a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html index 69f82ff43..0ca8c7d8e 100644 --- a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html +++ b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.html @@ -27,8 +27,8 @@

{{ server.zram ? 'Disable' : 'Enable' }} zram

- Enabling zram may improve server performance, especially on low RAM - devices + Zram creates compressed swap in memory, resulting in faster I/O for + low RAM devices

diff --git a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts index ed57066ab..bf445250a 100644 --- a/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts +++ b/web/projects/ui/src/app/pages/server-routes/experimental-features/experimental-features.page.ts @@ -65,10 +65,10 @@ export class ExperimentalFeaturesPage { async presentAlertZram(enabled: boolean) { const alert = await this.alertCtrl.create({ - header: enabled ? 'Confirm' : 'Warning', + header: 'Confirm', message: enabled - ? 'Are you sure you want to disable zram?' - : 'zram on StartOS is experimental. It may increase performance of you server, especially if it is a low RAM device.', + ? 'Are you sure you want to disable zram? It provides significant performance benefits on low RAM devices.' + : 'Enable zram? It will only make a difference on lower RAM devices.', buttons: [ { text: 'Cancel', @@ -82,7 +82,6 @@ export class ExperimentalFeaturesPage { cssClass: 'enter-click', }, ], - cssClass: enabled ? '' : 'alert-warning-message', }) await alert.present() } @@ -122,7 +121,7 @@ export class ExperimentalFeaturesPage { private async toggleZram(enabled: boolean) { const loader = await this.loadingCtrl.create({ - message: enabled ? 'Disabling zram...' : 'Enabling zram', + message: enabled ? 'Disabling zram...' : 'Enabling zram...', }) await loader.present() diff --git a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html index ed811d63d..b61412445 100644 --- a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html +++ b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.html @@ -15,7 +15,7 @@

For a secure local connection and faster Tor experience, @@ -26,7 +26,7 @@ - +

Download Root CA

@@ -35,5 +35,5 @@ - + diff --git a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts index bcb0a968f..328524d30 100644 --- a/web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts +++ b/web/projects/ui/src/app/pages/server-routes/lan/lan.page.ts @@ -10,10 +10,6 @@ import { DataModel } from 'src/app/services/patch-db/data-model' changeDetection: ChangeDetectionStrategy.OnPush, }) export class LANPage { - readonly crtName$ = this.patch - .watch$('server-info', 'lan-address') - .pipe(map(addr => `${new URL(addr).hostname}.crt`)) - constructor(private readonly patch: PatchDB) {} installCert(): void { diff --git a/web/projects/ui/src/app/services/api/api.fixures.ts b/web/projects/ui/src/app/services/api/api.fixures.ts index c4db1225d..17460609a 100644 --- a/web/projects/ui/src/app/services/api/api.fixures.ts +++ b/web/projects/ui/src/app/services/api/api.fixures.ts @@ -21,10 +21,10 @@ export module Mock { 'shutting-down': false, } export const MarketplaceEos: RR.GetMarketplaceEosRes = { - version: '0.3.5', + version: '0.3.5.1', headline: 'Our biggest release ever.', 'release-notes': { - '0.3.5': 'Some **Markdown** release _notes_ for 0.3.5', + '0.3.5.1': 'Some **Markdown** release _notes_ for 0.3.5.1', '0.3.4.4': 'Some **Markdown** release _notes_ for 0.3.4.4', '0.3.4.3': 'Some **Markdown** release _notes_ for 0.3.4.3', '0.3.4.2': 'Some **Markdown** release _notes_ for 0.3.4.2', diff --git a/web/projects/ui/src/app/services/api/mock-patch.ts b/web/projects/ui/src/app/services/api/mock-patch.ts index 0c930aa8f..1dc7abd66 100644 --- a/web/projects/ui/src/app/services/api/mock-patch.ts +++ b/web/projects/ui/src/app/services/api/mock-patch.ts @@ -42,7 +42,7 @@ export const mockPatchData: DataModel = { }, 'server-info': { id: 'abcdefgh', - version: '0.3.5', + version: '0.3.5.1', 'last-backup': new Date(new Date().valueOf() - 604800001).toISOString(), 'lan-address': 'https://adjective-noun.local', 'tor-address': 'https://myveryownspecialtoraddress.onion', diff --git a/web/projects/ui/src/manifest.webmanifest b/web/projects/ui/src/manifest.webmanifest index a199ac1dd..fee3469fc 100644 --- a/web/projects/ui/src/manifest.webmanifest +++ b/web/projects/ui/src/manifest.webmanifest @@ -5,8 +5,8 @@ "background_color": "#1e1e1e", "display": "standalone", "scope": ".", - "start_url": "/?version=035", - "id": "/?version=035", + "start_url": "/?version=0351", + "id": "/?version=0351", "icons": [ { "src": "assets/img/icon.png",