[pve-devel] [PATCH proxmox-firewall v3 16/39] config: firewall: add conntrack helper types

Stefan Hanreich s.hanreich at proxmox.com
Thu Apr 18 18:14:11 CEST 2024


Reviewed-by: Lukas Wagner <l.wagner at proxmox.com>
Reviewed-by: Max Carrara <m.carrara at proxmox.com>
Co-authored-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich at proxmox.com>
---
 proxmox-ve-config/resources/ct_helper.json  |  52 +++++++++
 proxmox-ve-config/src/firewall/ct_helper.rs | 115 ++++++++++++++++++++
 proxmox-ve-config/src/firewall/mod.rs       |   1 +
 3 files changed, 168 insertions(+)
 create mode 100644 proxmox-ve-config/resources/ct_helper.json
 create mode 100644 proxmox-ve-config/src/firewall/ct_helper.rs

diff --git a/proxmox-ve-config/resources/ct_helper.json b/proxmox-ve-config/resources/ct_helper.json
new file mode 100644
index 0000000..5e70a3a
--- /dev/null
+++ b/proxmox-ve-config/resources/ct_helper.json
@@ -0,0 +1,52 @@
+[
+  {
+    "name": "amanda",
+    "v4": true,
+    "v6": true,
+    "udp": 10080
+  },
+  {
+    "name": "ftp",
+    "v4": true,
+    "v6": true,
+    "tcp": 21
+  } ,
+  {
+    "name": "irc",
+    "v4": true,
+    "tcp": 6667
+  },
+  {
+    "name": "netbios-ns",
+    "v4": true,
+    "udp": 137
+  },
+  {
+    "name": "pptp",
+    "v4": true,
+    "tcp": 1723
+  },
+  {
+    "name": "sane",
+    "v4": true,
+    "v6": true,
+    "tcp": 6566
+  },
+  {
+    "name": "sip",
+    "v4": true,
+    "v6": true,
+    "udp": 5060
+  },
+  {
+    "name": "snmp",
+    "v4": true,
+    "udp": 161
+  },
+  {
+    "name": "tftp",
+    "v4": true,
+    "v6": true,
+    "udp": 69
+  }
+]
diff --git a/proxmox-ve-config/src/firewall/ct_helper.rs b/proxmox-ve-config/src/firewall/ct_helper.rs
new file mode 100644
index 0000000..40e4fee
--- /dev/null
+++ b/proxmox-ve-config/src/firewall/ct_helper.rs
@@ -0,0 +1,115 @@
+use anyhow::{bail, Error};
+use serde::Deserialize;
+use std::collections::HashMap;
+use std::sync::OnceLock;
+
+use crate::firewall::types::address::Family;
+use crate::firewall::types::rule_match::{Ports, Protocol, Tcp, Udp};
+
+#[derive(Clone, Debug, Deserialize)]
+pub struct CtHelperMacroJson {
+    pub v4: Option<bool>,
+    pub v6: Option<bool>,
+    pub name: String,
+    pub tcp: Option<u16>,
+    pub udp: Option<u16>,
+}
+
+impl TryFrom<CtHelperMacroJson> for CtHelperMacro {
+    type Error = Error;
+
+    fn try_from(value: CtHelperMacroJson) -> Result<Self, Self::Error> {
+        if value.tcp.is_none() && value.udp.is_none() {
+            bail!("Neither TCP nor UDP port set in CT helper!");
+        }
+
+        let family = match (value.v4, value.v6) {
+            (Some(true), Some(true)) => None,
+            (Some(true), _) => Some(Family::V4),
+            (_, Some(true)) => Some(Family::V6),
+            _ => bail!("Neither v4 nor v6 set in CT Helper Macro!"),
+        };
+
+        let mut ct_helper = CtHelperMacro {
+            family,
+            name: value.name,
+            tcp: None,
+            udp: None,
+        };
+
+        if let Some(dport) = value.tcp {
+            let ports = Ports::from_u16(None, dport);
+            ct_helper.tcp = Some(Tcp::new(ports).into());
+        }
+
+        if let Some(dport) = value.udp {
+            let ports = Ports::from_u16(None, dport);
+            ct_helper.udp = Some(Udp::new(ports).into());
+        }
+
+        Ok(ct_helper)
+    }
+}
+
+#[derive(Clone, Debug, Deserialize)]
+#[serde(try_from = "CtHelperMacroJson")]
+pub struct CtHelperMacro {
+    family: Option<Family>,
+    name: String,
+    tcp: Option<Protocol>,
+    udp: Option<Protocol>,
+}
+
+impl CtHelperMacro {
+    fn helper_name(&self, protocol: &str) -> String {
+        format!("helper-{}-{protocol}", self.name)
+    }
+
+    pub fn tcp_helper_name(&self) -> String {
+        self.helper_name("tcp")
+    }
+
+    pub fn udp_helper_name(&self) -> String {
+        self.helper_name("udp")
+    }
+
+    pub fn family(&self) -> Option<Family> {
+        self.family
+    }
+
+    pub fn name(&self) -> &str {
+        self.name.as_ref()
+    }
+
+    pub fn tcp(&self) -> Option<&Protocol> {
+        self.tcp.as_ref()
+    }
+
+    pub fn udp(&self) -> Option<&Protocol> {
+        self.udp.as_ref()
+    }
+}
+
+fn hashmap() -> &'static HashMap<String, CtHelperMacro> {
+    const MACROS: &str = include_str!("../../resources/ct_helper.json");
+    static HASHMAP: OnceLock<HashMap<String, CtHelperMacro>> = OnceLock::new();
+
+    HASHMAP.get_or_init(|| {
+        let macro_data: Vec<CtHelperMacro> = match serde_json::from_str(MACROS) {
+            Ok(data) => data,
+            Err(err) => {
+                log::error!("could not load data for ct helpers: {err}");
+                Vec::new()
+            }
+        };
+
+        macro_data
+            .into_iter()
+            .map(|elem| (elem.name.clone(), elem))
+            .collect()
+    })
+}
+
+pub fn get_cthelper(name: &str) -> Option<&'static CtHelperMacro> {
+    hashmap().get(name)
+}
diff --git a/proxmox-ve-config/src/firewall/mod.rs b/proxmox-ve-config/src/firewall/mod.rs
index 0f438ca..2cf57e2 100644
--- a/proxmox-ve-config/src/firewall/mod.rs
+++ b/proxmox-ve-config/src/firewall/mod.rs
@@ -1,5 +1,6 @@
 pub mod cluster;
 pub mod common;
+pub mod ct_helper;
 pub mod fw_macros;
 pub mod guest;
 pub mod host;
-- 
2.39.2




More information about the pve-devel mailing list