From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <l.wagner@proxmox.com>
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 315BF91BEE
for <pve-devel@lists.proxmox.com>; Mon, 27 Mar 2023 17:19:52 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 0A38CD4A9
for <pve-devel@lists.proxmox.com>; Mon, 27 Mar 2023 17:19:22 +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 <pve-devel@lists.proxmox.com>; Mon, 27 Mar 2023 17:19:21 +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 4549E46FF7
for <pve-devel@lists.proxmox.com>; Mon, 27 Mar 2023 17:19:21 +0200 (CEST)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 27 Mar 2023 17:18:44 +0200
Message-Id: <20230327151857.495565-6-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230327151857.495565-1-l.wagner@proxmox.com>
References: <20230327151857.495565-1-l.wagner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.185 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
Subject: [pve-devel] [PATCH proxmox 05/18] notification: allow adding new
sendmail endpoints / filters
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 27 Mar 2023 15:19:52 -0000
This is needed to migrate the PVE codebase from sendmail to the new
notification module - there, every place in the code that currently
sends out mails will add an 'ephemeral' sendmail endpoint, and also a
simple severity filter if needed. This ensures that there is a smooth
migration to the new notification module, without any events going
unnoticed.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
proxmox-notification/src/lib.rs | 1 +
proxmox-notification/src/methods.rs | 55 +++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
create mode 100644 proxmox-notification/src/methods.rs
diff --git a/proxmox-notification/src/lib.rs b/proxmox-notification/src/lib.rs
index fc724dd..24429e4 100644
--- a/proxmox-notification/src/lib.rs
+++ b/proxmox-notification/src/lib.rs
@@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize};
mod config;
mod endpoints;
pub mod filter;
+pub mod methods;
#[api()]
#[derive(Clone, Debug, Copy, Serialize, Deserialize, PartialEq, Eq, PartialOrd)]
diff --git a/proxmox-notification/src/methods.rs b/proxmox-notification/src/methods.rs
new file mode 100644
index 0000000..4f841e3
--- /dev/null
+++ b/proxmox-notification/src/methods.rs
@@ -0,0 +1,55 @@
+use anyhow::Error;
+
+use crate::{
+ endpoints::sendmail::{SendmailConfig, SENDMAIL_TYPENAME},
+ filter::{FilterConfig, FilterModeOperator, FILTER_TYPENAME},
+ Config, Severity,
+};
+
+pub fn add_sendmail_endpoint(
+ config: &mut Config,
+ name: &str,
+ recipient: Vec<String>,
+ from_address: Option<String>,
+ author: Option<String>,
+ filter: Option<String>,
+) -> Result<(), Error> {
+ config.0.set_data(
+ name,
+ SENDMAIL_TYPENAME,
+ &SendmailConfig {
+ name: name.into(),
+ recipient,
+ from_address,
+ author,
+ filter,
+ },
+ )?;
+
+ Ok(())
+}
+
+pub fn add_filter(
+ config: &mut Config,
+ name: &str,
+ min_severity: Option<Severity>,
+ sub_filter: Option<Vec<String>>,
+ mode: Option<FilterModeOperator>,
+ match_property: Option<Vec<String>>,
+ invert_match: Option<bool>,
+) -> Result<(), Error> {
+ config.0.set_data(
+ name,
+ FILTER_TYPENAME,
+ &FilterConfig {
+ name: name.into(),
+ min_severity,
+ sub_filter,
+ mode,
+ match_property,
+ invert_match,
+ },
+ )?;
+
+ Ok(())
+}
--
2.30.2