Add obfuscated logger.

unshell-lib/Cargo.lock

@@ -13,6 +13,21 @@ dependencies = [
  "cpufeatures",
 ]
 
+[[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"
@@ -60,6 +75,12 @@ dependencies = [
  "hybrid-array",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
 [[package]]
 name = "cbc"
 version = "0.1.2"
@@ -69,12 +90,35 @@ dependencies = [
  "cipher",
 ]
 
+[[package]]
+name = "cc"
+version = "1.2.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[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"
@@ -85,6 +129,12 @@ dependencies = [
  "inout",
 ]
 
+[[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"
@@ -114,6 +164,12 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
 [[package]]
 name = "generic-array"
 version = "0.14.9"
@@ -157,6 +213,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"
@@ -167,6 +247,16 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "js-sys"
+version = "0.3.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.177"
@@ -189,6 +279,21 @@ version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
+[[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 = "proc-macro2"
 version = "1.0.103"
@@ -213,6 +318,12 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -253,6 +364,12 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "syn"
 version = "2.0.109"
@@ -281,8 +398,8 @@ name = "unshell-lib"
 version = "0.1.0"
 dependencies = [
  "bincode",
+ "chrono",
  "libloading",
- "log",
  "unshell-obfuscate",
 ]
 
@@ -296,6 +413,7 @@ dependencies = [
  "getrandom",
  "hex",
  "hex-literal",
+ "proc-macro2",
  "quote",
  "sha2",
  "syn",
@@ -328,12 +446,110 @@ dependencies = [
  "wit-bindgen",
 ]
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
+dependencies = [
+ "unicode-ident",
+]
+
+[[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",
+]
+
+[[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",
+]
+
 [[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"

unshell-lib/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2024"
 [dependencies]
 libloading = {version = "0.8.9"}
 bincode = "2.0.1"
-log = "0.4.28"
 unshell-obfuscate = {path = "../unshell-obfuscate"}
+chrono = "0.4.42"

unshell-lib/src/client/client_runtime.rs

@@ -8,6 +8,7 @@ use std::{
     thread::{self, JoinHandle},
 };
 
+use crate::*;
 // use unshell_modules::{Manager, ModuleRuntime};
 
 use crate::{Announcement, ModuleRuntime, module::Manager};
@@ -51,7 +52,7 @@ impl RuntimeTest {
 
                     match a {
                         Announcement::TestAnnouncement(s) => {
-                            info!("Received test announcement: {}", s)
+                            println!("Received test announcement: {}", s)
                         }
                     }
                 }

unshell-lib/src/client/mod.rs

@@ -1,6 +1,5 @@
 mod client_runtime;
 
-// use crate::module::Interface;
 use std::sync::{Arc, Mutex};
 
 pub const MODULE_NAME: &'static str = "client";
@@ -15,6 +14,7 @@ use crate::{
     client::client_runtime::RuntimeTest,
     module::{Interface, Manager},
     module_interface,
+    warn,
     // module_interface,
 };
 

unshell-lib/src/lib.rs

@@ -1,8 +1,7 @@
 #![no_main]
-#[macro_use]
-extern crate log;
 
 pub mod client;
+pub mod logger;
 pub mod module;
 pub mod server;
 
@@ -17,7 +16,7 @@ use crate::module::{Interface, Manager};
 #[derive(Debug)]
 pub enum ModuleError {
     LibLoadingError(libloading::Error),
-    LogError(log::SetLoggerError),
+    // LogError(log::SetLoggerError),
     LinkError(String),
     Error(String),
 }

unshell-lib/src/logger/macros.rs

@@ -0,0 +1,95 @@
+#[macro_export]
+macro_rules! debug {
+    ($fmt:tt) => {{
+        let log_result = unshell_obfuscate::format_obs!($fmt);
+
+        $crate::logger::add_record(
+            $crate::logger::LogLevel::Debug,
+            String::from(unshell_obfuscate::file_symbol!()),
+            std::time::SystemTime::now(),
+            log_result
+        );
+    }};
+    ($fmt:tt, $($arg:expr),*) => {{
+        let log_result = unshell_obfuscate::format_obs!($fmt, $($arg),*);
+
+        $crate::logger::add_record(
+            $crate::logger::LogLevel::Debug,
+            String::from(unshell_obfuscate::file_symbol!()),
+            std::time::SystemTime::now(),
+            log_result
+        );
+    }};
+}
+
+#[macro_export]
+macro_rules! info {
+    ($fmt:tt) => {{
+        let log_result = unshell_obfuscate::format_obs!($fmt);
+
+        $crate::logger::add_record(
+            $crate::logger::LogLevel::Info,
+            String::from(unshell_obfuscate::file_symbol!()),
+            std::time::SystemTime::now(),
+            log_result
+        );
+    }};
+    ($fmt:tt, $($arg:expr),*) => {{
+        let log_result = unshell_obfuscate::format_obs!($fmt, $($arg),*);
+
+        $crate::logger::add_record(
+            $crate::logger::LogLevel::Info,
+            String::from(unshell_obfuscate::file_symbol!()),
+            std::time::SystemTime::now(),
+            log_result
+        );
+    }};
+}
+
+#[macro_export]
+macro_rules! warn {
+    ($fmt:tt) => {{
+        let log_result = unshell_obfuscate::format_obs!($fmt);
+
+        $crate::logger::add_record(
+            $crate::logger::LogLevel::Warn,
+            String::from(unshell_obfuscate::file_symbol!()),
+            std::time::SystemTime::now(),
+            log_result
+        );
+    }};
+    ($fmt:tt, $($arg:expr),*) => {{
+        let log_result = unshell_obfuscate::format_obs!($fmt, $($arg),*);
+
+        $crate::logger::add_record(
+            $crate::logger::LogLevel::Warn,
+            String::from(unshell_obfuscate::file_symbol!()),
+            std::time::SystemTime::now(),
+            log_result
+        );
+    }};
+}
+
+#[macro_export]
+macro_rules! error {
+    ($fmt:tt) => {{
+        let log_result = unshell_obfuscate::format_obs!($fmt);
+
+        $crate::logger::add_record(
+            $crate::logger::LogLevel::Error,
+            String::from(unshell_obfuscate::file_symbol!()),
+            std::time::SystemTime::now(),
+            log_result
+        );
+    }};
+    ($fmt:tt, $($arg:expr),*) => {{
+        let log_result = unshell_obfuscate::format_obs!($fmt, $($arg),*);
+
+        $crate::logger::add_record(
+            $crate::logger::LogLevel::Error,
+            String::from(unshell_obfuscate::file_symbol!()),
+            std::time::SystemTime::now(),
+            log_result
+        );
+    }};
+}

unshell-lib/src/logger/mod.rs

@@ -0,0 +1,69 @@
+pub mod macros;
+mod pretty_logger;
+
+use std::time::SystemTime;
+
+pub use pretty_logger::PrettyLogger;
+
+static mut LOGGER: &dyn Logger = &DefaultLogger;
+
+#[derive(Debug)]
+pub enum LogLevel {
+    Debug,
+    Info,
+    Warn,
+    Error,
+}
+
+#[derive(Debug)]
+pub struct Record {
+    log_level: LogLevel,
+    location: String,
+    // line: u32,
+    time: SystemTime,
+    message: String,
+}
+
+pub trait Logger {
+    fn log(&self, log: Record);
+}
+
+struct DefaultLogger;
+
+impl Logger for DefaultLogger {
+    fn log(&self, _: Record) {}
+}
+
+pub fn set_logger_box(logger: Box<dyn Logger>) {
+    unsafe {
+        LOGGER = Box::leak(logger);
+    }
+}
+
+pub fn set_logger(logger: &'static dyn Logger) {
+    unsafe {
+        LOGGER = logger;
+    }
+}
+
+pub fn add_record(log_level: LogLevel, location: String, time: SystemTime, message: String) {
+    logger().log(Record {
+        log_level,
+        location,
+        time,
+        message,
+    });
+}
+
+pub fn logger<'a>() -> &'static dyn Logger {
+    unsafe { LOGGER }
+}
+
+#[allow(dead_code, improper_ctypes_definitions)]
+pub type SetupLogger = extern "C" fn(logger: &'static dyn Logger);
+
+#[unsafe(no_mangle)]
+#[allow(improper_ctypes_definitions)]
+pub extern "C" fn setup_logger(logger: &'static dyn Logger) {
+    set_logger(logger);
+}

unshell-lib/src/logger/pretty_logger.rs

@@ -0,0 +1,41 @@
+use chrono::{DateTime, Utc};
+
+use crate::logger::{LogLevel, Logger, Record};
+
+pub struct PrettyLogger;
+
+// static TRACE_COLOR: &str = "\x1b[34m";
+static DEBUG_COLOR: &str = "\x1b[36m";
+static INFO_COLOR: &str = "\x1b[32m";
+static WARN_COLOR: &str = "\x1b[33m";
+static ERROR_COLOR: &str = "\x1b[31m";
+
+static WHITE: &str = "\x1b[97m";
+static OFF_WHITE: &str = "\x1b[37m";
+static TIME_COLOR: &str = "\x1b[36m";
+static GREY: &str = "\x1b[90m";
+
+impl Logger for PrettyLogger {
+    fn log(&self, message: Record) {
+        let log_level = match message.log_level {
+            LogLevel::Debug => format!("{DEBUG_COLOR}DEBUG"),
+            LogLevel::Info => format!("{INFO_COLOR}INFO"),
+            LogLevel::Warn => format!("{WARN_COLOR}WARN"),
+            LogLevel::Error => format!("{ERROR_COLOR}ERROR"),
+        };
+
+        let date: DateTime<Utc> = message.time.into();
+        let date = date.to_rfc2822().to_string();
+
+        println!(
+            "{OFF_WHITE}[{TIME_COLOR}{}{OFF_WHITE}] {} {WHITE}{} {GREY}{}{WHITE}",
+            date, log_level, message.message, message.location
+        );
+    }
+}
+
+impl PrettyLogger {
+    pub fn init() {
+        crate::logger::set_logger_box(Box::new(PrettyLogger));
+    }
+}

unshell-lib/src/module/logger.rs

@@ -1,16 +0,0 @@
-#![allow(improper_ctypes_definitions)]
-
-use log::{LevelFilter, Log, SetLoggerError};
-
-#[allow(dead_code)]
-pub type SetupLogger =
-    extern "C" fn(logger: &'static dyn Log, level: LevelFilter) -> Result<(), SetLoggerError>;
-
-#[unsafe(no_mangle)]
-pub extern "C" fn setup_logger(
-    logger: &'static dyn log::Log,
-    level: log::LevelFilter,
-) -> Result<(), log::SetLoggerError> {
-    log::set_max_level(level);
-    log::set_logger(logger)
-}

unshell-lib/src/module/manager.rs

@@ -7,7 +7,8 @@ use std::{
 
 use unshell_obfuscate::symbol;
 
-use crate::{Component, ModuleRuntime, module::Module};
+use crate::*;
+use module::Module;
 
 // #[derive(Debug)]
 pub struct Manager {
@@ -65,7 +66,8 @@ impl Manager {
 
             let components = component_func();
 
-            info!("[{i}] Loaded {} components", components.len());
+            let len = components.len();
+            info!("[{}] Loaded {} components", i, len);
 
             this.components.extend(components);
         }

unshell-lib/src/module/mod.rs

@@ -1,10 +1,9 @@
-mod logger;
 mod manager;
 mod module;
 
 // use std::any::Any;
 
-pub use logger::setup_logger;
+// pub use logger::setup_logger;
 pub use manager::Manager;
 pub use module::Module;
 

unshell-lib/src/module/module.rs

@@ -1,6 +1,8 @@
 use libloading::{Library, Symbol};
 
-use crate::{ModuleError, module::logger::SetupLogger};
+use crate::{ModuleError, logger::SetupLogger, logger::logger};
+
+use crate::*;
 
 pub struct Module {
     // name: String,
@@ -11,13 +13,10 @@ impl Module {
     pub fn new(path: &str) -> Result<Self, ModuleError> {
         let lib = unsafe { Library::new(&path) }.map_err(|e| ModuleError::LibLoadingError(e))?;
 
-        let this = Self {
-            // name: path.to_owned(),
-            lib,
-        };
+        let this = Self { lib };
 
         if let Ok(setup_logger) = this.get_symbol::<SetupLogger>(b"setup_logger") {
-            setup_logger(log::logger(), log::max_level()).map_err(|e| ModuleError::LogError(e))?;
+            setup_logger(logger());
         } else {
             warn!("setup_logger not found");
         }

unshell-lib/src/server/server_runtime.rs

@@ -5,9 +5,7 @@ use std::{
     thread::{self, JoinHandle},
 };
 
-use crate::ModuleRuntime;
-
-use crate::Announcement;
+use crate::*;
 
 pub struct ListenerRuntime {
     thread_handle: JoinHandle<()>,
@@ -19,7 +17,7 @@ pub struct ListenerRuntime {
 
 impl ListenerRuntime {
     pub fn new() -> ListenerRuntime {
-        info!("Starting listener runtime on 127.0.0.1:1234");
+        info!("Starting listener runtime on 127.0.0.1:1234",);
         let listener = TcpListener::bind("127.0.0.1:1234").unwrap();
         let streams = Arc::new(Mutex::new(Vec::new()));