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 D88EC90FC0 for ; Tue, 13 Feb 2024 12:31:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B283E355F8 for ; Tue, 13 Feb 2024 12:30:51 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 13 Feb 2024 12:30:51 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D477F47D4F for ; Tue, 13 Feb 2024 12:30:50 +0100 (CET) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Tue, 13 Feb 2024 12:30:49 +0100 Message-Id: <20240213113050.2349660-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240213113050.2349660-1-d.csapak@proxmox.com> References: <20240213113050.2349660-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [quarantine.pm] Subject: [pmg-devel] [RFC PATCH pmg-api 1/1] api: quarantine: allow disabling images for content X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2024 11:31:21 -0000 So that a client can control if images should be stripped from the quarantine content, even if the server has 'viewimages' configured to on in pmg.conf. Signed-off-by: Dominik Csapak --- src/PMG/API2/Quarantine.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/PMG/API2/Quarantine.pm b/src/PMG/API2/Quarantine.pm index a100e11..17f1405 100644 --- a/src/PMG/API2/Quarantine.pm +++ b/src/PMG/API2/Quarantine.pm @@ -867,6 +867,13 @@ __PACKAGE__->register_method ({ optional => 1, default => 0, }, + 'view-images' => { + description => "Controls if images are shown. Has no effect if 'viewimages'" + ." is turned off in /etc/pmg/pmg.conf.", + type => 'boolean', + optional => 1, + default => 1, + }, }, }, returns => { @@ -944,6 +951,10 @@ __PACKAGE__->register_method ({ my $cfg = PMG::Config->new(); my $viewimages = $cfg->get('spamquar', 'viewimages'); + + # only overwrite with the parameter when it's more strict than the config + $viewimages = 0 if !($param->{'view-images'} // 1); + my $allowhref = $cfg->get('spamquar', 'allowhrefs'); $res->{content} = PMG::HTMLMail::email_to_html($path, $raw, $viewimages, $allowhref) // 'unable to parse mail'; -- 2.30.2