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 C5B449550B for ; Fri, 12 Apr 2024 12:06:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AE3D47B8D for ; Fri, 12 Apr 2024 12:06:51 +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:47 +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 93F3A4513F for ; Fri, 12 Apr 2024 12:06:43 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Fri, 12 Apr 2024 12:06:16 +0200 Message-Id: <20240412100631.94218-19-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.005 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: [pbs-devel] [PATCH proxmox-backup 18/33] server: notifications: send update notifications via notification system 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:51 -0000 Signed-off-by: Lukas Wagner --- debian/proxmox-backup-server.install | 2 + src/server/notifications.rs | 44 ++++++------------- templates/Makefile | 2 + .../default/package-updates-body.txt.hbs | 8 ++++ .../default/package-updates-subject.txt.hbs | 1 + 5 files changed, 26 insertions(+), 31 deletions(-) create mode 100644 templates/default/package-updates-body.txt.hbs create mode 100644 templates/default/package-updates-subject.txt.hbs diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install index 86e2b543..52a01ca5 100644 --- a/debian/proxmox-backup-server.install +++ b/debian/proxmox-backup-server.install @@ -45,6 +45,8 @@ usr/share/proxmox-backup/templates/default/gc-err-body.txt.hbs usr/share/proxmox-backup/templates/default/gc-ok-body.txt.hbs usr/share/proxmox-backup/templates/default/gc-err-subject.txt.hbs usr/share/proxmox-backup/templates/default/gc-ok-subject.txt.hbs +usr/share/proxmox-backup/templates/default/package-updates-body.txt.hbs +usr/share/proxmox-backup/templates/default/package-updates-subject.txt.hbs usr/share/proxmox-backup/templates/default/prune-err-body.txt.hbs usr/share/proxmox-backup/templates/default/prune-ok-body.txt.hbs usr/share/proxmox-backup/templates/default/prune-err-subject.txt.hbs diff --git a/src/server/notifications.rs b/src/server/notifications.rs index eff13640..0e2f3473 100644 --- a/src/server/notifications.rs +++ b/src/server/notifications.rs @@ -23,18 +23,6 @@ use proxmox_notify::{Endpoint, Notification, Severity}; const SPOOL_DIR: &str = concatcp!(pbs_buildcfg::PROXMOX_BACKUP_STATE_DIR, "/notifications"); -const PACKAGE_UPDATES_TEMPLATE: &str = r###" -Proxmox Backup Server has the following updates available: -{{#each updates }} - {{Package}}: {{OldVersion}} -> {{Version~}} -{{/each }} - -To upgrade visit the web interface: - - - -"###; - const TAPE_BACKUP_OK_TEMPLATE: &str = r###" {{#if id ~}} @@ -122,8 +110,6 @@ lazy_static::lazy_static! { hb.register_template_string("tape_backup_ok_template", TAPE_BACKUP_OK_TEMPLATE)?; hb.register_template_string("tape_backup_err_template", TAPE_BACKUP_ERR_TEMPLATE)?; - hb.register_template_string("package_update_template", PACKAGE_UPDATES_TEMPLATE)?; - hb.register_template_string("certificate_renewal_err_template", ACME_CERTIFICATE_ERR_RENEWAL)?; Ok(()) @@ -569,24 +555,22 @@ fn get_server_url() -> (String, usize) { } pub fn send_updates_available(updates: &[&APTUpdateInfo]) -> Result<(), Error> { - // update mails always go to the root@pam configured email.. - if let Some(email) = lookup_user_email(Userid::root_userid()) { - let nodename = proxmox_sys::nodename(); - let subject = format!("New software packages available ({nodename})"); + let (fqdn, port) = get_server_url(); + let data = json!({ + "fqdn": fqdn, + "port": port, + "updates": updates, + }); - let (fqdn, port) = get_server_url(); + let metadata = HashMap::from([ + ("hostname".into(), proxmox_sys::nodename().into()), + ("type".into(), "package-updates".into()), + ]); - let text = HANDLEBARS.render( - "package_update_template", - &json!({ - "fqdn": fqdn, - "port": port, - "updates": updates, - }), - )?; + let notification = + Notification::from_template(Severity::Info, "package-updates", data, metadata); - send_job_status_mail(&email, &subject, &text)?; - } + send_notification(notification)?; Ok(()) } @@ -673,7 +657,5 @@ fn test_template_register() { assert!(HANDLEBARS.has_template("tape_backup_ok_template")); assert!(HANDLEBARS.has_template("tape_backup_err_template")); - assert!(HANDLEBARS.has_template("package_update_template")); - assert!(HANDLEBARS.has_template("certificate_renewal_err_template")); } diff --git a/templates/Makefile b/templates/Makefile index 41cdd2da..56965400 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -5,6 +5,8 @@ NOTIFICATION_TEMPLATES= \ default/gc-ok-body.txt.hbs \ default/gc-err-subject.txt.hbs \ default/gc-ok-subject.txt.hbs \ + default/package-updates-body.txt.hbs \ + default/package-updates-subject.txt.hbs \ default/prune-err-body.txt.hbs \ default/prune-ok-body.txt.hbs \ default/prune-err-subject.txt.hbs \ diff --git a/templates/default/package-updates-body.txt.hbs b/templates/default/package-updates-body.txt.hbs new file mode 100644 index 00000000..62f9c7c4 --- /dev/null +++ b/templates/default/package-updates-body.txt.hbs @@ -0,0 +1,8 @@ +Proxmox Backup Server has the following updates available: +{{#each updates }} + {{Package}}: {{OldVersion}} -> {{Version~}} +{{/each }} + +To upgrade visit the web interface: + + diff --git a/templates/default/package-updates-subject.txt.hbs b/templates/default/package-updates-subject.txt.hbs new file mode 100644 index 00000000..c8a775d5 --- /dev/null +++ b/templates/default/package-updates-subject.txt.hbs @@ -0,0 +1 @@ +New software packages available ({{ hostname }}) -- 2.39.2