From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id DF4AB1FF380 for ; Fri, 19 Apr 2024 09:31:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 473A7593; Fri, 19 Apr 2024 09:31:07 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 18 Apr 2024 18:14:20 +0200 Message-Id: <20240418161434.709473-26-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240418161434.709473-1-s.hanreich@proxmox.com> References: <20240418161434.709473-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.278 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH proxmox-firewall v3 25/39] nftables: add nft client X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Cc: Wolfgang Bumiller Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Add a thin wrapper around nft, which can be used to run commands defined by the rust types. Reviewed-by: Lukas Wagner Reviewed-by: Max Carrara Co-authored-by: Wolfgang Bumiller Signed-off-by: Stefan Hanreich --- proxmox-nftables/src/client.rs | 85 ++++++++++++++++++++++++++++++++++ proxmox-nftables/src/lib.rs | 2 + 2 files changed, 87 insertions(+) create mode 100644 proxmox-nftables/src/client.rs diff --git a/proxmox-nftables/src/client.rs b/proxmox-nftables/src/client.rs new file mode 100644 index 0000000..69e464b --- /dev/null +++ b/proxmox-nftables/src/client.rs @@ -0,0 +1,85 @@ +use std::io::prelude::*; +use std::process::{Command, Stdio}; + +use thiserror::Error; + +use crate::command::{CommandOutput, Commands}; + +#[derive(Error, Debug)] +pub enum NftError { + #[error("cannot communicate with child process")] + Io(#[from] std::io::Error), + #[error("cannot execute nftables commands")] + Command(String), +} + +pub struct NftClient; + +impl NftClient { + fn execute_nft_commands(json: bool, input: &[u8]) -> Result { + let mut command = Command::new("nft"); + + if json { + command.arg("-j"); + } + + let mut child = command + .arg("-f") + .arg("-") + .stdin(Stdio::piped()) + .stdout(Stdio::piped()) + .stderr(Stdio::piped()) + .spawn() + .map_err(NftError::from)?; + + if let Err(error) = child.stdin.take().expect("can get stdin").write_all(input) { + return Err(NftError::from(error)); + }; + + let mut error_output = String::new(); + + match child + .stderr + .take() + .expect("can get stderr") + .read_to_string(&mut error_output) + { + Ok(_) if !error_output.is_empty() => { + return Err(NftError::Command(error_output)); + } + Err(error) => { + return Err(NftError::from(error)); + } + _ => (), + }; + + let mut output = String::new(); + + if let Err(error) = child + .stdout + .take() + .expect("can get stdout") + .read_to_string(&mut output) + { + return Err(NftError::from(error)); + }; + + Ok(output) + } + + pub fn run_json_commands(commands: &Commands) -> Result, NftError> { + let json = serde_json::to_vec(commands).expect("can serialize commands struct"); + let output = Self::execute_nft_commands(true, &json)?; + + if !output.is_empty() { + let parsed_output: Option = serde_json::from_str(&output).ok(); + return Ok(parsed_output); + } + + Ok(None) + } + + pub fn run_commands(commands: &str) -> Result { + Self::execute_nft_commands(false, commands.as_bytes()) + } +} diff --git a/proxmox-nftables/src/lib.rs b/proxmox-nftables/src/lib.rs index 60ddb3f..2003e1b 100644 --- a/proxmox-nftables/src/lib.rs +++ b/proxmox-nftables/src/lib.rs @@ -1,9 +1,11 @@ +pub mod client; pub mod command; pub mod expression; pub mod helper; pub mod statement; pub mod types; +pub use client::NftClient; pub use command::Command; pub use expression::Expression; pub use statement::Statement; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel