X-Git-Url: https://git.deb.at/w?p=pkg%2Ft-prot.git;a=blobdiff_plain;f=t-prot;h=e8edbaedfc252c9b5d784ddf502f615e0e306d09;hp=29d23e1688a24c0044b79d0e111ec0483708b57d;hb=HEAD;hpb=d291c240515f15a9bb267aa00a60cd4b6e2a4634 diff --git a/t-prot b/t-prot index 29d23e1..e8edbae 100755 --- a/t-prot +++ b/t-prot @@ -1,13 +1,13 @@ #!/usr/bin/perl -w -# $Id: t-prot,v 1.312 2010/10/31 11:18:15 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.101'; +use constant VER => '3.4'; use constant REV => ''; -use constant REL => q$Revision: 1.312 $=~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'; @@ -33,6 +33,7 @@ use vars qw( $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted $mutt_pgpoutstart $mutt_pgpoutend $mutt_pgpcryptend $mutt_pgpcryptstart + $mutt_ssloutstart $mutt_ssloutend ); @@ -74,6 +75,8 @@ $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: '; @@ -91,13 +94,13 @@ $gpg_bug = '... this is a bug ('; # help(): print help text and exit with appropriate exit code sub help { print "Usage: $0 [options] - -A=DIRECTORY ad footer directory, treat ad footers as signature + -A DIRECTORY ad footer directory, treat ad footers as signature -a remove ad footers; requires -A --bigq[=n[,x]] remove all but x lines of quotes with more than n lines; default is n=30 and x=10 --body input has no headers; does not work with --pgp-short; multipart messages will not be detected - -c[=n] merge multiple blank lines to n lines (default is 2) + -c[n] merge multiple blank lines to n lines (default is 2) --check[=FLAGS] check various criteria, print error message and quit; see man page for details -d, --debug print notice to syslog when bouncing; requires -p @@ -108,12 +111,12 @@ sub help { --ftr-ml enable aggressive mailing list footer matching; req. -L --groupwise delete Novell Groupwise style TOFU -h, --help show this short help and exit - -i=INFILE file to be read; '-' for STDIN (default) + -i INFILE file to be read; '-' for STDIN (default) -k try to fix \"Kammquotes\" --kdiff=n max. length difference between wrapped lines; req. -k --kmaxl=n max. line length for wrapped line; requires -k --kminl=n min. line length for wrapped line; requires -k - -L=DIRECTORY mailing list footer directory, treat mailing list + -L DIRECTORY mailing list footer directory, treat mailing list footers as signature -l delete mailing list footer; requires -L --lax-security use unsafe writing method; USE ON YOUR OWN RISK! @@ -122,15 +125,15 @@ sub help { -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 + -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 --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] suppress 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 @@ -412,19 +415,24 @@ sub pgp { for (my $x=0; $x1 && 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); @@ -453,14 +462,13 @@ sub pgp { } } 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(@$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) { @@ -605,20 +613,41 @@ sub process_msg { # Protect verbatims: $verb = 0; for ($x=0; $x$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; } } @@ -659,7 +688,7 @@ sub process_msg { (?:\e[^\a]+\a)? (?:\Q$mutt_contenttype\E) (?:text/plain|application/pgp) - !ox))) || + !oxi))) || ($$lines[$x] =~ /^ (?:\e[^\a]+\a)? (?:\Q$mutt_pgpsigned\E | @@ -793,18 +822,17 @@ sub process_msg { # 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', '[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>> 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; } } @@ -832,9 +860,11 @@ sub process_msg { ((!$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 || @@ -1101,7 +1131,9 @@ if (defined $_t_maxsig) { $lsig = $_t_maxsig ? $_t_maxsig : $maxsig; } 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) { @@ -1118,11 +1150,12 @@ if (defined $_t_nohdr) { $nohdr=1; $hdrs=1; } 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/^([^%]*)/; @@ -1130,8 +1163,8 @@ if ($mua eq 'mutt') { 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; @@ -1139,16 +1172,24 @@ if ($mua eq 'mutt') { 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'); @@ -1177,6 +1218,9 @@ if ($mua eq 'mutt') { 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'; } }