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 B806560BE4 for ; Thu, 3 Sep 2020 14:10:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B5D8318A70 for ; Thu, 3 Sep 2020 14:10:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 5426618A52 for ; Thu, 3 Sep 2020 14:10:00 +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 1DD66449F4 for ; Thu, 3 Sep 2020 14:10:00 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Thu, 3 Sep 2020 14:09:46 +0200 Message-Id: <20200903120946.23596-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200903120946.23596-1-s.ivanov@proxmox.com> References: <20200903120946.23596-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [apt.pm] Subject: [pve-devel] [PATCH manager v2 1/1] use PVE::Tools::sendmail for update notifications 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: , X-List-Received-Date: Thu, 03 Sep 2020 12:10:01 -0000 instead of calling /usr/sbin/sendmail directly. Tested with: ``` echo "[]" > /var/lib/pve-manager/pkgupdates pvesh create /nodes/rosa/apt/update --notify 1 Signed-off-by: Stoiko Ivanov --- PVE/API2/APT.pm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm index 859c5f42..984c8103 100644 --- a/PVE/API2/APT.pm +++ b/PVE/API2/APT.pm @@ -344,15 +344,9 @@ __PACKAGE__->register_method({ my $hostname = `hostname -f` || PVE::INotify::nodename(); chomp $hostname; my $mailfrom = $dcconf->{email_from} || "root"; + my $subject = "New software packages available ($hostname)"; - my $data = "Content-Type: text/plain;charset=\"UTF8\"\n"; - $data .= "Content-Transfer-Encoding: 8bit\n"; - $data .= "FROM: <$mailfrom>\n"; - $data .= "TO: $mailto\n"; - $data .= "SUBJECT: New software packages available ($hostname)\n"; - $data .= "\n"; - - $data .= "The following updates are available:\n\n"; + my $data = "The following updates are available:\n\n"; my $count = 0; foreach my $p (sort {$a->{Package} cmp $b->{Package} } @$pkglist) { @@ -365,14 +359,9 @@ __PACKAGE__->register_method({ } } - return if !$count; - - my $fh = IO::File->new("|sendmail -B 8BITMIME -f $mailfrom $mailto") || - die "unable to open 'sendmail' - $!"; - - print $fh $data; + return if !$count; - $fh->close() || die "unable to close 'sendmail' - $!"; + PVE::Tools::sendmail($mailto, $subject, $data, undef, $mailfrom, ''); foreach my $pi (@$pkglist) { $pi->{NotifyStatus} = $pi->{Version}; -- 2.20.1