From 6e73cb8a8e96c3eab956bfb168f97465d04a25ae Mon Sep 17 00:00:00 2001 From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com> Date: Wed, 17 Dec 2025 13:17:58 -0700 Subject: [PATCH] Move modules to individual projects. Change API syntax. --- .../client}/Cargo.lock | 364 +++++++++++++++++- .../client}/Cargo.toml | 15 +- .../client/src}/client_runtime.rs | 17 +- .../mod.rs => core-modules/client/src/lib.rs | 10 +- core-modules/client/unshell_component.toml | 11 + core-modules/server/Cargo.toml | 6 + core-modules/server/src/main.rs | 3 + core-modules/server/unshell_component.toml | 9 + core-modules/unshell_component.toml | 9 + unshell-config/README.md | 0 unshell-config/src/main.rs | 16 - unshell-lib/src/components.rs | 14 - unshell-lib/src/lib.rs | 4 - unshell-server/src/api/app.rs | 105 ++--- unshell-server/src/api/mod.rs | 2 + unshell-server/src/config/blob.rs | 12 + unshell-server/src/config/mod.rs | 6 +- unshell-server/src/lib.rs | 12 +- unshell-server/src/logger.rs | 18 + unshell-server/src/server/blobs.rs | 9 + unshell-server/src/server/database.rs | 67 +++- unshell-server/src/server/mod.rs | 1 + 22 files changed, 546 insertions(+), 164 deletions(-) rename {unshell-config => core-modules/client}/Cargo.lock (59%) rename {unshell-config => core-modules/client}/Cargo.toml (51%) rename {unshell-lib/src/client => core-modules/client/src}/client_runtime.rs (91%) rename unshell-lib/src/client/mod.rs => core-modules/client/src/lib.rs (89%) create mode 100644 core-modules/client/unshell_component.toml create mode 100644 core-modules/server/Cargo.toml create mode 100644 core-modules/server/src/main.rs create mode 100644 core-modules/server/unshell_component.toml create mode 100644 core-modules/unshell_component.toml delete mode 100644 unshell-config/README.md delete mode 100644 unshell-config/src/main.rs delete mode 100644 unshell-lib/src/components.rs create mode 100644 unshell-server/src/config/blob.rs create mode 100644 unshell-server/src/server/blobs.rs diff --git a/unshell-config/Cargo.lock b/core-modules/client/Cargo.lock similarity index 59% rename from unshell-config/Cargo.lock rename to core-modules/client/Cargo.lock index 0669f27..8854404 100644 --- a/unshell-config/Cargo.lock +++ b/core-modules/client/Cargo.lock @@ -22,6 +22,41 @@ dependencies = [ "memchr", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "bincode" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740" +dependencies = [ + "bincode_derive", + "serde", + "unty", +] + +[[package]] +name = "bincode_derive" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09" +dependencies = [ + "virtue", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -61,6 +96,12 @@ dependencies = [ "hybrid-array", ] +[[package]] +name = "bumpalo" +version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" + [[package]] name = "cbc" version = "0.1.2" @@ -70,6 +111,16 @@ dependencies = [ "cipher", ] +[[package]] +name = "cc" +version = "1.2.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" +dependencies = [ + "find-msvc-tools", + "shlex", +] + [[package]] name = "cfg-if" version = "1.0.4" @@ -88,6 +139,19 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chrono" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-link", +] + [[package]] name = "cipher" version = "0.4.4" @@ -98,6 +162,20 @@ dependencies = [ "inout", ] +[[package]] +name = "client" +version = "0.1.0" +dependencies = [ + "unshell-lib", + "unshell-obfuscate", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -107,6 +185,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + [[package]] name = "crypto-common" version = "0.1.7" @@ -127,6 +220,12 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" + [[package]] name = "generic-array" version = "0.14.7" @@ -170,6 +269,30 @@ dependencies = [ "typenum", ] +[[package]] +name = "iana-time-zone" +version = "0.1.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "inout" version = "0.1.4" @@ -180,12 +303,38 @@ dependencies = [ "generic-array", ] +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "js-sys" +version = "0.3.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + [[package]] name = "libc" version = "0.2.178" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +[[package]] +name = "libloading" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +dependencies = [ + "cfg-if", + "windows-link", +] + [[package]] name = "lock_api" version = "0.4.14" @@ -195,12 +344,33 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "log" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" + [[package]] name = "memchr" version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + [[package]] name = "parking_lot" version = "0.12.5" @@ -324,12 +494,67 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serde_json" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", + "serde_core", +] + [[package]] name = "sha2" version = "0.10.9" @@ -341,6 +566,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "smallvec" version = "1.15.1" @@ -409,14 +640,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" -[[package]] -name = "unshell-config" -version = "0.1.0" -dependencies = [ - "libc", - "unshell-obfuscate", -] - [[package]] name = "unshell-crypt" version = "0.1.0" @@ -431,6 +654,21 @@ dependencies = [ "sha2", ] +[[package]] +name = "unshell-lib" +version = "0.0.0" +dependencies = [ + "bincode", + "chrono", + "crossbeam-channel", + "libc", + "libloading", + "rand", + "serde", + "serde_json", + "unshell-obfuscate", +] + [[package]] name = "unshell-obfuscate" version = "0.0.0" @@ -443,12 +681,24 @@ dependencies = [ "unshell-crypt", ] +[[package]] +name = "unty" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" + [[package]] name = "version_check" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "virtue" +version = "0.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" + [[package]] name = "wasip2" version = "1.0.1+wasi-0.2.4" @@ -458,6 +708,51 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "wasm-bindgen" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 2.0.111", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +dependencies = [ + "unicode-ident", +] + [[package]] name = "winapi" version = "0.3.9" @@ -480,12 +775,65 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + [[package]] name = "wit-bindgen" version = "0.46.0" diff --git a/unshell-config/Cargo.toml b/core-modules/client/Cargo.toml similarity index 51% rename from unshell-config/Cargo.toml rename to core-modules/client/Cargo.toml index 3b55dbb..e2e4a33 100644 --- a/unshell-config/Cargo.toml +++ b/core-modules/client/Cargo.toml @@ -1,21 +1,20 @@ cargo-features = ["trim-paths"] [package] -name = "unshell-config" +name = "client" version = "0.1.0" edition = "2024" +[lib] +crate-type = ["cdylib"] [features] -default = ["obfuscate"] - -obfuscate = ["unshell-obfuscate/obfuscate"] +log_debug = ["unshell-lib/log_debug"] +obfuscate = ["unshell-lib/obfuscate"] [dependencies] -libc = { version = "0.2.178", default-features = false } - -unshell-obfuscate = {path = "../unshell-obfuscate", default-features=false} - +unshell-lib = {path = "../../unshell-lib", default-featues = false} +unshell-obfuscate = {path = "../../unshell-obfuscate", default-featues = false} [profile.release] strip = true # Strip symbols from the binary diff --git a/unshell-lib/src/client/client_runtime.rs b/core-modules/client/src/client_runtime.rs similarity index 91% rename from unshell-lib/src/client/client_runtime.rs rename to core-modules/client/src/client_runtime.rs index cc256aa..2fcc115 100644 --- a/unshell-lib/src/client/client_runtime.rs +++ b/core-modules/client/src/client_runtime.rs @@ -1,17 +1,22 @@ use std::{ - net::TcpStream, + net, sync::{ - Arc, + Arc, Mutex, atomic::{AtomicBool, Ordering}, }, thread::{self, JoinHandle}, time::Duration, }; -use crate::{config::RuntimeConfig, network::Stream, *}; +use unshell_lib::{ + config::RuntimeConfig, + module::Manager, + network::{Stream, TcpStream}, + *, +}; // use unshell_modules::{Manager, ModuleRuntime}; -use crate::ModuleRuntime; +use unshell_lib::ModuleRuntime; pub struct ClientRuntime { config: &'static RuntimeConfig, @@ -86,7 +91,7 @@ impl ModuleRuntime for ClientRuntime { debug!("Connecting to server..."); loop { - let stream = match TcpStream::connect(host) { + let stream = match net::TcpStream::connect(host) { Ok(stream) => stream, Err(e) => { error!("Failed to connect to server: {}", e); @@ -99,7 +104,7 @@ impl ModuleRuntime for ClientRuntime { thread::sleep(Duration::from_millis(100)); // Duration::from_millis(100); - let stream = crate::network::TcpStream::new(stream); + let stream = TcpStream::new(stream); let stream_clone = stream.try_clone().unwrap(); manager.lock().unwrap().add_connection(stream_clone); diff --git a/unshell-lib/src/client/mod.rs b/core-modules/client/src/lib.rs similarity index 89% rename from unshell-lib/src/client/mod.rs rename to core-modules/client/src/lib.rs index f3f1bcd..68214cb 100644 --- a/unshell-lib/src/client/mod.rs +++ b/core-modules/client/src/lib.rs @@ -2,21 +2,19 @@ mod client_runtime; pub const MODULE_NAME: &'static str = "client"; -// pub use unshell_modules::setup_logger; - -// use unshell_modules::{Manager, ModuleRuntime, module_interface}; - use std::any::TypeId; -use crate::{ +use unshell_lib::{ ModuleError, ModuleRuntime, - client::client_runtime::ClientRuntime, + // client::client_runtime::ClientRuntime, config::{InterfaceWrapper, NamedComponent, RuntimeConfig}, module_interface, warn, // module_interface, }; +use crate::client_runtime::ClientRuntime; + pub extern "C" fn test1() { warn!("Test1 called xxxxxxxxxxx"); } diff --git a/core-modules/client/unshell_component.toml b/core-modules/client/unshell_component.toml new file mode 100644 index 0000000..37b294c --- /dev/null +++ b/core-modules/client/unshell_component.toml @@ -0,0 +1,11 @@ +name="Client" +version="0.1" +description="Test Client module" +authors=["astatin3"] + + +[config] +header1 = { Header = "Header123" } +integer1 = { Integer = {}} + +[build_config] diff --git a/core-modules/server/Cargo.toml b/core-modules/server/Cargo.toml new file mode 100644 index 0000000..ff06670 --- /dev/null +++ b/core-modules/server/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "server" +version = "0.1.0" +edition = "2024" + +[dependencies] diff --git a/core-modules/server/src/main.rs b/core-modules/server/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/core-modules/server/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/core-modules/server/unshell_component.toml b/core-modules/server/unshell_component.toml new file mode 100644 index 0000000..3e2ec8f --- /dev/null +++ b/core-modules/server/unshell_component.toml @@ -0,0 +1,9 @@ +name="Server" +version="0.1" +description="Test server module for unshell" +authors=["astatin3"] + + +[config] +header1 = { Header = "Header123" } +integer1 = { Integer = {}} diff --git a/core-modules/unshell_component.toml b/core-modules/unshell_component.toml new file mode 100644 index 0000000..fe72aee --- /dev/null +++ b/core-modules/unshell_component.toml @@ -0,0 +1,9 @@ +name="UnShell Core" +version="0.1" +description="Core components for UnShell" +authors=["astatin3"] + +child_components = [ + "client/unshell_component.toml", + "server/unshell_component.toml" +] diff --git a/unshell-config/README.md b/unshell-config/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/unshell-config/src/main.rs b/unshell-config/src/main.rs deleted file mode 100644 index ed649a1..0000000 --- a/unshell-config/src/main.rs +++ /dev/null @@ -1,16 +0,0 @@ -#![no_std] -#![no_main] - -#[unsafe(no_mangle)] -fn main() { - let a = 135; - - unshell_obfuscate::junk_asm!(15.); - - unsafe { libc::exit(a as i32) } -} - -#[panic_handler] -fn panic(_info: &core::panic::PanicInfo) -> ! { - loop {} -} diff --git a/unshell-lib/src/components.rs b/unshell-lib/src/components.rs deleted file mode 100644 index 7562309..0000000 --- a/unshell-lib/src/components.rs +++ /dev/null @@ -1,14 +0,0 @@ -use unshell_obfuscate::obfuscated_symbol; - -use crate::config::NamedComponent; - -/// Publicly facing accessor function for the payload to load inside the breakout modules. -#[obfuscated_symbol] -pub fn get_components() -> Vec { - return vec![ - #[cfg(feature = "client")] - crate::client::get_named_component(), - #[cfg(feature = "server")] - crate::server::get_named_component(), - ]; -} diff --git a/unshell-lib/src/lib.rs b/unshell-lib/src/lib.rs index c1cb2ba..be23b00 100644 --- a/unshell-lib/src/lib.rs +++ b/unshell-lib/src/lib.rs @@ -1,15 +1,11 @@ #![no_main] -pub mod client; pub mod config; pub mod logger; pub mod module; pub mod network; pub mod server; -mod components; -pub use components::get_components; - mod announcement; use std::{ fmt::{self, Debug}, diff --git a/unshell-server/src/api/app.rs b/unshell-server/src/api/app.rs index 8c245b9..0a34381 100644 --- a/unshell-server/src/api/app.rs +++ b/unshell-server/src/api/app.rs @@ -7,12 +7,36 @@ use axum::{ use tokio::net::TcpListener; use unshell_lib::{debug, info}; +// axum_extra:: + use crate::{ api::{auth, structs::CurrentUser}, logger::Logger, server::Server, }; +macro_rules! route_get { + ($router:expr, $path:expr, $func:expr) => {{ + { + $router.route( + $path, + get($func).layer(middleware::from_fn(auth::authorize)), + ) + } + }}; +} + +// macro_rules! route_post { +// ($router:expr, $path:expr, $func:expr) => {{ +// { +// $router.route( +// $path, +// post($func).layer(middleware::from_fn(auth::authorize)), +// ) +// } +// }}; +// } + pub async fn start_api(address: &str, server: Server) { let listener = TcpListener::bind(address) .await @@ -21,88 +45,21 @@ pub async fn start_api(address: &str, server: Server) { info!("Listening on {}", listener.local_addr().unwrap()); let mut router = Router::new().route("/api/auth", post(auth::sign_in)); - router = route_get_trees(router); - router = route_get_all_tree_values(router); - router = route_get_tree_keys(router); + router = route_trees(router); - router = route_get_log(router); + router = route_get!(router, "/api/log/{*offset}", Logger::poll_logs_api); + router = route_get!(router, "/api/trees", Server::get_trees_api); + router = route_get!(router, "/api/keys/{*path}", Server::all_tree_keys_api); + router = route_get!(router, "/api/values/{*path}", Server::all_tree_values_api); + + // router = route_get_log(router); axum::serve(listener, router.with_state(server)) .await .expect("Error serving application"); } -// Route the "keys" api for each tree -fn route_get_log(router: Router) -> Router { - router.route( - "/api/log/{offset}", - get( - async |State(_): State, - Extension(_): Extension, - Path(offset): Path| { - debug!("GET /api/log/{}", offset); - let result = Logger::poll_logs(offset); - - Json(serde_json::to_value(result).unwrap()) - }, - ) - .layer(middleware::from_fn(auth::authorize)), - ) -} - -// Route the "keys" api for each tree -fn route_get_trees(router: Router) -> Router { - router.route( - "/api/trees", - get( - async |State(server): State, Extension(_): Extension| { - debug!("GET /api/trees"); - let result = server.get_trees(); - - Json(serde_json::to_value(result).unwrap()) - }, - ) - .layer(middleware::from_fn(auth::authorize)), - ) -} - -// Route the "keys" api for each tree -fn route_get_tree_keys(router: Router) -> Router { - router.route( - "/api/keys/{*path}", - get( - async |State(server): State, - Path(path): Path, - Extension(_): Extension| { - debug!("GET /api/keys/{}", path); - let result = server.get_keys(&path); - - Json(serde_json::to_value(result).unwrap()) - }, - ) - .layer(middleware::from_fn(auth::authorize)), - ) -} - -// Route the "values" api to get all the values for each tree -fn route_get_all_tree_values(router: Router) -> Router { - router.route( - "/api/values/{*path}", - get( - async |State(server): State, - Path(path): Path, - Extension(_): Extension| { - debug!("GET /api/values/{}", path); - let result = server.all_tree_values(&path); - - Json(serde_json::to_value(result).unwrap()) - }, - ) - .layer(middleware::from_fn(auth::authorize)), - ) -} - // Loop through all trees and add /api// POST aand GET listeners for them fn route_trees(mut router: Router) -> Router { for tree in crate::DATABASE_TREES.iter() { diff --git a/unshell-server/src/api/mod.rs b/unshell-server/src/api/mod.rs index 62d4f01..3243df0 100644 --- a/unshell-server/src/api/mod.rs +++ b/unshell-server/src/api/mod.rs @@ -7,6 +7,8 @@ pub mod app; mod auth; mod structs; +pub use structs::CurrentUser; + static EXPIRE_DURATION: Duration = Duration::hours(12); #[dynamic] diff --git a/unshell-server/src/config/blob.rs b/unshell-server/src/config/blob.rs new file mode 100644 index 0000000..a9d63c7 --- /dev/null +++ b/unshell-server/src/config/blob.rs @@ -0,0 +1,12 @@ +use std::collections::HashMap; + +use crate::config::ConfigStructField; + +#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)] +pub struct Blob { + name: String, + + parent_component: String, + // parent_runtime: String, + config: HashMap, +} diff --git a/unshell-server/src/config/mod.rs b/unshell-server/src/config/mod.rs index 524f2fb..cd05852 100644 --- a/unshell-server/src/config/mod.rs +++ b/unshell-server/src/config/mod.rs @@ -1,3 +1,7 @@ +mod blob; + +pub use blob::Blob; + use std::{ collections::HashMap, error::Error, @@ -67,7 +71,7 @@ pub struct ComponentState { pub fn load_config(path: &PathBuf) -> Result, Box> { let path_absolute = fs::canonicalize(path.clone())?; - debug!("Loading data from path: `{}`", path_absolute); + debug!("Loading data from path: `{:?}`", path_absolute); // Read string as path let config_str = fs::read_to_string(path.clone())?; diff --git a/unshell-server/src/lib.rs b/unshell-server/src/lib.rs index 0d1abcb..6958764 100644 --- a/unshell-server/src/lib.rs +++ b/unshell-server/src/lib.rs @@ -17,9 +17,9 @@ pub static DEFAULT_HOST: String = "localhost".to_string(); #[static_init::dynamic] pub static DATABASE_NAME: String = "database".to_string(); -#[static_init::dynamic] -pub static SERVER_CONFIG: unshell_lib::config::PayloadConfig = unshell_lib::config::PayloadConfig { - id: "Server", - components: unshell_lib::get_components(), - runtime_config: Vec::new(), -}; +// #[static_init::dynamic] +// pub static SERVER_CONFIG: unshell_lib::config::PayloadConfig = unshell_lib::config::PayloadConfig { +// id: "Server", +// components: unshell_lib::get_components(), +// runtime_config: Vec::new(), +// }; diff --git a/unshell-server/src/logger.rs b/unshell-server/src/logger.rs index 6bb8b6c..4037d59 100644 --- a/unshell-server/src/logger.rs +++ b/unshell-server/src/logger.rs @@ -1,9 +1,15 @@ +use axum::extract::{Path, State}; +use axum::{Extension, Json}; use chrono::Local; +use unshell_lib::debug; // use lazy_static::lazy_static; use std::fs::{self, File, OpenOptions}; use std::io::{BufRead, BufReader, Write}; use std::path::PathBuf; +use crate::Server; +use crate::api::CurrentUser; + // --- Constants --- /// The directory where log files will be stored. const LOG_DIR: &str = "logs"; @@ -125,6 +131,18 @@ impl Logger { } } } + + // Route the "keys" api for each tree + pub async fn poll_logs_api( + State(_): State, + Extension(_): Extension, + Path(offset): Path, + ) -> axum::Json { + debug!("GET /api/log/{}", offset); + let result = Self::poll_logs(offset); + + Json(serde_json::to_value(result).unwrap()) + } } // --- Example Usage --- diff --git a/unshell-server/src/server/blobs.rs b/unshell-server/src/server/blobs.rs new file mode 100644 index 0000000..d38108d --- /dev/null +++ b/unshell-server/src/server/blobs.rs @@ -0,0 +1,9 @@ +use serde_json::Value; + +use crate::Server; + +impl Server { + pub fn get_blobs(&self) -> Result, String> { + Ok(Vec::new()) + } +} diff --git a/unshell-server/src/server/database.rs b/unshell-server/src/server/database.rs index 8dfe832..9dee922 100644 --- a/unshell-server/src/server/database.rs +++ b/unshell-server/src/server/database.rs @@ -1,14 +1,14 @@ use std::collections::HashMap; +use axum::{ + Extension, Json, + extract::{Path, State}, +}; +use serde_json::Value; use sled::Tree; -use unshell_lib::error; +use unshell_lib::{debug, error}; -use crate::server::Server; - -// #[derive(Clone)] -// pub struct Database { -// db: sled::Db, -// } +use crate::{api::CurrentUser, server::Server}; impl Server { fn get_tree(&self, tree_name: &str) -> Result { @@ -18,12 +18,17 @@ impl Server { }) } - pub fn get_trees(&self) -> Vec { - self.db + pub async fn get_trees_api(State(server): State) -> Json { + debug!("GET tree list"); + + let result = server + .db .tree_names() .iter() .map(|n| String::from_utf8_lossy(&n.to_vec()).to_string()) - .collect::>() + .collect::>(); + + Json(serde_json::to_value(result).unwrap()) } pub fn put_value(&self, tree_name: &str, key: &str, value: &str) -> Result<(), String> { @@ -50,7 +55,7 @@ impl Server { } } - pub fn get_keys(&self, tree_name: &str) -> Result, String> { + fn get_keys(&self, tree_name: &str) -> Result, String> { Ok(self .get_tree(tree_name)? .iter() @@ -61,15 +66,35 @@ impl Server { .collect::>()) } - pub fn all_tree_values(&self, tree_name: &str) -> Result, String> { - Ok(self - .get_keys(tree_name)? - .iter() - .map(|key| -> Result<(String, String), String> { - Ok((key.clone(), self.get_value(tree_name, &key)?)) - }) - .collect::, String>>()? - .into_iter() - .collect::>()) + // Route the "keys" api for each tree + pub async fn all_tree_keys_api( + State(server): State, + Path(tree_name): Path, + Extension(_): Extension, + ) -> Json { + let result = server.get_keys(&tree_name); + + Json(serde_json::to_value(result).unwrap()) + } + + // Route the "values" api to get all the values for each tree + pub async fn all_tree_values_api( + State(server): State, + Path(tree_name): Path, + Extension(_): Extension, + ) -> Json { + let result = || -> Result, String> { + Ok(server + .get_keys(&tree_name)? + .iter() + .map(|key| -> Result<(String, String), String> { + Ok((key.clone(), server.get_value(&tree_name, &key)?)) + }) + .collect::, String>>()? + .into_iter() + .collect::>()) + }(); + + Json(serde_json::to_value(result).unwrap()) } } diff --git a/unshell-server/src/server/mod.rs b/unshell-server/src/server/mod.rs index ba55dbb..2c9cd0d 100644 --- a/unshell-server/src/server/mod.rs +++ b/unshell-server/src/server/mod.rs @@ -1,5 +1,6 @@ use std::{error::Error, path::PathBuf}; +mod blobs; mod database; mod manager;