From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@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 130AEBFD69
for <pmg-devel@lists.proxmox.com>; Tue, 9 Jan 2024 14:59:09 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id F111018015
for <pmg-devel@lists.proxmox.com>; Tue, 9 Jan 2024 14:59:08 +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 <pmg-devel@lists.proxmox.com>; Tue, 9 Jan 2024 14:59:08 +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 2C21249043
for <pmg-devel@lists.proxmox.com>; Tue, 9 Jan 2024 14:59:08 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pmg-devel@lists.proxmox.com
Date: Tue, 9 Jan 2024 14:59:02 +0100
Message-Id: <20240109135906.66200-3-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20240109135906.66200-1-d.csapak@proxmox.com>
References: <20240109135906.66200-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 -
Subject: [pmg-devel] [PATCH pmg-api 2/4] ruledb disclaimer: if/elsif code
cleanup
X-BeenThere: pmg-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Mail Gateway development discussion
<pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>,
<mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 09 Jan 2024 13:59:09 -0000
by pulling out the text/{html,plain} regex directly in the elsif
condition, since the else there does not do anything
the comment now goes into the top-level else part, but the idea is the
same
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/PMG/RuleDB/Disclaimer.pm | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/PMG/RuleDB/Disclaimer.pm b/src/PMG/RuleDB/Disclaimer.pm
index 5eadc6f..24efa8a 100644
--- a/src/PMG/RuleDB/Disclaimer.pm
+++ b/src/PMG/RuleDB/Disclaimer.pm
@@ -165,25 +165,23 @@ sub sign {
last;
}
}
- } elsif ($entity->head->mime_type =~ m{text/}) {
- if ($entity->head->mime_type =~ m{text/(html|plain)}) {
- my $type = $1;
- my $cs = $entity->head->mime_attr("content-type.charset") // 'ascii';
- eval {
- my $encoded = encode($cs, $type eq 'html' ? $html : $text, Encode::FB_CROAK);
- $self->add_data($entity, $encoded);
- };
- # simply ignore if we can't represent the disclainer
- # with that encoding
- if ($@) {
- syslog('info', "%s: adding disclaimer failed (rule: %s)", $logid, $rulename);
- } else {
- syslog('info', "%s: added disclaimer (rule: %s)", $logid, $rulename);
- }
- $found = 1;
+ } elsif ($entity->head->mime_type =~ m{text/(html|plain)}) {
+ my $type = $1;
+ my $cs = $entity->head->mime_attr("content-type.charset") // 'ascii';
+ eval {
+ my $encoded = encode($cs, $type eq 'html' ? $html : $text, Encode::FB_CROAK);
+ $self->add_data($entity, $encoded);
+ };
+ # simply ignore if we can't represent the disclainer
+ # with that encoding
+ if ($@) {
+ syslog('info', "%s: adding disclaimer failed (rule: %s)", $logid, $rulename);
} else {
- # do nothing - unknown format
+ syslog('info', "%s: added disclaimer (rule: %s)", $logid, $rulename);
}
+ $found = 1;
+ } else {
+ # do nothing - unknown format
}
return $found;
--
2.30.2