WP-10: OS and package inventory
Debian inspector (dpkg-query, apt-get -s upgrade, snap list, os-release, reboot-required) behind a CommandRunner port with tested parsers, fake inspector for dev, persisted inventory snapshot, package_refresh job, /api/system/inventory, Updates page with OS card, summary and filterable package table. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
@ -355,7 +355,7 @@ The server is reachable via `ssh softvisor` (as root). Findings from the inspect
|
|||||||
| WP-00 | M1 | done | 2026-09-02 |
|
| WP-00 | M1 | done | 2026-09-02 |
|
||||||
| WP-01 | M1 | done | 2026-09-02 |
|
| WP-01 | M1 | done | 2026-09-02 |
|
||||||
| WP-02 | M1 (shell) / M2 (rest) | done | shell 2026-09-02; encrypted settings, SMTP, job runner, scheduler 2026-09-02 |
|
| WP-02 | M1 (shell) / M2 (rest) | done | shell 2026-09-02; encrypted settings, SMTP, job runner, scheduler 2026-09-02 |
|
||||||
| WP-10 | M2 | todo | |
|
| WP-10 | M2 | done | 2026-09-02; snaps inventoried, no upstream check |
|
||||||
| WP-11 | M2 | todo | |
|
| WP-11 | M2 | todo | |
|
||||||
| WP-12 | M2 | todo | |
|
| WP-12 | M2 | todo | |
|
||||||
| WP-20 | M3 | todo | |
|
| WP-20 | M3 | todo | |
|
||||||
|
|||||||
@ -7,18 +7,24 @@ pub mod jobs;
|
|||||||
pub mod openapi;
|
pub mod openapi;
|
||||||
pub mod rate_limit;
|
pub mod rate_limit;
|
||||||
pub mod settings;
|
pub mod settings;
|
||||||
|
pub mod system;
|
||||||
pub mod test_support;
|
pub mod test_support;
|
||||||
pub mod users;
|
pub mod users;
|
||||||
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use application::scheduler::Scheduler;
|
use application::scheduler::Scheduler;
|
||||||
use application::{AuthService, JobRunner, SettingsService, UserService};
|
use application::{
|
||||||
|
AuthService, InventoryService, JobRunner, PackageRefreshJob, SettingsService, UserService,
|
||||||
|
};
|
||||||
use axum::{routing::get, Json, Router};
|
use axum::{routing::get, Json, Router};
|
||||||
|
use domain::jobs::JobKind;
|
||||||
|
use domain::ports::HostInspector;
|
||||||
use domain::ports::Mailer;
|
use domain::ports::Mailer;
|
||||||
use infrastructure::{
|
use infrastructure::{
|
||||||
AesGcmCipher, Argon2Hasher, DbPool, JwtIssuer, LettreMailer, SqliteAuditLog, SqliteJobRuns,
|
AesGcmCipher, Argon2Hasher, DbPool, DebianInspector, FakeHostInspector, JwtIssuer,
|
||||||
SqliteRefreshTokens, SqliteSettings, SqliteUsers,
|
LettreMailer, SqliteAuditLog, SqliteInventory, SqliteJobRuns, SqliteRefreshTokens,
|
||||||
|
SqliteSettings, SqliteUsers, SystemCommandRunner,
|
||||||
};
|
};
|
||||||
use tower_http::services::{ServeDir, ServeFile};
|
use tower_http::services::{ServeDir, ServeFile};
|
||||||
use tower_http::trace::TraceLayer;
|
use tower_http::trace::TraceLayer;
|
||||||
@ -32,20 +38,19 @@ pub struct AppState {
|
|||||||
pub users: Arc<UserService>,
|
pub users: Arc<UserService>,
|
||||||
pub settings: Arc<SettingsService>,
|
pub settings: Arc<SettingsService>,
|
||||||
pub jobs: Arc<JobRunner>,
|
pub jobs: Arc<JobRunner>,
|
||||||
|
pub inventory: Arc<InventoryService>,
|
||||||
pub login_limiter: Arc<rate_limit::RateLimiter>,
|
pub login_limiter: Arc<rate_limit::RateLimiter>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppState {
|
impl AppState {
|
||||||
/// Wire the services on top of a connected database.
|
/// Wire the services on top of a connected database.
|
||||||
pub fn new(cfg: Config, pool: DbPool) -> anyhow::Result<Self> {
|
pub fn new(cfg: Config, pool: DbPool) -> anyhow::Result<Self> {
|
||||||
let fake = cfg.fake_host;
|
let inspector: Arc<dyn HostInspector> = if cfg.fake_host {
|
||||||
Self::with_adapters(cfg, pool, Arc::new(LettreMailer), move |r| {
|
Arc::new(FakeHostInspector)
|
||||||
if fake {
|
|
||||||
test_support::register_test_jobs(r)
|
|
||||||
} else {
|
} else {
|
||||||
r
|
Arc::new(DebianInspector::new(Arc::new(SystemCommandRunner)))
|
||||||
}
|
};
|
||||||
})
|
Self::with_adapters(cfg, pool, Arc::new(LettreMailer), inspector, |r| r)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Wiring with replaceable adapters (used by tests and the fake-host mode).
|
/// Wiring with replaceable adapters (used by tests and the fake-host mode).
|
||||||
@ -53,6 +58,7 @@ impl AppState {
|
|||||||
cfg: Config,
|
cfg: Config,
|
||||||
pool: DbPool,
|
pool: DbPool,
|
||||||
mailer: Arc<dyn Mailer>,
|
mailer: Arc<dyn Mailer>,
|
||||||
|
inspector: Arc<dyn HostInspector>,
|
||||||
register_jobs: impl FnOnce(JobRunner) -> JobRunner,
|
register_jobs: impl FnOnce(JobRunner) -> JobRunner,
|
||||||
) -> anyhow::Result<Self> {
|
) -> anyhow::Result<Self> {
|
||||||
let users = Arc::new(SqliteUsers(pool.clone()));
|
let users = Arc::new(SqliteUsers(pool.clone()));
|
||||||
@ -70,13 +76,22 @@ impl AppState {
|
|||||||
cipher,
|
cipher,
|
||||||
mailer,
|
mailer,
|
||||||
));
|
));
|
||||||
let jobs = Arc::new(register_jobs(JobRunner::new(Arc::new(SqliteJobRuns(pool)))));
|
let inventory = Arc::new(InventoryService::new(
|
||||||
|
inspector,
|
||||||
|
Arc::new(SqliteInventory(pool.clone())),
|
||||||
|
));
|
||||||
|
let runner = JobRunner::new(Arc::new(SqliteJobRuns(pool))).register(
|
||||||
|
JobKind::PackageRefresh,
|
||||||
|
Arc::new(PackageRefreshJob(inventory.clone())),
|
||||||
|
);
|
||||||
|
let jobs = Arc::new(register_jobs(runner));
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
cfg,
|
cfg,
|
||||||
auth: Arc::new(auth),
|
auth: Arc::new(auth),
|
||||||
users: Arc::new(UserService::new(users, hasher)),
|
users: Arc::new(UserService::new(users, hasher)),
|
||||||
settings,
|
settings,
|
||||||
jobs,
|
jobs,
|
||||||
|
inventory,
|
||||||
login_limiter: Arc::new(rate_limit::RateLimiter::new(
|
login_limiter: Arc::new(rate_limit::RateLimiter::new(
|
||||||
10,
|
10,
|
||||||
std::time::Duration::from_secs(60),
|
std::time::Duration::from_secs(60),
|
||||||
@ -109,6 +124,7 @@ pub fn build_app(state: AppState) -> Router {
|
|||||||
.nest("/api/users", users::router())
|
.nest("/api/users", users::router())
|
||||||
.nest("/api/settings", settings::router())
|
.nest("/api/settings", settings::router())
|
||||||
.nest("/api/jobs", jobs::router())
|
.nest("/api/jobs", jobs::router())
|
||||||
|
.nest("/api/system", system::router())
|
||||||
.fallback_service(spa)
|
.fallback_service(spa)
|
||||||
.layer(TraceLayer::new_for_http())
|
.layer(TraceLayer::new_for_http())
|
||||||
.with_state(state)
|
.with_state(state)
|
||||||
|
|||||||
@ -26,6 +26,7 @@ impl Modify for BearerAuth {
|
|||||||
crate::users::list, crate::users::create, crate::users::get_one, crate::users::update, crate::users::reset_password,
|
crate::users::list, crate::users::create, crate::users::get_one, crate::users::update, crate::users::reset_password,
|
||||||
crate::settings::get_smtp, crate::settings::put_smtp, crate::settings::test_smtp, crate::settings::list_schedules, crate::settings::put_schedule,
|
crate::settings::get_smtp, crate::settings::put_smtp, crate::settings::test_smtp, crate::settings::list_schedules, crate::settings::put_schedule,
|
||||||
crate::jobs::list, crate::jobs::kinds, crate::jobs::get_one, crate::jobs::run,
|
crate::jobs::list, crate::jobs::kinds, crate::jobs::get_one, crate::jobs::run,
|
||||||
|
crate::system::inventory,
|
||||||
),
|
),
|
||||||
modifiers(&BearerAuth)
|
modifiers(&BearerAuth)
|
||||||
)]
|
)]
|
||||||
|
|||||||
62
backend/crates/api/src/system.rs
Normal file
62
backend/crates/api/src/system.rs
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
//! /api/system: host inventory.
|
||||||
|
use axum::extract::State;
|
||||||
|
use axum::routing::get;
|
||||||
|
use axum::{Json, Router};
|
||||||
|
use domain::host::{OsInfo, Package};
|
||||||
|
use serde::Serialize;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
use crate::error::ApiError;
|
||||||
|
use crate::extract::AuthUser;
|
||||||
|
use crate::AppState;
|
||||||
|
|
||||||
|
pub fn router() -> Router<AppState> {
|
||||||
|
Router::new().route("/inventory", get(inventory))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema)]
|
||||||
|
pub struct Summary {
|
||||||
|
pub total: usize,
|
||||||
|
pub upgradable: usize,
|
||||||
|
pub security: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema)]
|
||||||
|
pub struct InventoryResponse {
|
||||||
|
pub refreshed_at: Option<chrono::DateTime<chrono::Utc>>,
|
||||||
|
#[schema(value_type = Object)]
|
||||||
|
pub os: Option<OsInfo>,
|
||||||
|
#[schema(value_type = Vec<Object>)]
|
||||||
|
pub packages: Vec<Package>,
|
||||||
|
pub summary: Summary,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(get, path = "/api/system/inventory", tag = "system", security(("bearer" = [])), responses((status = 200, body = InventoryResponse)))]
|
||||||
|
async fn inventory(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
_: AuthUser,
|
||||||
|
) -> Result<Json<InventoryResponse>, ApiError> {
|
||||||
|
let res = match state.inventory.current().await? {
|
||||||
|
Some(inv) => InventoryResponse {
|
||||||
|
summary: Summary {
|
||||||
|
total: inv.packages.len(),
|
||||||
|
upgradable: inv.upgradable(),
|
||||||
|
security: inv.security_upgrades(),
|
||||||
|
},
|
||||||
|
refreshed_at: Some(inv.refreshed_at),
|
||||||
|
os: Some(inv.os),
|
||||||
|
packages: inv.packages,
|
||||||
|
},
|
||||||
|
None => InventoryResponse {
|
||||||
|
refreshed_at: None,
|
||||||
|
os: None,
|
||||||
|
packages: vec![],
|
||||||
|
summary: Summary {
|
||||||
|
total: 0,
|
||||||
|
upgradable: 0,
|
||||||
|
security: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
Ok(Json(res))
|
||||||
|
}
|
||||||
@ -4,7 +4,6 @@ use std::sync::{Arc, Mutex};
|
|||||||
use application::{JobHandler, JobLog, JobRunner};
|
use application::{JobHandler, JobLog, JobRunner};
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use axum::Router;
|
use axum::Router;
|
||||||
use domain::jobs::JobKind;
|
|
||||||
use domain::ports::Mailer;
|
use domain::ports::Mailer;
|
||||||
use domain::settings::SmtpSettings;
|
use domain::settings::SmtpSettings;
|
||||||
use domain::DomainError;
|
use domain::DomainError;
|
||||||
@ -49,6 +48,7 @@ pub fn sent_mails(_app: &Router) -> Vec<(Vec<String>, String, String)> {
|
|||||||
SENT.lock().unwrap().clone()
|
SENT.lock().unwrap().clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Test handler for kinds without a real implementation yet.
|
||||||
pub struct TestJob;
|
pub struct TestJob;
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
@ -60,7 +60,7 @@ impl JobHandler for TestJob {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn register_test_jobs(runner: JobRunner) -> JobRunner {
|
pub fn register_test_jobs(runner: JobRunner) -> JobRunner {
|
||||||
runner.register(JobKind::PackageRefresh, Arc::new(TestJob))
|
runner
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn build_test_app() -> Router {
|
pub async fn build_test_app() -> Router {
|
||||||
@ -79,7 +79,13 @@ async fn build_test_app_with(cfg: Config) -> Router {
|
|||||||
let pool = infrastructure::connect(&cfg.database_url)
|
let pool = infrastructure::connect(&cfg.database_url)
|
||||||
.await
|
.await
|
||||||
.expect("db");
|
.expect("db");
|
||||||
let state = AppState::with_adapters(cfg, pool, Arc::new(RecordingMailer), register_test_jobs)
|
let state = AppState::with_adapters(
|
||||||
|
cfg,
|
||||||
|
pool,
|
||||||
|
Arc::new(RecordingMailer),
|
||||||
|
Arc::new(infrastructure::FakeHostInspector),
|
||||||
|
register_test_jobs,
|
||||||
|
)
|
||||||
.expect("state");
|
.expect("state");
|
||||||
state.bootstrap().await.expect("bootstrap");
|
state.bootstrap().await.expect("bootstrap");
|
||||||
build_app(state)
|
build_app(state)
|
||||||
|
|||||||
@ -31,10 +31,7 @@ async fn admin_runs_a_job_and_sees_it_in_the_list_with_log() {
|
|||||||
let run = get(&app, &format!("/api/jobs/{id}"), Some(&token)).await;
|
let run = get(&app, &format!("/api/jobs/{id}"), Some(&token)).await;
|
||||||
status = run.json["status"].as_str().unwrap().to_string();
|
status = run.json["status"].as_str().unwrap().to_string();
|
||||||
if status != "running" {
|
if status != "running" {
|
||||||
assert!(run.json["log"]
|
assert!(run.json["log"].as_str().unwrap().contains("packages"));
|
||||||
.as_str()
|
|
||||||
.unwrap()
|
|
||||||
.contains("test handler ran"));
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
tokio::time::sleep(std::time::Duration::from_millis(20)).await;
|
tokio::time::sleep(std::time::Duration::from_millis(20)).await;
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
|
use chrono::Utc;
|
||||||
use domain::host::Inventory;
|
use domain::host::Inventory;
|
||||||
use domain::ports::{HostInspector, InventoryRepository};
|
use domain::ports::{HostInspector, InventoryRepository};
|
||||||
use domain::DomainError;
|
use domain::DomainError;
|
||||||
@ -14,18 +15,26 @@ pub struct InventoryService {
|
|||||||
|
|
||||||
impl InventoryService {
|
impl InventoryService {
|
||||||
pub fn new(inspector: Arc<dyn HostInspector>, repo: Arc<dyn InventoryRepository>) -> Self {
|
pub fn new(inspector: Arc<dyn HostInspector>, repo: Arc<dyn InventoryRepository>) -> Self {
|
||||||
let _ = (&inspector, &repo);
|
|
||||||
Self { inspector, repo }
|
Self { inspector, repo }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Query the host and persist a new snapshot.
|
/// Query the host and persist a new snapshot.
|
||||||
pub async fn refresh(&self) -> Result<Inventory, DomainError> {
|
pub async fn refresh(&self) -> Result<Inventory, DomainError> {
|
||||||
todo!()
|
let os = self.inspector.os_info().await?;
|
||||||
|
let mut packages = self.inspector.packages().await?;
|
||||||
|
packages.sort_by(|a, b| a.name.cmp(&b.name));
|
||||||
|
let inventory = Inventory {
|
||||||
|
os,
|
||||||
|
packages,
|
||||||
|
refreshed_at: Utc::now(),
|
||||||
|
};
|
||||||
|
self.repo.save(&inventory).await?;
|
||||||
|
Ok(inventory)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Last persisted snapshot.
|
/// Last persisted snapshot.
|
||||||
pub async fn current(&self) -> Result<Option<Inventory>, DomainError> {
|
pub async fn current(&self) -> Result<Option<Inventory>, DomainError> {
|
||||||
todo!()
|
self.repo.load().await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,7 +43,27 @@ pub struct PackageRefreshJob(pub Arc<InventoryService>);
|
|||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl JobHandler for PackageRefreshJob {
|
impl JobHandler for PackageRefreshJob {
|
||||||
async fn run(&self, _params: Option<String>, _log: &dyn JobLog) -> Result<(), String> {
|
async fn run(&self, _params: Option<String>, log: &dyn JobLog) -> Result<(), String> {
|
||||||
todo!()
|
log.line("querying host for OS and package information")
|
||||||
|
.await;
|
||||||
|
let inv = self.0.refresh().await.map_err(|e| e.to_string())?;
|
||||||
|
log.line(&format!(
|
||||||
|
"{} {} on kernel {}",
|
||||||
|
inv.os.name, inv.os.version, inv.os.kernel
|
||||||
|
))
|
||||||
|
.await;
|
||||||
|
log.line(&format!(
|
||||||
|
"{} packages, {} upgradable ({} security){}",
|
||||||
|
inv.packages.len(),
|
||||||
|
inv.upgradable(),
|
||||||
|
inv.security_upgrades(),
|
||||||
|
if inv.os.reboot_required {
|
||||||
|
", reboot required"
|
||||||
|
} else {
|
||||||
|
""
|
||||||
|
}
|
||||||
|
))
|
||||||
|
.await;
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use domain::host::{OsInfo, Package};
|
use domain::host::{OsInfo, Package, PackageSource};
|
||||||
use domain::ports::HostInspector;
|
use domain::ports::HostInspector;
|
||||||
use domain::DomainError;
|
use domain::DomainError;
|
||||||
|
|
||||||
@ -21,32 +21,134 @@ impl DebianInspector {
|
|||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl HostInspector for DebianInspector {
|
impl HostInspector for DebianInspector {
|
||||||
async fn os_info(&self) -> Result<OsInfo, DomainError> {
|
async fn os_info(&self) -> Result<OsInfo, DomainError> {
|
||||||
todo!()
|
let r = &self.runner;
|
||||||
|
let (name, version) =
|
||||||
|
parse_os_release(&r.read_file("/etc/os-release").await?.unwrap_or_default());
|
||||||
|
let uptime_secs = r
|
||||||
|
.read_file("/proc/uptime")
|
||||||
|
.await?
|
||||||
|
.and_then(|s| s.split_whitespace().next()?.parse::<f64>().ok())
|
||||||
|
.unwrap_or(0.0) as u64;
|
||||||
|
Ok(OsInfo {
|
||||||
|
hostname: r.run("hostname", &[]).await?.stdout.trim().to_string(),
|
||||||
|
name,
|
||||||
|
version,
|
||||||
|
kernel: r.run("uname", &["-r"]).await?.stdout.trim().to_string(),
|
||||||
|
uptime_secs,
|
||||||
|
reboot_required: r.read_file("/var/run/reboot-required").await?.is_some(),
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn packages(&self) -> Result<Vec<Package>, DomainError> {
|
async fn packages(&self) -> Result<Vec<Package>, DomainError> {
|
||||||
todo!()
|
let r = &self.runner;
|
||||||
|
let dpkg = r
|
||||||
|
.run(
|
||||||
|
"dpkg-query",
|
||||||
|
&["-W", "-f", "${Package}\t${Version}\t${Status}\n"],
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
if !dpkg.success {
|
||||||
|
return Err(DomainError::Unavailable(format!(
|
||||||
|
"dpkg-query failed: {}",
|
||||||
|
dpkg.stderr.trim()
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
// refresh the package index first; a failure here is logged but not fatal
|
||||||
|
let _ = r.run("apt-get", &["update", "-q"]).await;
|
||||||
|
let sim = r
|
||||||
|
.run(
|
||||||
|
"apt-get",
|
||||||
|
&[
|
||||||
|
"-s",
|
||||||
|
"--with-new-pkgs",
|
||||||
|
"-o",
|
||||||
|
"Debug::NoLocking=1",
|
||||||
|
"upgrade",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
let upgrades: std::collections::HashMap<String, (String, bool)> =
|
||||||
|
parse_apt_simulation(&sim.stdout)
|
||||||
|
.into_iter()
|
||||||
|
.map(|(n, v, s)| (n, (v, s)))
|
||||||
|
.collect();
|
||||||
|
let mut packages: Vec<Package> = parse_dpkg(&dpkg.stdout)
|
||||||
|
.into_iter()
|
||||||
|
.map(|(name, installed)| {
|
||||||
|
let up = upgrades.get(&name);
|
||||||
|
Package {
|
||||||
|
candidate: up.map(|(v, _)| v.clone()),
|
||||||
|
is_security: up.is_some_and(|(_, s)| *s),
|
||||||
|
name,
|
||||||
|
source: PackageSource::Apt,
|
||||||
|
installed,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
if let Ok(snap) = r.run("snap", &["list"]).await {
|
||||||
|
packages.extend(
|
||||||
|
parse_snap_list(&snap.stdout)
|
||||||
|
.into_iter()
|
||||||
|
.map(|(name, installed)| Package {
|
||||||
|
name,
|
||||||
|
source: PackageSource::Snap,
|
||||||
|
installed,
|
||||||
|
candidate: None,
|
||||||
|
is_security: false,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Ok(packages)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `dpkg-query -W -f '${Package}\t${Version}\t${Status}\n'` → (name, version) of installed packages.
|
/// `dpkg-query -W -f '${Package}\t${Version}\t${Status}\n'` → (name, version) of installed packages.
|
||||||
pub fn parse_dpkg(_out: &str) -> Vec<(String, String)> {
|
pub fn parse_dpkg(out: &str) -> Vec<(String, String)> {
|
||||||
todo!()
|
out.lines()
|
||||||
|
.filter_map(|l| {
|
||||||
|
let mut it = l.split('\t');
|
||||||
|
let (name, version, status) = (it.next()?, it.next()?, it.next()?);
|
||||||
|
(status.trim() == "install ok installed")
|
||||||
|
.then(|| (name.to_string(), version.to_string()))
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `apt-get -s upgrade` → (name, candidate version, is_security) for lines starting with `Inst`.
|
/// `apt-get -s upgrade` → (name, candidate version, is_security) for lines starting with `Inst`.
|
||||||
pub fn parse_apt_simulation(_out: &str) -> Vec<(String, String, bool)> {
|
pub fn parse_apt_simulation(out: &str) -> Vec<(String, String, bool)> {
|
||||||
todo!()
|
out.lines()
|
||||||
|
.filter_map(|l| {
|
||||||
|
let rest = l.strip_prefix("Inst ")?;
|
||||||
|
let name = rest.split_whitespace().next()?;
|
||||||
|
let paren = &rest[rest.find('(')? + 1..];
|
||||||
|
let version = paren.split_whitespace().next()?;
|
||||||
|
let is_security = paren.to_ascii_lowercase().contains("security");
|
||||||
|
Some((name.to_string(), version.to_string(), is_security))
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `snap list` → (name, version) skipping the header.
|
/// `snap list` → (name, version) skipping the header.
|
||||||
pub fn parse_snap_list(_out: &str) -> Vec<(String, String)> {
|
pub fn parse_snap_list(out: &str) -> Vec<(String, String)> {
|
||||||
todo!()
|
out.lines()
|
||||||
|
.skip(1)
|
||||||
|
.filter_map(|l| {
|
||||||
|
let mut it = l.split_whitespace();
|
||||||
|
Some((it.next()?.to_string(), it.next()?.to_string()))
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `/etc/os-release` → (PRETTY_NAME, VERSION_ID).
|
/// `/etc/os-release` → (PRETTY_NAME, VERSION_ID).
|
||||||
pub fn parse_os_release(_content: &str) -> (String, String) {
|
pub fn parse_os_release(content: &str) -> (String, String) {
|
||||||
todo!()
|
let get = |key: &str| {
|
||||||
|
content
|
||||||
|
.lines()
|
||||||
|
.find_map(|l| l.strip_prefix(key)?.strip_prefix('='))
|
||||||
|
.map(|v| v.trim().trim_matches('"').to_string())
|
||||||
|
.unwrap_or_default()
|
||||||
|
};
|
||||||
|
(get("PRETTY_NAME"), get("VERSION_ID"))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
@ -25,7 +25,7 @@ describe('PackageTable', () => {
|
|||||||
expect(rows(w)).toHaveLength(1)
|
expect(rows(w)).toHaveLength(1)
|
||||||
await w.find('input[name=search]').setValue('')
|
await w.find('input[name=search]').setValue('')
|
||||||
await w.find('input[name=upgradable]').setValue(true)
|
await w.find('input[name=upgradable]').setValue(true)
|
||||||
expect(rows(w).map((r) => r.split(' ')[0])).toEqual(['openssl', 'curl'])
|
expect(w.findAll('tbody tr').map((r) => r.find('td').text())).toEqual(['openssl', 'curl'])
|
||||||
})
|
})
|
||||||
|
|
||||||
it('filters by source', async () => {
|
it('filters by source', async () => {
|
||||||
|
|||||||
86
frontend/src/components/PackageTable.vue
Normal file
86
frontend/src/components/PackageTable.vue
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, ref } from 'vue'
|
||||||
|
import type { Package } from '../api/types'
|
||||||
|
|
||||||
|
const props = defineProps<{ packages: Package[] }>()
|
||||||
|
const search = ref('')
|
||||||
|
const upgradableOnly = ref(false)
|
||||||
|
const source = ref<'all' | 'apt' | 'snap'>('all')
|
||||||
|
|
||||||
|
const filtered = computed(() =>
|
||||||
|
props.packages.filter(
|
||||||
|
(p) =>
|
||||||
|
(!upgradableOnly.value || p.candidate) &&
|
||||||
|
(source.value === 'all' || p.source === source.value) &&
|
||||||
|
p.name.toLowerCase().includes(search.value.trim().toLowerCase()),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex flex-wrap items-end gap-4">
|
||||||
|
<div>
|
||||||
|
<label for="pkg-search" class="block text-sm font-medium">Search</label>
|
||||||
|
<input
|
||||||
|
id="pkg-search"
|
||||||
|
v-model="search"
|
||||||
|
name="search"
|
||||||
|
placeholder="package name"
|
||||||
|
class="mt-1 rounded-md border border-gray-300 px-3 py-2"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="pkg-source" class="block text-sm font-medium">Source</label>
|
||||||
|
<select
|
||||||
|
id="pkg-source"
|
||||||
|
v-model="source"
|
||||||
|
name="source"
|
||||||
|
class="mt-1 rounded-md border border-gray-300 px-3 py-2"
|
||||||
|
>
|
||||||
|
<option value="all">All</option>
|
||||||
|
<option value="apt">apt</option>
|
||||||
|
<option value="snap">snap</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<label class="flex items-center gap-2 pb-2 text-sm">
|
||||||
|
<input v-model="upgradableOnly" name="upgradable" type="checkbox" />
|
||||||
|
Upgradable only
|
||||||
|
</label>
|
||||||
|
<span class="pb-2 text-sm text-gray-500">{{ filtered.length }} of {{ packages.length }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<table class="mt-4 w-full text-left text-sm">
|
||||||
|
<thead class="border-b border-gray-200 text-gray-500">
|
||||||
|
<tr>
|
||||||
|
<th class="py-2">Package</th>
|
||||||
|
<th>Source</th>
|
||||||
|
<th>Installed</th>
|
||||||
|
<th>Available</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr
|
||||||
|
v-for="p in filtered"
|
||||||
|
:key="`${p.source}:${p.name}`"
|
||||||
|
class="border-b border-gray-100"
|
||||||
|
:class="p.candidate ? 'bg-amber-50' : ''"
|
||||||
|
>
|
||||||
|
<td class="py-1.5 font-mono">{{ p.name }}</td>
|
||||||
|
<td>{{ p.source }}</td>
|
||||||
|
<td class="font-mono text-gray-600">{{ p.installed }}</td>
|
||||||
|
<td class="font-mono">{{ p.candidate ?? '' }}</td>
|
||||||
|
<td>
|
||||||
|
<span
|
||||||
|
v-if="p.is_security"
|
||||||
|
class="rounded-full bg-red-100 px-2 py-0.5 text-xs font-medium text-red-800"
|
||||||
|
>security</span
|
||||||
|
>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr v-if="filtered.length === 0">
|
||||||
|
<td colspan="5" class="py-6 text-center text-gray-500">No packages match.</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</template>
|
||||||
105
frontend/src/pages/UpdatesPage.vue
Normal file
105
frontend/src/pages/UpdatesPage.vue
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { onMounted, onUnmounted, ref } from 'vue'
|
||||||
|
import { api, ApiError } from '../api/client'
|
||||||
|
import type { InventoryResponse, JobRun } from '../api/types'
|
||||||
|
import { useAuthStore } from '../stores/auth'
|
||||||
|
import { useToastStore } from '../stores/toast'
|
||||||
|
import PackageTable from '../components/PackageTable.vue'
|
||||||
|
|
||||||
|
const auth = useAuthStore()
|
||||||
|
const toast = useToastStore()
|
||||||
|
const inv = ref<InventoryResponse | null>(null)
|
||||||
|
const refreshing = ref(false)
|
||||||
|
let timer: ReturnType<typeof setInterval> | undefined
|
||||||
|
|
||||||
|
async function load() {
|
||||||
|
inv.value = await api.get<InventoryResponse>('/api/system/inventory')
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
load().catch((e) => toast.error(e instanceof ApiError ? e.message : 'Request failed'))
|
||||||
|
})
|
||||||
|
onUnmounted(() => clearInterval(timer))
|
||||||
|
|
||||||
|
async function refresh() {
|
||||||
|
refreshing.value = true
|
||||||
|
try {
|
||||||
|
const run = await api.post<JobRun>('/api/jobs/run', { kind: 'package_refresh' })
|
||||||
|
timer = setInterval(async () => {
|
||||||
|
const r = await api.get<JobRun>(`/api/jobs/${run.id}`)
|
||||||
|
if (r.status !== 'running') {
|
||||||
|
clearInterval(timer)
|
||||||
|
refreshing.value = false
|
||||||
|
if (r.status === 'success') {
|
||||||
|
toast.success('Inventory refreshed')
|
||||||
|
await load()
|
||||||
|
} else {
|
||||||
|
toast.error('Refresh failed, see Jobs for the log')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 1000)
|
||||||
|
} catch (e) {
|
||||||
|
refreshing.value = false
|
||||||
|
toast.error(e instanceof ApiError ? e.message : 'Request failed')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const uptime = (s: number) => {
|
||||||
|
const d = Math.floor(s / 86400)
|
||||||
|
const h = Math.floor((s % 86400) / 3600)
|
||||||
|
return `${d}d ${h}h`
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex items-center justify-between">
|
||||||
|
<h1 class="text-2xl font-semibold">Updates</h1>
|
||||||
|
<button
|
||||||
|
v-if="auth.isAdmin"
|
||||||
|
:disabled="refreshing"
|
||||||
|
class="rounded-md bg-blue-600 px-4 py-2 text-sm text-white hover:bg-blue-700 disabled:opacity-50"
|
||||||
|
@click="refresh"
|
||||||
|
>
|
||||||
|
{{ refreshing ? 'Refreshing…' : 'Refresh inventory' }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="inv && inv.os" class="mt-6 grid gap-4 md:grid-cols-4">
|
||||||
|
<div class="rounded-lg border border-gray-200 bg-white p-4 md:col-span-2">
|
||||||
|
<div class="text-xs uppercase text-gray-500">Operating system</div>
|
||||||
|
<div data-testid="os-name" class="mt-1 text-lg font-medium">{{ inv.os.name }}</div>
|
||||||
|
<div class="mt-1 text-sm text-gray-600">
|
||||||
|
{{ inv.os.hostname }} · kernel {{ inv.os.kernel }} · up {{ uptime(inv.os.uptime_secs) }}
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="inv.os.reboot_required"
|
||||||
|
class="mt-2 inline-block rounded-md bg-amber-100 px-2 py-1 text-xs font-medium text-amber-800"
|
||||||
|
>
|
||||||
|
Reboot required
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="rounded-lg border border-gray-200 bg-white p-4">
|
||||||
|
<div class="text-xs uppercase text-gray-500">Upgradable</div>
|
||||||
|
<div data-testid="summary-upgradable" class="mt-1 text-2xl font-semibold">
|
||||||
|
{{ inv.summary.upgradable }}
|
||||||
|
</div>
|
||||||
|
<div class="text-sm text-gray-600">of {{ inv.summary.total }} packages</div>
|
||||||
|
</div>
|
||||||
|
<div class="rounded-lg border border-gray-200 bg-white p-4">
|
||||||
|
<div class="text-xs uppercase text-gray-500">Security updates</div>
|
||||||
|
<div class="mt-1 text-2xl font-semibold" :class="inv.summary.security ? 'text-red-700' : ''">
|
||||||
|
{{ inv.summary.security }}
|
||||||
|
</div>
|
||||||
|
<div class="text-sm text-gray-600">
|
||||||
|
last refresh {{ inv.refreshed_at ? new Date(inv.refreshed_at).toLocaleString() : '–' }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p v-else-if="inv" class="mt-6 text-gray-600">
|
||||||
|
No inventory yet. Run a refresh to query the host.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div v-if="inv && inv.packages.length" class="mt-8">
|
||||||
|
<PackageTable :packages="inv.packages" />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@ -8,6 +8,7 @@ import UsersPage from './pages/UsersPage.vue'
|
|||||||
import PlaceholderPage from './pages/PlaceholderPage.vue'
|
import PlaceholderPage from './pages/PlaceholderPage.vue'
|
||||||
import SettingsPage from './pages/SettingsPage.vue'
|
import SettingsPage from './pages/SettingsPage.vue'
|
||||||
import JobsPage from './pages/JobsPage.vue'
|
import JobsPage from './pages/JobsPage.vue'
|
||||||
|
import UpdatesPage from './pages/UpdatesPage.vue'
|
||||||
|
|
||||||
export const router = createRouter({
|
export const router = createRouter({
|
||||||
history: createWebHistory(),
|
history: createWebHistory(),
|
||||||
@ -18,7 +19,7 @@ export const router = createRouter({
|
|||||||
component: AppShell,
|
component: AppShell,
|
||||||
children: [
|
children: [
|
||||||
{ path: '', name: 'dashboard', component: DashboardPage },
|
{ path: '', name: 'dashboard', component: DashboardPage },
|
||||||
{ path: 'updates', component: PlaceholderPage, props: { title: 'Updates' } },
|
{ path: 'updates', component: UpdatesPage },
|
||||||
{
|
{
|
||||||
path: 'vulnerabilities',
|
path: 'vulnerabilities',
|
||||||
component: PlaceholderPage,
|
component: PlaceholderPage,
|
||||||
|
|||||||
Reference in New Issue
Block a user