#!/usr/bin/perl -w
-# $Id: t-prot,v 1.300 2010/04/09 06:47:11 jochen Exp $
+# $Id: t-prot,v 1.330 2015/03/26 08:59:50 jochen Exp $
require 5.006;
use strict;
use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
use Getopt::Long qw(:config gnu_getopt no_ignore_case);
-use constant VER => '2.98';
+use constant VER => '3.4';
use constant REV => '';
-use constant REL => q$Revision: 1.300 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL => q$Revision: 1.330 $=~m/(\d+(?:\.\d+)+)/;
# MTA expecting mail on STDIN
# (you might have to adjust this if using a different MTA)
use constant SENDMAIL => '/usr/sbin/sendmail -oi';
use constant EX_BOUNCE => EX_UNAVAILABLE;
use vars qw(
$ad $ads $bigqn $bigqx $boun $check $check_ratio $cr $crshrink $diff $elli
- $footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl
+ $fixind $footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl
$lax $lsig $maxsig $maxlines $mda $ml $gw $ms $ms_smart $msg_quote
$msg_ratio $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $reply
$sani $sig $sigint $sign $spass $spass_prefix $sysl $trad $trsp
$mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
$mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted
- $mutt_pgpoutstart $mutt_pgpoutend
+ $mutt_pgpoutstart $mutt_pgpoutend $mutt_pgpcryptend $mutt_pgpcryptstart
+ $mutt_ssloutstart $mutt_ssloutend
);
$maxsig = 4; # max. valid signature length
$maxlines = undef; # no limit of message lines
$crshrink = 2; # multiple blank lines are shrunk to $crshrink lines
-$indent = '>'; # Indent string, regexp to identify a quoted line
+$indent = '>'; # Indent string to identify a quoted line
$kminl = 65; # see decomb() for details
$kmaxl = 80;
$kdiff = 20;
$mutt_pgpsigned = '[-- End of signed data --]';
$mutt_beginsigned = '[-- The following data is signed --]';
$mutt_pgpclearsigstart = '[-- BEGIN PGP SIGNED MESSAGE --]';
+$mutt_pgpcryptend = '[-- END PGP MESSAGE --]';
+$mutt_pgpcryptstart = '[-- BEGIN PGP MESSAGE --]';
$mutt_pgpclearsigned = '[-- END PGP SIGNED MESSAGE --]';
$mutt_pgpencrypted = '[-- End of PGP/MIME encrypted data --]';
$mutt_pgpoutstart = '[-- PGP output follows (current time:';
$mutt_pgpoutend = '[-- End of PGP output --]';
+$mutt_ssloutstart = '[-- OpenSSL output follows';
+$mutt_ssloutend = '[-- End of OpenSSL output --]';
# set the defaults to the C locale
$gpg_WARNING = 'WARNING: ';
-d, --debug print notice to syslog when bouncing; requires -p
--diff tolerate diffs
-e force ellipsis for excessive punctuation
+ --fixind fix quotes to adhere to RFC 3676
--ftr-ad enable aggressive ad footer matching; requires -A
--ftr-ml enable aggressive mailing list footer matching; req. -L
--groupwise delete Novell Groupwise style TOFU
--lax-security use unsafe writing method; USE ON YOUR OWN RISK!
--locale=LOCALE internationalization; currently only used with -Mmutt
-M, --mua=MUA turn on special treatment for some mail user agents
- -m delete MS style TOFU; careful: might be too agressive
+ -m delete MS style TOFU; careful: might be too aggressive
--max-lines=x maximum number of message lines
--ms-smart try to be smart with MS style TOFU; req. -Mmutt and -m
-o OUTFILE file to be written to; '-' for STDOUT (default)
-P MESSAGE user defined bounce message; requires -p
- -p[ADDRESS] redirect to ADDRESS if no TOFU was found
+ -p [ADDRESS] redirect to ADDRESS if no TOFU was found
--pgp-move move pgp verification output to bottom; requires -Mmutt
--pgp-move-vrf move pgp output if verified and good; requires -Mmutt
--pgp-short hide non-relevant pgp key uids; requires -Mmutt
-r delete mail header lines
--reply squeeze multiple reply prefixes in subject line
- -S[n] supress signatures with more than n lines (default $maxsig)
+ -S[n] suppress signatures with more than n lines (default $maxsig)
-s delete signature
--sani sanitize some header fields
--sigsmax[=n] max number of sigs tolerated, no value for unlimited
}
# debigq(): Finds big quotes (more than $n lines quoted) and deletes all
-# but $x lines of them.
+# but the last $x lines of them.
sub debigq {
my $L = shift; # array of message lines
my $V = shift; # array with verbatim list
for (my $x=0; $x<scalar(@$L); $x++) {
if ($$V[$x]) { next; }
- if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o)
- {
+ if ($$L[$x]=~/^(?:\e[^\a]+\a)?
+ (?:\Q$mutt_pgpoutstart\E|\Q$mutt_ssloutstart\E)/ox) {
my $from;
- for (my $m=0; $m<scalar(@$H); $m++) {
- if (index($$H[$m], 'From:')==0) {
- $from = $$H[$m];
- $m++;
- while (exists($$H[$m]) && $$H[$m] =~ /^\s/)
- { $from .= $$H[$m]; $m++; }
- last;
+ if ($pgpshort) {
+ for (my $m=0; $m<scalar(@$H); $m++) {
+ if (index($$H[$m], 'From:')==0) {
+ $from = $$H[$m];
+ $m++;
+ while (exists($$H[$m]) && $$H[$m] =~ /^\s/)
+ { $from .= $$H[$m]; $m++; }
+ last;
+ }
+ }
+ if (defined($from)) {
+ ($from) =
+ $from=~m/(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})/;
}
}
- ($from) = $from=~m/(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})/;
my $uid = 1;
if ($pgpshort && index($$L[$i], "gpg: $gpg_aka")==0) {
$uid++;
- if ($uid>1 && index($$L[$i], $from)<0) {
+ if (!defined($from) ||
+ ($uid>1 && index($$L[$i], $from)<0)) {
splice(@$L, $i, 1);
splice(@$V, $i, 1);
$i--;
}
}
- elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o) {
+ elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?
+ (?:\Q$mutt_pgpoutend\E|\Q$mutt_ssloutend\E)/ox) {
if ($pgpmove ||
- ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
- {
+ ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i))) {
push(@{$tmp[++$tmp]}, "\n", @$L[$x..($i+1)]);
splice(@$L, $x, $i-$x+2);
splice(@$V, $x, $i-$x+2);
}
}
elsif ($tmp &&
- $$L[$x] =~ /^
+ $$L[$x] =~ /^
(?:\e[^\a]+\a)?
- (?:\Q$mutt_pgpencrypted\E |
+ (?:\Q$mutt_pgpencrypted\E|
+ \Q$mutt_pgpcryptend\E|
\Q$mutt_pgpclearsigned\E|
\Q$mutt_pgpsigned\E)
- /ox)
- {
+ /ox) {
splice(@$L, $x+1, 0, @{$tmp[$tmp]});
for (my $i=$x; $i<scalar(@{$tmp[$tmp]}); $i++) {
splice(@$V, $x+1, 0, (0));
}
if ($x>=scalar(@$lines)) { exit(EX_DATAERR); }
- if ($bar =~ m!^text/plain!) {
+ if ($bar =~ m!^text/plain!i) {
my $z;
for ($z=1; $x+$z<@$lines; $z++) {
if (index($$lines[$x+$z], '--'.$foo)==0) {
# Protect verbatims:
$verb = 0;
for ($x=0; $x<scalar(@$lines); $x++) {
- if ($$lines[$x] =~ /^\s*#v([+-])$/) {
+ if ($$lines[$x] =~ /^\s*#v([+-])$/o) {
$verb = $1 eq '+' ? 1 : 0;
$vrb[$x] = 1;
- } elsif ($diff && $$lines[$x] =~ /^[0-9]+a([0-9]+),([0-9]+)$/) {
+ } elsif ($diff && $$lines[$x] =~ /^[0-9]+a([0-9]+),([0-9]+)$/o) {
# Detect and protect standard diffs.
# Skip and proceed to next line if premature file end or diff line
# numbers implausible (so it might be not a diff at all).
if ($1>$2 || $x+$2-$1+1>$#$lines) { next; }
$vrb[$x] = 1;
for (my $i=0; $i<$2-$1+1; $i++) { $vrb[++$x] = 1; }
- } elsif ($diff && $$lines[$x] =~ /^([0-9]+),([0-9]+)c([0-9]+),([0-9]+)$/) {
+ } elsif ($diff &&
+ $$lines[$x] =~ /^([0-9]+),([0-9]+)c([0-9]+),([0-9]+)$/o) {
if ($1!=$3 || $1>$2 || $3>$4 || $x+$2-$1+$4-$3+3>$#$lines) { next; }
$vrb[$x] = 1;
for (my $i=0; $i<$2-$1+$4-$3+3; $i++) { $vrb[++$x] = 1; }
+ } elsif ($diff &&
+ $$lines[$x] =~ /^--- ./o &&
+ $$lines[$x+1] =~ /^\+\+\+ ./o &&
+ $$lines[$x+2] =~ /^@@ -[0-9]+,([0-9]+) \+[0-9]+,([0-9]+) @@/o
+ ) {
+ # Detect and protect unified diffs.
+ # Proceed only as far as the diff should go.
+ my $minus = $1;
+ my $plus = $2;
+ $vrb[$x++] = 1;
+ $vrb[$x++] = 1;
+ $vrb[$x++] = 1;
+ for (my $cminus = 0, my $cplus = 0;
+ $cminus<=$minus && $cplus<=$plus && $x<$#$lines;
+ $x++) {
+ $vrb[$x] = 1;
+ if ($$lines[$x] !~ /^\+/) { $cminus++; };
+ if ($$lines[$x] !~ /^-/) { $cplus++; };
+ }
+ $x-=1;
} else { $vrb[$x] = $verb; }
}
(?:\e[^\a]+\a)?
(?:\Q$mutt_contenttype\E)
(?:text/plain|application/pgp)
- !ox))) ||
+ !oxi))) ||
($$lines[$x] =~ /^
(?:\e[^\a]+\a)?
(?:\Q$mutt_pgpsigned\E |
\Q$mutt_pgpclearsigned\E|
+ \Q$mutt_pgpcryptend\E|
\Q$mutt_pgpencrypted\E)
/ox))
{
}
}
+ # Fix quote markers to adhere to RFC 3676, this changes "> >" to ">> " (if
+ # the default $indent is used). The space after ">" is not mandatory by RFC
+ # but makes the result more readable.
+ if ($fixind) {
+ for ($x=0; $x<scalar(@$lines); $x++) {
+ if (!$vrb[$x] && index($$lines[$x], $indent)==0) {
+ # We match space at the beginning to prevent removal of spaces
+ # directly after the last quote mark.
+ $$lines[$x] =~ /^((\Q$indent\E| )*\Q$indent\E ?)(.*)$/;
+ my $tmp = $1;
+ my $len = length $1;
+ my $rest = $3; # if anything follows after the quote
+ $tmp =~ tr/ //d;
+ $tmp .= ' ' if $rest; # don't create trailing whitespace
+ substr($$lines[$x], 0, $len, $tmp);
+ }
+ }
+ }
+
# See if there is some Kammquoting to fix:
if ($kamm) { decomb($lines, \@vrb); }
# bloat this array if you want more internationalization:
my @tofu = ('Original Message',
'Original-Nachricht',
- 'Ursprüngliche Nachricht',
- 'Ursprüngliche Nachricht',
- 'Ursprungliche Nachricht',
+ 'Urspr..?ngliche Nachricht',
'Mensagem original',
'Ursprungligt meddelande',
'Oorspronkelijk bericht',
'Message d\'origine',
+ 'Origin message',
'Forwarded message',
- 'Weitergeleitete Nachricht / Forwarded Message');
+ 'Weitergeleitete Nachricht / Forwarded Message',
+ '[A-Za-z ]+ <(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})> schrieb:');
my $k = 0; # any text above?
- my $tmp = 0; # flagged if inside PGP output
+ my $tmp = 0; # flagged if inside PGP or SSL output
DONE: for ($x=0; $x<scalar(@$lines); $x++) {
if (!$vrb[$x]) {
$$lines[$x] =~ /^>>> On [A-Z][a-z][a-z]?, [A-Z][a-z][a-z]? \d\d?, \d\d\d\d at [ \d]\d:\d\d [AP]M, in message/))) {
$x++;
$trad = 0;
- $bigqn = 0;
+ if ($k) { $bigqn = 0; }
last DONE;
}
}
((!$spass) || index($$lines[$x], $spass_prefix)!=0))
{
if ($mua eq 'mutt' && (!$tmp) &&
- $$lines[$x] =~
- /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o) {
- $tmp = 1;
+ ($$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o ||
+ $$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_ssloutstart\E)/o)) {
+ $tmp = 1;
} elsif ($mua eq 'mutt' && $tmp &&
($$lines[$x] =~
/^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
+ $$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpcryptstart\E)/o ||
$$lines[$x] =~
/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigstart\E)/o)) {
$tmp = 0;
for (my $i=$#$lines; $i>=0; $i--) {
if ($vrb[$i]) { last; }
- if ($$lines[$i] =~ /^$indent/o) {
+ if (index($$lines[$i], $indent)==0) {
$j++;
$k = $i;
}
# earlier -- the way it is done right now would screw up the verbatim
# list)
if ($cr) {
+ # When handling regular TOFU above we move the last empty line from
+ # the body to the signature. This prevents the correct removal of
+ # empty lines before a signature (one line less is removed than it
+ # should) when -c and -t are used. This fixes it.
+ if (scalar(@sig) && $sig[0] =~ /^\s*$/) {
+ push(@$lines, shift(@sig));
+ }
+
my $t = 0;
for ($x=scalar(@$lines)-1; $x>=0; $x--) {
if ((!$vrb[$x]) &&
($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'});
# command line switches
-($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax,
+($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $fixind, $footers, $lax,
$ml, $gw, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $nohdr, $reply,
$sani, $sig, $sigint, $spass, $trad, $trsp) =
- (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
my $ifile = '-'; # use STDIN if nothing specified
# temp vals:
'debug|d' => \$sysl,
'diff' => \$diff,
'e' => \$elli,
+ 'fixind' => \$fixind,
'ftr-ad' => \$ftr_ad,
'ftr-ml' => \$ftr_ml,
'groupwise' => \$gw,
if (defined $_t_mua) {
$mua = lc($_t_mua);
# mutt still displays the message when ^C'ing pgp verification:
- if ($mua eq 'mutt') { $SIG{'INT'} = 'sigint_handler'; }
+ if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
+ $SIG{'INT'} = 'sigint_handler';
+ }
}
if (defined $_t_redir) { $mda = $_t_redir ? $_t_redir : '1'; }
if (defined $_t_check) {
if (defined $_t_cr) { $cr = $_t_cr ? $_t_cr : $crshrink; }
if ($ms_smart) { $ms = 1; }
-if ($mua eq 'mutt') {
- if (defined $locale && $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
+if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
+ if (defined $locale &&
+ $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
eval { require Locale::gettext; };
if ($@) { warn $@; exit(EX_SOFTWARE); } else {
- Locale::gettext::textdomain('mutt');
+ Locale::gettext::textdomain($mua);
($mutt_attachment) =
Locale::gettext::gettext("[-- Attachment #%d") =~
m/^([^%]*)/;
Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
m/^([^%]*)/;
($mutt_pgpsigned) =
- Locale::gettext::gettext("[-- End of signed data --]\n") =~
- m/^(.*)\n/m;
+ Locale::gettext::gettext("\n[-- End of signed data --]\n") =~
+ m/^\n*(.*)\n/m;
($mutt_beginsigned) =
Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
m/^(.*)\n/m;
Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
m/^(.*)\n/m;
($mutt_pgpclearsigstart) =
- Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
+ Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n\n") =~
m/^(.*)\n/m;
($mutt_pgpencrypted) =
Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
m/^(.*)\n/m;
($mutt_pgpoutstart) =
- Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
- m/^([^%]*)/;
+ sprintf(Locale::gettext::gettext("[-- %s output follows%s --]\n"), 'PGP', '%s') =~
+ m/^(.*)%s/;
+ $mutt_pgpoutstart =~ s/%s/PGP/;
($mutt_pgpoutend) =
- Locale::gettext::gettext("[-- End of PGP output --]\n") =~
+ Locale::gettext::gettext("[-- End of PGP output --]\n\n") =~
+ m/^(.*)\n/m;
+ ($mutt_ssloutstart) =
+ Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
+ m/^(.*)%s/;
+ $mutt_ssloutstart =~ s/%s/OpenSSL/;
+ ($mutt_ssloutend) =
+ Locale::gettext::gettext("[-- End of OpenSSL output --]\n\n") =~
m/^(.*)\n/m;
Locale::gettext::textdomain('gnupg');
Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
m/^([^%]*)/;
}
+ # mutt and mutt-kz right now only differ in the gettext domain name,
+ # so after fetching the gettext lines we treat them the same:
+ $mua = 'mutt';
}
}