update
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use anyhow::{bail, Context, Result};
|
||||
use serde::Deserialize;
|
||||
use std::{net::SocketAddr, path::Path};
|
||||
use std::{collections::HashMap, net::SocketAddr, path::Path};
|
||||
|
||||
#[derive(Clone, Debug, Default, Deserialize)]
|
||||
#[serde(default, deny_unknown_fields)]
|
||||
@@ -10,6 +10,7 @@ pub struct Config {
|
||||
pub limits: Limits,
|
||||
pub services: Services,
|
||||
pub firewall: Firewall,
|
||||
pub fail2ban: Fail2Ban,
|
||||
pub logging: Logging,
|
||||
pub telemetry: Telemetry,
|
||||
pub logs: Logs,
|
||||
@@ -41,20 +42,35 @@ pub struct Limits {
|
||||
pub command_timeout_seconds: u64,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Default, Deserialize)]
|
||||
#[derive(Clone, Debug, Deserialize)]
|
||||
#[serde(default, deny_unknown_fields)]
|
||||
pub struct Services {
|
||||
pub allowed: Vec<String>,
|
||||
pub inventory_limit: usize,
|
||||
pub install_enabled: bool,
|
||||
pub install_timeout_seconds: u64,
|
||||
pub packages: HashMap<String, String>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize)]
|
||||
#[serde(default, deny_unknown_fields)]
|
||||
pub struct Firewall {
|
||||
pub management_enabled: bool,
|
||||
pub persistence_enabled: bool,
|
||||
pub allowed_interfaces: Vec<String>,
|
||||
pub allowed_sources: Vec<String>,
|
||||
pub allowed_ports: Vec<u16>,
|
||||
pub rollback_timeout_seconds: u64,
|
||||
pub max_snapshots: usize,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize)]
|
||||
#[serde(default, deny_unknown_fields)]
|
||||
pub struct Fail2Ban {
|
||||
pub management_enabled: bool,
|
||||
pub allowed_jails: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize)]
|
||||
#[serde(default, deny_unknown_fields)]
|
||||
pub struct Logging {
|
||||
@@ -118,10 +134,35 @@ impl Default for Limits {
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Services {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
allowed: Vec::new(),
|
||||
inventory_limit: 512,
|
||||
install_enabled: false,
|
||||
install_timeout_seconds: 300,
|
||||
packages: HashMap::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Fail2Ban {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
management_enabled: false,
|
||||
allowed_jails: vec!["sshd".into()],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Firewall {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
management_enabled: false,
|
||||
persistence_enabled: true,
|
||||
allowed_interfaces: Vec::new(),
|
||||
allowed_sources: Vec::new(),
|
||||
allowed_ports: Vec::new(),
|
||||
rollback_timeout_seconds: 60,
|
||||
max_snapshots: 5,
|
||||
}
|
||||
@@ -190,6 +231,9 @@ impl Config {
|
||||
if self.services.allowed.len() > 128 {
|
||||
bail!("at most 128 services may be allow-listed")
|
||||
}
|
||||
if !(1..=2048).contains(&self.services.inventory_limit) {
|
||||
bail!("services.inventory_limit must be between 1 and 2048")
|
||||
}
|
||||
if self.logs.allowed_units.len() > 128
|
||||
|| !(1..=1000).contains(&self.logs.max_entries_per_request)
|
||||
|| !(1024..=65_536).contains(&self.logs.max_message_bytes)
|
||||
@@ -209,8 +253,68 @@ impl Config {
|
||||
bail!("invalid allow-listed service name")
|
||||
}
|
||||
}
|
||||
if self.firewall.management_enabled {
|
||||
bail!("firewall management requires the v2 privileged helper and is unavailable")
|
||||
if !(30..=1800).contains(&self.services.install_timeout_seconds) {
|
||||
bail!("services.install_timeout_seconds must be between 30 and 1800")
|
||||
}
|
||||
if self.services.packages.len() > 128 {
|
||||
bail!("at most 128 service packages may be configured")
|
||||
}
|
||||
for (service, package) in &self.services.packages {
|
||||
if !self.services.allowed.iter().any(|name| name == service)
|
||||
|| !valid_package_name(package)
|
||||
{
|
||||
bail!("invalid service package mapping")
|
||||
}
|
||||
}
|
||||
if self.services.install_enabled && self.services.packages.is_empty() {
|
||||
bail!("services.packages must not be empty when installation is enabled")
|
||||
}
|
||||
if self.firewall.allowed_interfaces.len() > 32
|
||||
|| self.firewall.allowed_sources.len() > 128
|
||||
|| self.firewall.allowed_ports.len() > 512
|
||||
{
|
||||
bail!("firewall allow-list is too large")
|
||||
}
|
||||
for interface in &self.firewall.allowed_interfaces {
|
||||
if !valid_interface_name(interface) {
|
||||
bail!("invalid firewall interface")
|
||||
}
|
||||
}
|
||||
for source in &self.firewall.allowed_sources {
|
||||
if !valid_cidr(source)
|
||||
|| !source
|
||||
.split_once('/')
|
||||
.and_then(|(address, _)| address.parse::<std::net::IpAddr>().ok())
|
||||
.is_some_and(|address| address.is_ipv4())
|
||||
{
|
||||
bail!("invalid IPv4 firewall source CIDR")
|
||||
}
|
||||
}
|
||||
if self.firewall.allowed_ports.contains(&0) {
|
||||
bail!("firewall ports must be between 1 and 65535")
|
||||
}
|
||||
if self.firewall.management_enabled
|
||||
&& (self.firewall.allowed_interfaces.is_empty()
|
||||
|| self.firewall.allowed_sources.is_empty()
|
||||
|| self.firewall.allowed_ports.is_empty())
|
||||
{
|
||||
bail!("firewall allow-lists must not be empty when management is enabled")
|
||||
}
|
||||
if !(10..=300).contains(&self.firewall.rollback_timeout_seconds)
|
||||
|| !(1..=20).contains(&self.firewall.max_snapshots)
|
||||
{
|
||||
bail!("firewall rollback or snapshot limits are invalid")
|
||||
}
|
||||
if self.fail2ban.allowed_jails.len() > 64 {
|
||||
bail!("at most 64 Fail2Ban jails may be allow-listed")
|
||||
}
|
||||
for jail in &self.fail2ban.allowed_jails {
|
||||
if !valid_simple_name(jail) {
|
||||
bail!("invalid allow-listed Fail2Ban jail")
|
||||
}
|
||||
}
|
||||
if self.fail2ban.management_enabled && self.fail2ban.allowed_jails.is_empty() {
|
||||
bail!("fail2ban.allowed_jails must not be empty when management is enabled")
|
||||
}
|
||||
if !matches!(
|
||||
self.logging.level.as_str(),
|
||||
@@ -235,6 +339,43 @@ pub fn valid_service_name(name: &str) -> bool {
|
||||
.all(|c| c.is_ascii_alphanumeric() || matches!(c, b'-' | b'_' | b'.' | b'@' | b':'))
|
||||
}
|
||||
|
||||
pub fn valid_simple_name(name: &str) -> bool {
|
||||
!name.is_empty()
|
||||
&& name.len() <= 64
|
||||
&& name
|
||||
.bytes()
|
||||
.all(|c| c.is_ascii_alphanumeric() || matches!(c, b'-' | b'_' | b'.'))
|
||||
}
|
||||
|
||||
pub fn valid_package_name(name: &str) -> bool {
|
||||
!name.is_empty()
|
||||
&& name.len() <= 128
|
||||
&& name.bytes().all(|c| {
|
||||
c.is_ascii_lowercase() || c.is_ascii_digit() || matches!(c, b'+' | b'.' | b'-')
|
||||
})
|
||||
}
|
||||
|
||||
pub fn valid_interface_name(name: &str) -> bool {
|
||||
!name.is_empty()
|
||||
&& name.len() <= 15
|
||||
&& name
|
||||
.bytes()
|
||||
.all(|c| c.is_ascii_alphanumeric() || matches!(c, b'_' | b'-' | b'.'))
|
||||
}
|
||||
|
||||
pub fn valid_cidr(value: &str) -> bool {
|
||||
let Some((address, prefix)) = value.split_once('/') else {
|
||||
return false;
|
||||
};
|
||||
let Ok(address) = address.parse::<std::net::IpAddr>() else {
|
||||
return false;
|
||||
};
|
||||
let Ok(prefix) = prefix.parse::<u8>() else {
|
||||
return false;
|
||||
};
|
||||
prefix <= if address.is_ipv4() { 32 } else { 128 }
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -260,4 +401,15 @@ mod tests {
|
||||
assert!(!valid_service_name("nginx;reboot"));
|
||||
assert!(!valid_service_name("../../etc/passwd"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn validates_privileged_allow_lists() {
|
||||
assert!(valid_package_name("nginx-core"));
|
||||
assert!(!valid_package_name("nginx;reboot"));
|
||||
assert!(valid_interface_name("wg-home"));
|
||||
assert!(!valid_interface_name("../../eth0"));
|
||||
assert!(valid_cidr("192.168.50.4/32"));
|
||||
assert!(valid_cidr("2001:db8::/64"));
|
||||
assert!(!valid_cidr("192.168.50.4/99"));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user