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 68CB1941A7 for ; Wed, 21 Feb 2024 15:12:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4BFCB19035 for ; Wed, 21 Feb 2024 15:12:39 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 21 Feb 2024 15:12:38 +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 8AC8044533 for ; Wed, 21 Feb 2024 15:12:38 +0100 (CET) Message-ID: <3dbf20ec-a4fb-4254-bf81-59a6617ab502@proxmox.com> Date: Wed, 21 Feb 2024 15:12:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: pmg-devel@lists.proxmox.com References: <20240213113050.2349660-1-d.csapak@proxmox.com> <20240213113050.2349660-2-d.csapak@proxmox.com> From: Mira Limbeck In-Reply-To: <20240213113050.2349660-2-d.csapak@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.297 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 - Subject: Re: [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: Wed, 21 Feb 2024 14:12:39 -0000 On 2/13/24 12:30, Dominik Csapak wrote: > 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'; Since `view-images` only has an effect when format equals `htmlmail`, should this be noted in the description? Works as described, so consider this: Tested-by: Mira Limbeck