From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 655A0954C2 for ; Fri, 12 Apr 2024 12:06:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4729D793C for ; Fri, 12 Apr 2024 12:06:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 12 Apr 2024 12:06:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 64A7945145 for ; Fri, 12 Apr 2024 12:06:38 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Fri, 12 Apr 2024 12:05:59 +0200 Message-Id: <20240412100631.94218-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240412100631.94218-1-l.wagner@proxmox.com> References: <20240412100631.94218-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [notifications.rs, lib.rs] Subject: [pbs-devel] [PATCH proxmox-backup 01/33] pbs-config: add module for loading notification config X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2024 10:06:42 -0000 Signed-off-by: Lukas Wagner --- Cargo.toml | 3 +++ pbs-config/Cargo.toml | 1 + pbs-config/src/lib.rs | 1 + pbs-config/src/notifications.rs | 41 +++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 pbs-config/src/notifications.rs diff --git a/Cargo.toml b/Cargo.toml index 4616e476..f06aeba3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,6 +65,7 @@ proxmox-io = "1.0.1" # tools and client use "tokio" feature proxmox-lang = "1.1" proxmox-ldap = "0.2.1" proxmox-metrics = "0.3" +proxmox-notify = "0.3" proxmox-openid = "0.10.0" proxmox-rest-server = { version = "0.5.1", features = [ "templates" ] } # some use "cli", some use "cli" and "server", pbs-config uses nothing @@ -211,6 +212,7 @@ proxmox-io.workspace = true proxmox-lang.workspace = true proxmox-ldap.workspace = true proxmox-metrics.workspace = true +proxmox-notify = { workspace = true, features = [ "pbs-context" ] } proxmox-openid.workspace = true proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] } proxmox-router = { workspace = true, features = [ "cli", "server"] } @@ -257,6 +259,7 @@ proxmox-rrd.workspace = true #proxmox-lang = { path = "../proxmox/proxmox-lang" } #proxmox-ldap = { path = "../proxmox/proxmox-ldap" } #proxmox-metrics = { path = "../proxmox/proxmox-metrics" } +#proxmox-notify = { path = "../proxmox/proxmox-notify" } #proxmox-openid = { path = "../proxmox/proxmox-openid" } #proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" } #proxmox-router = { path = "../proxmox/proxmox-router" } diff --git a/pbs-config/Cargo.toml b/pbs-config/Cargo.toml index d11cd41e..ac639a8e 100644 --- a/pbs-config/Cargo.toml +++ b/pbs-config/Cargo.toml @@ -17,6 +17,7 @@ regex.workspace = true serde.workspace = true serde_json.workspace = true +proxmox-notify.workspace = true proxmox-router = { workspace = true, default-features = false } proxmox-schema.workspace = true proxmox-section-config.workspace = true diff --git a/pbs-config/src/lib.rs b/pbs-config/src/lib.rs index 3cfdb2a1..20a8238d 100644 --- a/pbs-config/src/lib.rs +++ b/pbs-config/src/lib.rs @@ -7,6 +7,7 @@ pub mod drive; pub mod media_pool; pub mod metrics; pub mod network; +pub mod notifications; pub mod prune; pub mod remote; pub mod sync; diff --git a/pbs-config/src/notifications.rs b/pbs-config/src/notifications.rs new file mode 100644 index 00000000..df327346 --- /dev/null +++ b/pbs-config/src/notifications.rs @@ -0,0 +1,41 @@ +use anyhow::Error; + +use proxmox_notify::Config; + +use pbs_buildcfg::configdir; + +use crate::{open_backup_lockfile, BackupLockGuard}; + +/// Configuration file location for notification targets/matchers. +pub const NOTIFICATION_CONFIG_PATH: &str = configdir!("/notifications.cfg"); + +/// Private configuration file location for secrets - only readable by `root`. +pub const NOTIFICATION_PRIV_CONFIG_PATH: &str = configdir!("/notifications-priv.cfg"); + +/// Lockfile to prevent concurrent write access. +pub const NOTIFICATION_LOCK_FILE: &str = configdir!("/.notifications.lck"); + +/// Get exclusive lock for `notifications.cfg` +pub fn lock_config() -> Result { + open_backup_lockfile(NOTIFICATION_LOCK_FILE, None, true) +} + +/// Load notification config. +pub fn config() -> Result { + let content = + proxmox_sys::fs::file_read_optional_string(NOTIFICATION_CONFIG_PATH)?.unwrap_or_default(); + + let priv_content = proxmox_sys::fs::file_read_optional_string(NOTIFICATION_PRIV_CONFIG_PATH)? + .unwrap_or_default(); + + Ok(Config::new(&content, &priv_content)?) +} + +/// Save notification config. +pub fn save_config(config: Config) -> Result<(), Error> { + let (cfg, priv_cfg) = config.write()?; + crate::replace_backup_config(NOTIFICATION_CONFIG_PATH, cfg.as_bytes())?; + crate::replace_secret_config(NOTIFICATION_PRIV_CONFIG_PATH, priv_cfg.as_bytes())?; + + Ok(()) +} -- 2.39.2