client server api

This commit is contained in:
JMARyA 2025-04-30 16:28:48 +02:00
parent 164c71ddfe
commit 6e31b95417
6 changed files with 89 additions and 7 deletions

1
Cargo.lock generated
View file

@ -3596,6 +3596,7 @@ dependencies = [
"toml 0.8.22",
"tracing",
"tracing-subscriber",
"ulid",
"ureq",
]

View file

@ -36,3 +36,4 @@ ureq = { version = "3.0.11", features = ["json"] }
rumqttc = { version = "0.24.0", features = ["url", "websocket"] }
sage = { git = "https://git.hydrar.de/jmarya/sage" }
dashmap = "6.1.0"
ulid = { version = "1.2.1", features = ["serde"] }

View file

@ -105,3 +105,43 @@ impl Result {
Self { ok: 0 }
}
}
#[derive(Debug, Serialize, Deserialize)]
pub struct ClientAction {
pub id: ulid::Ulid,
pub action: ClientActions,
}
impl ClientAction {
pub fn new(action: ClientActions) -> Self {
Self {
id: ulid::Ulid::new(),
action,
}
}
}
#[derive(Debug, Serialize, Deserialize)]
pub enum ClientActions {
OSQuery(String),
}
#[derive(Debug, Serialize, Deserialize)]
pub struct ServerResponse {
pub id: ulid::Ulid,
pub response: ServerResponses,
}
impl ServerResponse {
pub fn of(client: &ClientAction, resp: ServerResponses) -> Self {
Self {
id: client.id,
response: resp,
}
}
}
#[derive(Debug, Serialize, Deserialize)]
pub enum ServerResponses {
OSQuery(String),
}

View file

@ -1,4 +1,7 @@
use std::sync::Arc;
use crate::Machine;
use crate::api::{ClientAction, ClientActions, ServerResponse};
use owl::prelude::*;
use owl::{Serialize, get, query};
use rumqttc::AsyncClient;
@ -17,12 +20,16 @@ pub async fn handle_mqtt(topic: String, data: Vec<u8>) {
.unwrap();
// TODO : check for recency
println!("got raw: {}", String::from_utf8(dec.payload).unwrap());
match cat {
"online" => {
log::info!("Device {client} reported ONLINE");
}
"respond" => {
let resp: ServerResponse = serde_json::from_slice(&dec.payload).unwrap();
log::info!("Got response {:?}", resp);
}
_ => {}
}
}
@ -53,6 +60,10 @@ pub async fn listen_to_device(client: &AsyncClient, machine_id: &str) {
.subscribe(format!("{machine_id}/online"), rumqttc::QoS::AtMostOnce)
.await
.unwrap();
client
.subscribe(format!("{machine_id}/respond"), rumqttc::QoS::AtMostOnce)
.await
.unwrap();
}
/// Subscibe to incoming messages from all registered machines

View file

@ -44,6 +44,8 @@ pub async fn join_device(
let machine = Machine::from_join_param(payload);
let new_token = machine.token.clone();
// TODO : add device listener instantly
save!(machine);
let i = crate::IDENTITY.get().unwrap();

View file

@ -1,7 +1,11 @@
use std::{os, process::Stdio};
use owl::Serialize;
use rumqttc::AsyncClient;
use sage::PersonaIdentity;
use crate::api::{ClientAction, ServerResponse, ServerResponses};
// Client MQTT
pub async fn handle_mqtt(topic: String, data: Vec<u8>) {
//println!("got real raw: {}", String::from_utf8_lossy(&data));
@ -11,15 +15,38 @@ pub async fn handle_mqtt(topic: String, data: Vec<u8>) {
);
let pk = pk.sign_key().unwrap();
let payload = crate::IDENTITY.get().unwrap().decrypt(&data, &pk).unwrap();
println!(
"got payload {}",
String::from_utf8(payload.payload).unwrap()
);
let action: ClientAction = serde_json::from_slice(&payload.payload).unwrap();
log::info!("Got action {action:?}");
match &action.action {
crate::api::ClientActions::OSQuery(query) => {
// TODO : run osquery
log::info!("Doing osquery with {query}");
let res = osquery(&query);
send_back(
crate::MQTT.get().unwrap(),
"respond",
ServerResponse::of(&action, ServerResponses::OSQuery(res)),
)
.await;
}
}
}
pub fn osquery(query: &str) -> String {
let cmd = std::process::Command::new("osqueryi")
.arg("--csv")
.arg(query)
.stdout(Stdio::piped())
.output()
.unwrap();
String::from_utf8(cmd.stdout).unwrap()
}
/// Send something back to the server on `topic`
pub async fn send_back<T: Serialize>(client: &AsyncClient, topic: &str, request: T) {
let data = serde_json::to_string(&request).unwrap();
pub async fn send_back<T: Serialize>(client: &AsyncClient, topic: &str, data: T) {
let data = serde_json::to_string(&data).unwrap();
let pk = crate::AGENT.get().unwrap();
let pk = (pk.server_age.clone(), String::new());