[pmg-devel] [PATCH pmg-api] api/postfix: add 'decode-headers' to postfix queue read
Dominik Csapak
d.csapak at proxmox.com
Thu Feb 3 09:29:23 CET 2022
often, the users want to show the *decoded* header, iow. they want
to see the readable subject,from,to, etc. not the quoted-printable
versions.
so add a new parameter that decodes the header lines as we read them
using MIME::WordDecoder's 'mime_to_perl_string'.
for backwards compatibility, this is not the default in the api
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
src/PMG/API2/Postfix.pm | 8 +++++++-
src/PMG/Postfix.pm | 6 +++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/PMG/API2/Postfix.pm b/src/PMG/API2/Postfix.pm
index ba22637..2dfcc11 100644
--- a/src/PMG/API2/Postfix.pm
+++ b/src/PMG/API2/Postfix.pm
@@ -239,6 +239,12 @@ __PACKAGE__->register_method ({
default => 0,
optional => 1,
},
+ 'decode-header' => {
+ description => "Decodes the header fields.",
+ type => 'boolean',
+ default => 0,
+ optional => 1,
+ },
},
},
returns => { type => 'string' },
@@ -247,7 +253,7 @@ __PACKAGE__->register_method ({
$param->{header} //= 1;
- return PMG::Postfix::postcat($param->{queue_id}, $param->{header}, $param->{body});
+ return PMG::Postfix::postcat($param->{queue_id}, $param->{header}, $param->{body}, $param->{'decode-header'});
}});
__PACKAGE__->register_method ({
diff --git a/src/PMG/Postfix.pm b/src/PMG/Postfix.pm
index d6ad9d7..20f980e 100644
--- a/src/PMG/Postfix.pm
+++ b/src/PMG/Postfix.pm
@@ -5,6 +5,7 @@ use warnings;
use Data::Dumper;
use File::Find;
use JSON;
+use MIME::WordDecoder qw(mime_to_perl_string);
use PVE::Tools;
@@ -162,7 +163,7 @@ sub mailq {
}
sub postcat {
- my ($queue_id, $header, $body) = @_;
+ my ($queue_id, $header, $body, $decode) = @_;
die "no option specified (select header or body or both)"
if !($header || $body);
@@ -178,6 +179,9 @@ sub postcat {
my $res = '';
while (defined(my $line = <$fh>)) {
+ if ($decode) {
+ $line = mime_to_perl_string($line);
+ }
$res .= $line;
}
--
2.30.2
More information about the pmg-devel
mailing list