X-Git-Url: https://git.deb.at/w?p=pkg%2Ft-prot.git;a=blobdiff_plain;f=t-prot;h=e8edbaedfc252c9b5d784ddf502f615e0e306d09;hp=199daba5b45480da9bd5fd94ccbb04363b3a1d8d;hb=HEAD;hpb=8e56a4fc26c4f805286ad5c62157cafbe37acc58 diff --git a/t-prot b/t-prot index 199daba..e8edbae 100755 --- a/t-prot +++ b/t-prot @@ -1,13 +1,13 @@ #!/usr/bin/perl -w -# $Id: t-prot,v 1.222 2005/02/14 14:19:14 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::Mixed qw(nextOption); -use constant VER => '1.96'; +use Getopt::Long qw(:config gnu_getopt no_ignore_case); +use constant VER => '3.4'; use constant REV => ''; -use constant REL => q$Revision: 1.222 $=~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'; @@ -21,26 +21,30 @@ use constant EX_SOFTWARE => 70; use constant EX_IOERR => 74; use constant EX_BOUNCE => EX_UNAVAILABLE; use vars qw( - $ad $ads $bigqn $bigqx $boun $check $check_ratio $cr $diff $elli - $footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl - $lax $lsig $maxsig $mda $ml $ms $ms_smart $msg_quote $msg_ratio - $mua $ofile $pgpshort $pgpmove $pgpmovevrf $sig $sigint $sign - $spass $spass_prefix $sysl $trad $trsp + $ad $ads $bigqn $bigqx $boun $check $check_ratio $cr $crshrink $diff $elli + $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 $gpg_WARNING $gpg_Warning $gpg_Cantcheck $gpg_aka $gpg_bad $gpg_expired $gpg_good $gpg_bug $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 ); -# Please adjust these vals to your needs (they are no constants because -# command line can change them or they are used in rexexp's): +# Please adjust these vals to your needs only if you know what you are +# doing. They are no constants because command line can change them or +# they are used in some rexexp. $0 =~ s!^.*/!!; $maxsig = 4; # max. valid signature length -$indent = '>'; # Indent string, regexp to identify a quoted line +$maxlines = undef; # no limit of message lines +$crshrink = 2; # multiple blank lines are shrunk to $crshrink lines +$indent = '>'; # Indent string to identify a quoted line $kminl = 65; # see decomb() for details $kmaxl = 80; $kdiff = 20; @@ -53,7 +57,7 @@ $ftr_ad = undef; # too hard on performance to be default $ftr_ml = undef; # too hard on performance to be default $ofile = '-'; # use STDOUT if nothing is specified $spass_prefix = 'SPAM: '; -$check_ratio = .75; # 3/4 tofu is enough not to accept the message +$check_ratio = 0; # off by default $msg_quote = "Blocked by $0: This message has been rejected because of a full quote. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n"; $msg_ratio = "Blocked by $0: This message has been rejected because of excessive quoting. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n"; # end of user adjusted vals @@ -65,10 +69,14 @@ $mutt_contenttype = '[-- Type: '; $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: '; @@ -86,43 +94,48 @@ $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 remove ad footers; requires -A - -A=DIRECTORY ad footer directory, treat ad footers as signature --bigq[=n[,x]] remove all but x lines of quotes with more than n lines; default is n=30 and x=10 - -c merge multiple blank lines + --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) --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 - --diff tolerate diffs appended *after* the signature + --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 -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\" - --kminl=n min. line length for wrapped line; requires -k - --kmaxl=n max. line length for wrapped line; requires -k --kdiff=n max. length difference between wrapped lines; req. -k - -L=DIRECTORY mailling list footer directory, treat mailing list + --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 footers as signature -l delete mailing list footer; requires -L --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), 'NONE' - for no output at all - -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 - -S[=n] supress signatures with more than n lines; - default is $maxsig if n not specified + --reply squeeze multiple reply prefixes in subject line + -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 --spass enable SpamAssassin workaround -t delete traditional style TOFU @@ -143,8 +156,70 @@ sub sigint_handler { $sigint = 1; } -# esc(): escapes a scalar reference for use in perl regexp -sub esc { ${$_[0]} =~ s/([\[\]\(\)\*\.\-\^\$\@])/\\$1/go; } +sub sanitize_hdr { + # Undoes MIME quoted-printable word encoding. + sub qp_decode { + my $word = shift; + $word =~ tr/_/\x20/; + $word =~ s/=DF/ss/og; + $word =~ s/=C4/Ae/og; + $word =~ s/=D6/Oe/og; + $word =~ s/=DC/Ue/og; + $word =~ s/=E4/ae/og; + $word =~ s/=F6/oe/og; + $word =~ s/=FC/ue/og; + $word =~ s/=([0-9A-F]{2})/chr(hex $1)/ioge; + $word; + } + + sub umlauts { + my $word = shift; + $word =~ s/ä/ae/og; + $word =~ s/Ä/Ae/og; + $word =~ s/ö/oe/og; + $word =~ s/Ö/Oe/og; + $word =~ s/ü/ue/og; + $word =~ s/Ü/Ue/og; + $word =~ s/ß/ss/og; + $word; + } + + my $H = shift; # array of header lines + my $i; + + for ($i=0; $i<$#$H; $i++) { + if ($$H[$i] =~ /^subject: /io) { + if ($sani) { + $$H[$i] =~ s/=\?iso-8859-15?\?q\?([^?]*)\?=/qp_decode($1)/ioge; + $$H[$i] =~ s/^subject: *(.*)/"Subject: " . umlauts($1)/ioe; + } + if ($reply) { + $$H[$i] =~ s/^subject: *(?:(?:Re|Antw(?:ort)?|AW|WG): *)+/Subject: Re: /io; + } + + $i++; + while ($i<$#$H && $$H[$i] =~ /^\s/) { + if ($sani) { + $$H[$i] =~ s/=\?iso-8859-15?\?q\?([^?]*)\?=/qp_decode($1)/ioge; + $$H[$i] =~ s/^\s+(\S.*)/" " . umlauts($1)/ioe; + } + if ($reply) { + $$H[$i] =~ s/^\s+(?:(?:Re|Antw(?:ort)?|AW|WG): *)+/ /io; + } + $i++; + } + } + elsif ($sani && $$H[$i] =~ /^(?:from|to): /io) { + $$H[$i] =~ s/=\?iso-8859-15?\?q\?([^?]*)\?=/qp_decode($1)/ioge; + + $i++; + while ($i<$#$H && $$H[$i] =~ /^\s/) { + $$H[$i] =~ s/=\?iso-8859-15?\?q\?([^?]*)\?=/qp_decode($1)/ioge; + $i++; + } + } + } +} # remove_footers(): remove any trailing appearance of footers contained # in the given directory. @@ -161,12 +236,14 @@ sub remove_footers { } if ($F && scalar(@$L)) { - if (!opendir(DIR, $F)) { print STDERR "Could not open $F: $!\n"; exit(EX_IOERR); } + if (!opendir(DIR, $F)) + { print STDERR "Could not open $F: $!\n"; exit(EX_IOERR); } my @feet = grep { /^[^.]/ && -f "$F/$_" } readdir DIR; closedir DIR; foreach my $f (@feet) { - if (!open(IN, "$F/$f")) { print STDERR "Could not open $F/$f: $!\n"; exit(EX_IOERR); } + if (!open(IN, "$F/$f")) + { print STDERR "Could not open $F/$f: $!\n"; exit(EX_IOERR); } my @l = ; close IN; @@ -174,12 +251,12 @@ sub remove_footers { for (my $z=0; $z<=$#l; $z++) { chomp($l[$z]); } if (defined $V) { - WIPE: for (my $z=scalar(@$L)-scalar(@l); $z>=0; $z--) - { + WIPE: for (my $z=scalar(@$L)-scalar(@l); $z>=0; $z--) { if (scalar(@l)+$z<=scalar(@$L)) { my $y = 0; for(my $x=1; $x<=scalar(@l); $x++) { - if (index($$L[scalar(@$L)-$x-$z], $l[scalar(@l)-$x])!=0) { + if (index($$L[scalar(@$L)-$x-$z], + $l[scalar(@l)-$x])!=0) { $y = 1; } } @@ -236,6 +313,7 @@ sub decomb { # underlining some part of the line above (using '^') # nor begin with a whitespace, # * the 1st line must not end with a hyphen, + # * the 2nd line must not indicate content was deleted, # * the 2nd line must not be some mutt(1) commentary, # * there must not be a valid word wrap to produce a longer # 1st line (if not quoted), @@ -250,10 +328,12 @@ sub decomb { (index($$L[$x+1], $indent)!=0) && ($$L[$x+1] !~ /^$/) && ($$L[$x+1] !~ /^[\s^]/) && - ($$L[$x] !~ /-$/) && - ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e.+?\a)?\[-- .* --]/) && + ($$L[$x] !~ /-$/) && + ($$L[$x+1] !~ /^\Q[...]\E\s*$/) && + ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e[^\a]+\a)?\[-- /) && (length($$L[$x])+index($$L[$x+1], ' ')>$max || - (index($$L[$x+1], ' ')<0 && length($$L[$x])+length($$L[$x+1])>$max)) && + (index($$L[$x+1], ' ')<0 && + length($$L[$x])+length($$L[$x+1])>$max)) && (length($$L[$x])+length($$L[$x+1])<$kmaxl) && (length($$L[$x])+length($$L[$x+1])>$kminl) && (length($$L[$x])-length($$L[$x+1])>$kdiff) && @@ -267,7 +347,7 @@ sub decomb { } # 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 @@ -285,7 +365,7 @@ sub debigq { my $x = $k-$bigqx; $i -= $k; - $$L[$i] = "[---=| Quote block shrinked by $0: " . + $$L[$i] = "[---=| Quote block shrunk by $0: " . "$x lines snipped |=---]\n"; $i++; splice(@$L, $i, $x-1); @@ -310,11 +390,14 @@ sub pgp { my $ok = 0; while ($X<$Z) { - if ($$L[$X] =~ /^gpg:\s(?:$gpg_WARNING|$gpg_Warning|$gpg_bad|$gpg_Cantcheck|$gpg_expired)/o) - { return 0; } - if ($$L[$X] =~ /^gpg:\s$gpg_bug/o) + if (index($$L[$X], "gpg: $gpg_WARNING")==0 || + index($$L[$X], "gpg: $gpg_Warning")==0 || + index($$L[$X], "gpg: $gpg_bad")==0 || + index($$L[$X], "gpg: $gpg_Cantcheck")==0 || + index($$L[$X], "gpg: $gpg_expired")==0 || + index($$L[$X], "gpg: $gpg_bug")==0) { return 0; } - if ($$L[$X] =~ /^gpg:\s$gpg_good/o) + if (index($$L[$X], "gpg: $gpg_good")==0) { $ok = 1; } $X++; } @@ -332,37 +415,42 @@ sub pgp { for (my $x=0; $x1 && - $$L[$i] =~ /^gpg:\s$gpg_aka/o && $$L[$i] !~ /$from/) - { - splice(@$L, $i, 1); - splice(@$V, $i, 1); - $i--; + if ($pgpshort && index($$L[$i], "gpg: $gpg_aka")==0) { + $uid++; + + if (!defined($from) || + ($uid>1 && index($$L[$i], $from)<0)) { + splice(@$L, $i, 1); + splice(@$V, $i, 1); + $i--; + } } - elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend)/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); @@ -374,8 +462,13 @@ sub pgp { } } elsif ($tmp && - $$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpencrypted|$mutt_pgpclearsigned|$mutt_pgpsigned)/o) - { + $$L[$x] =~ /^ + (?:\e[^\a]+\a)? + (?:\Q$mutt_pgpencrypted\E| + \Q$mutt_pgpcryptend\E| + \Q$mutt_pgpclearsigned\E| + \Q$mutt_pgpsigned\E) + /ox) { splice(@$L, $x+1, 0, @{$tmp[$tmp]}); for (my $i=$x; $i(.*)/) && ($1 ne '-')) { + if ((!$lax) && ($O =~ /^>(.*)/) && ($1 ne '-') && ($1 ne '/dev/null')) { if (!sysopen(OUT, $1, O_EXCL|O_CREAT|O_WRONLY)) { print STDERR "Could not open $1: $!\n"; exit(EX_IOERR); } @@ -425,25 +518,35 @@ sub process_msg { my (@ads, @hdr, @bo1, @bo2, @ftr, @sig, @vrb, @att) = ((), (), (), (), (), (), (), (), ()); - # First, remove and store lines we might need later... + # Remove and store lines we might need later... # Remove headers: - for ($x=0; $x<$#$lines; $x++) { if (@$lines[$x] =~ /^$/) { last; }; } - @hdr = @$lines[0..$x]; - splice(@$lines, 0, $x+1); + if (!$nohdr) { + for ($x=0; $x<$#$lines; $x++) { if (@$lines[$x] =~ /^$/) { last; }; } + @hdr = @$lines[0..$x]; + splice(@$lines, 0, $x+1); + } # remember the original body lines count my $linecount = scalar(@$lines); + # Sanitize header fields: + if ($reply || $sani) { sanitize_hdr(\@hdr); } + + # Remove ML footers: + remove_footers($lines, \@ftr, $footers, undef, $ftr_ml); + + # Remove ad footers: + remove_footers($lines, \@ads, $ads, undef, $ftr_ad); # See if we have a multipart content type. If yes, see if it is already - # ripped (e.g. by mutt(1)), otherwise only leave the first part if it - # is plain text (if not, we are done - non-text messages are not our - # business). + # ripped (e.g. by you MUA, assuming it does not get special treatment with + # --mua=foo), otherwise only leave the first part if it is plain text (if + # not, we are done - non-text messages are not our business). if ($mua ne 'mutt') { for ($x=0; $x=scalar(@$lines)) { exit(EX_DATAERR); } - if ($bar =~ /^text\/plain/i) { + if ($bar =~ m!^text/plain!i) { my $z; for ($z=1; $x+$z<@$lines; $z++) { if (index($$lines[$x+$z], '--'.$foo)==0) { @@ -485,6 +588,12 @@ sub process_msg { } @bo1 = @$lines[0..$x]; splice(@$lines, 0, $x+1); + + # remove mailing list and ad footers within this + # attachment: + remove_footers($lines, \@ftr, $footers, undef, $ftr_ml); + remove_footers($lines, \@ads, $ads, undef, $ftr_ad); + last; } else { @@ -504,9 +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]+)$/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; } } @@ -516,23 +657,16 @@ sub process_msg { for ($x=0; $x=$check_ratio) { + if ($y/$z>=$check_ratio) { print $msg_ratio; exit EX_UNAVAILABLE; } } - # Remove ML footers: - remove_footers($lines, \@ftr, $footers, undef, $ftr_ml); - - # Remove ad footers: - remove_footers($lines, \@ads, $ads, undef, $ftr_ad); - if ($mua eq 'mutt') { # See if we find pgp output generated by mutt before we scramble # the thing. If yes, see if we can beautify it. @@ -546,17 +680,29 @@ sub process_msg { if ($vrb[$x]) { next; } # The following regexp's are quite ugly because for most users # these lines are coloured using termcap... (bah!) - if (($$lines[$x] =~ /^(?:\e.+?\a)?$mutt_attachment(\d+)(?::.*)? \-\-\]/o && + if (($$lines[$x] =~ + /^(?:\e[^\a]+\a)?\Q$mutt_attachment\E(\d+)/o && (($1 ne '1') || ($x<$#$lines && - $$lines[$x+1] !~ /^(?:\e.+?\a)?(?:$mutt_contenttype)(?:text\/plain|application\/pgp)/io))) || - ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpsigned|$mutt_pgpclearsigned|$mutt_pgpencrypted)/o)) + $$lines[$x+1] !~ m!^ + (?:\e[^\a]+\a)? + (?:\Q$mutt_contenttype\E) + (?:text/plain|application/pgp) + !oxi))) || + ($$lines[$x] =~ /^ + (?:\e[^\a]+\a)? + (?:\Q$mutt_pgpsigned\E | + \Q$mutt_pgpclearsigned\E| + \Q$mutt_pgpcryptend\E| + \Q$mutt_pgpencrypted\E) + /ox)) { # Strip attachments to prepare further processing unshift(@att, @$lines[$x..$#$lines]); splice(@$lines, $x); # Try to fix trailing empty lines - while (scalar(@$lines) && $$lines[$#$lines] =~ /^(?:\e.+?\a)?\s*$/) { + while (scalar(@$lines) && $$lines[$#$lines] =~ + /^(?:\e[^\a]+\a)?\s*$/) { unshift(@att, pop(@$lines)); } @@ -583,8 +729,12 @@ sub process_msg { # situations. # The following regexp is quite ugly because for most # users the line is coloured using termcap... (bah!) - if ($att[$x]=~/^(?:\e.+?\a)?$mutt_attachment\d+.* --\]/o && - $att[$x+1] =~ /^(?:\e.+?\a)?(?:$mutt_contenttype)message\/rfc822/o) + if ($att[$x] =~ + /^(?:\e[^\a]+\a)?\Q$mutt_attachment\E\d+/o && + $att[$x+1] =~ m!^ + (?:\e[^\a]+\a)? + (?:\Q$mutt_contenttype\E) (?:message/rfc822|multipart/alternative) + !ox) { $x += 2; while ($att[$x] !~ /^\s*$/) { $x++; } @@ -602,36 +752,63 @@ sub process_msg { # Remove signature: if (scalar(@$lines)) { my $sn = 0; + my $chk_empty = 1; + my $empty = 0; + for ($x = $#$lines; $x>=0; $x--) { - if ((!$vrb[$x]) && $$lines[$x] =~ /^-- $/) { - if ($diff) { - for (my $i=1; $x+$i+1$lsig))) { - if ($lsig && !$sig) { - unshift(@sig, "[---=| Overlong signature removed by $0: " . - (scalar(@$lines)-$x) . " lines snipped |=---]\n"); + if ($sig || ($lsig && ($#$lines-$x-$empty>$lsig))) { + if ($lsig && !$sig) { + unshift(@sig, "[---=| Overlong signature removed by $0: " . + (scalar(@$lines)-$x) . " lines snipped |=---]\n"); + } + splice(@$lines, $x); } - splice(@$lines, $x); - } - else { - unshift(@sig, @$lines[$x..$#$lines]); - splice(@$lines, $x); + else { + unshift(@sig, @$lines[$x..$#$lines]); + splice(@$lines, $x); + } + if (defined($sign) && ++$sn==$sign) { last; } else { next; } } - if (defined($sign) && ++$sn==$sign) { last; } else { next; } + # any trailing newlines? + elsif ($chk_empty && $$lines[$x] =~ /^\s*$/) { $empty++; } + elsif ($chk_empty) { $chk_empty = 0; } + } + } + } + + # 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 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>>[^\<]+<[^\>]+> \d\d?\/\d\d?\/\d\d? \d\d?:\d\d [AP]M >>>/ || + $$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; } } @@ -669,16 +851,27 @@ sub process_msg { if ((!$k) && $$lines[$x] !~ /^\s*$/o && ((!$mua) || ($mua eq 'mutt' && - $$lines[$x] !~ /^(?:\e.+?\a)?(?:$mutt_attachment)/o && - $$lines[$x] !~ /^(?:\e.+?\a)?(?:$mutt_contenttype)/o)) && - ((!$spass) || $$lines[$x]!~/^$spass_prefix/o)) + # this line seems not necessary since mutt-1.5.18: + $$lines[$x] !~ /^\e[^\a]+\a$/o && + $$lines[$x] !~ + /^(?:\e[^\a]+\a)?(?:\Q$mutt_attachment\E)/o && + $$lines[$x] !~ + /^(?:\e[^\a]+\a)?(?:\Q$mutt_contenttype\E)/o)) && + ((!$spass) || index($$lines[$x], $spass_prefix)!=0)) { if ($mua eq 'mutt' && (!$tmp) && - $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/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)?(?:$mutt_beginsigned)/o || - $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpclearsigstart)/o)) { + ($$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; } elsif (!$tmp) { $k = 1; @@ -696,17 +889,19 @@ sub process_msg { my $p = 0; # levels of pgp signed parts for (my $i=$x+1; $i=0; $i--) { - if ($$lines[$i] =~ /^$indent/o) { + if ($vrb[$i]) { last; } + if (index($$lines[$i], $indent)==0) { $j++; $k = $i; } @@ -797,14 +993,14 @@ sub process_msg { # Care for trailing whitespaces: if ($trsp) { for ($x=0; $x=0; $x--) { - if ((!$vrb[$x]) && $$lines[$x] =~ /^\s*$/) { - if ($t<2) { $t++; } else { splice(@$lines, $x, 1); } + if ((!$vrb[$x]) && + (($mua eq 'mutt' && $$lines[$x] =~ /^\e[^\a]+\a\s*$/o) || + $$lines[$x] =~ /^\s*$/o)) + { + if ($t<$cr) { $t++; } else { splice(@$lines, $x, 1); } } else { $t = 0; } } @@ -846,187 +1053,216 @@ sub process_msg { # environment -my $locale = $ENV{'LC_ALL'}?$ENV{'LC_ALL'}:($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'}); +my $locale = $ENV{'LC_ALL'}?$ENV{'LC_ALL'}: + ($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'}); # command line switches -($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax, - $ml, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $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); +($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); my $ifile = '-'; # use STDIN if nothing specified +# temp vals: +my ($_t_bigq, $_t_help, $_t_kminl, $_t_kmaxl, $_t_kdiff, $_t_maxsig, $_t_mua, + $_t_redir, $_t_check, $_t_sigsmax, $_t_ver, $_t_nohdr, $_t_cr) = undef; + # get command line params: -Getopt::Mixed::init('a A=s c d e h i=s k L=s l m M=s o=s P=s p:s r S:i'. - ' s t v w bigq:s check:s debug>d diff ftr-ad ftr-ml help>h kminl=i'. - ' kmaxl=i kdiff=i lax-security locale=s ms-smart mua>M pgp-short'. - ' pgp-move pgp-move-vrf sigsmax:i spass version>v'); -while (my ($opt, $val, $pretty) = nextOption()) { - if ($opt eq 'a') { $ad = 1; } - elsif ($opt eq 'A') { $ads = $val; } - elsif ($opt eq 'bigq') { - if ($val !~ /^(?:(\d+)(?:,(\d+))?)?$/) { help(); } - $bigqn = $1?$1:30; - $bigqx = $2?$2:10; - if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); } - } - elsif ($opt eq 'c') { $cr = 1; } - elsif ($opt eq 'check') { - $check = 1; - while ($val && $val =~ s/^([^,\s]+)(?:,(\S+))?$/$2/) { - my $foo = $1; - - if ($foo =~ /^ratio=(0?\.\d+)$/) { - $check_ratio = $1?$1:1; - } - } +if (!Getopt::Long::GetOptions( + 'a' => \$ad, + 'A=s' => \$ads, + 'bigq:s' => \$_t_bigq, + 'body' => \$_t_nohdr, + 'c:i' => \$_t_cr, + 'check:s' => \$_t_check, + 'debug|d' => \$sysl, + 'diff' => \$diff, + 'e' => \$elli, + 'fixind' => \$fixind, + 'ftr-ad' => \$ftr_ad, + 'ftr-ml' => \$ftr_ml, + 'groupwise' => \$gw, + 'help|h' => \$_t_help, + 'i=s' => \$ifile, + 'k' => \$kamm, + 'kminl=i' => \$_t_kminl, + 'kmaxl=i' => \$_t_kmaxl, + 'kdiff=i' => \$_t_kdiff, + 'L=s' => \$footers, + 'l' => \$ml, + 'lax-security' => \$lax, + 'locale=s' => \$locale, + 'max-lines:i' => \$maxlines, + 'ms-smart' => \$ms_smart, + 'mua|M=s' => \$_t_mua, + 'm' => \$ms, + 'o=s' => \$ofile, + 'P=s' => \$boun, + 'p:s' => \$_t_redir, + 'pgp-short' => \$pgpshort, + 'pgp-move' => \$pgpmove, + 'pgp-move-vrf' => \$pgpmovevrf, + 'r' => \$hdrs, + 'reply' => \$reply, + 'S:i' => \$_t_maxsig, + 's' => \$sig, + 'sani' => \$sani, + 'sigsmax:i' => \$_t_sigsmax, + 'spass' => \$spass, + 't' => \$trad, + 'version|v' => \$_t_ver, + 'w' => \$trsp + )) { + help(); +} + +# clean up temp vals: +if (defined $_t_bigq) { + if ($_t_bigq !~ /^(?:(\d+)(?:,(\d+))?)?$/) { help(); } + $bigqn = $1?$1:30; + $bigqx = $2?$2:10; + if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); } +} +if (defined $_t_help) { help(); } +if (defined $_t_kminl) { $kminl = $_t_kminl; $kamm = 1; } +if (defined $_t_kmaxl) { $kmaxl = $_t_kmaxl; $kamm = 1; } +if (defined $_t_kdiff) { $kdiff = $_t_kdiff; $kamm = 1; } +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' || $mua eq 'mutt-kz') { + $SIG{'INT'} = 'sigint_handler'; } - elsif ($opt eq 'd') { $sysl = 1; } - elsif ($opt eq 'diff') { $diff = 1; } - elsif ($opt eq 'e') { $elli = 1; } - elsif ($opt eq 'ftr-ad') { $ftr_ad = 1; $ad = 1; } - elsif ($opt eq 'ftr-ml') { $ftr_ml = 1; $ml = 1; } - elsif ($opt eq 'i') { $ifile = $val; } - elsif ($opt eq 'k') { $kamm = 1; } - elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; } - elsif ($opt eq 'kmaxl') { $kmaxl = $val; $kamm = 1; } - elsif ($opt eq 'kdiff') { $kdiff = $val; $kamm = 1; } - elsif ($opt eq 'L') { $footers = $val; } - elsif ($opt eq 'l') { $ml = 1; } - elsif ($opt eq 'lax-security') { $lax = 1; } - elsif ($opt eq 'locale') { $locale = $val; } - elsif ($opt eq 'm') { $ms = 1; } - elsif ($opt eq 'ms-smart') { $ms_smart = 1; $ms = 1; } - elsif ($opt eq 'M') { - $mua = lc($val); - - if ($mua eq 'mutt') { - # mutt still displays the message when ^C'ing pgp verification: - $SIG{'INT'} = 'sigint_handler'; - } +} +if (defined $_t_redir) { $mda = $_t_redir ? $_t_redir : '1'; } +if (defined $_t_check) { + $check = 1; + while ($_t_check && $_t_check =~ /^([^,\s]+)(?:,(\S+))?$/) { + my $foo = $1; + $_t_check = $2; + if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) { $check_ratio = $1?$1:0.75; } } - elsif ($opt eq 'o') { $ofile = $val; } - elsif ($opt eq 'P') { $boun = $val; } - elsif ($opt eq 'p') { $mda = $val ? $val : '1'; } - elsif ($opt eq 'pgp-short') { $pgpshort = 1; } - elsif ($opt eq 'pgp-move') { $pgpmove = 1; } - elsif ($opt eq 'pgp-move-vrf') { $pgpmovevrf = 1; } - elsif ($opt eq 'r') { $hdrs = 1; } - elsif ($opt eq 'S') { $lsig = $val ? $val : $maxsig; } - elsif ($opt eq 's') { $sig = 1; } - elsif ($opt eq 'sigsmax') { $sign = $val ? $val : undef; } - elsif ($opt eq 'spass') { $spass = 1; } - elsif ($opt eq 't') { $trad = 1; } - elsif ($opt eq 'v') { version(); } - elsif ($opt eq 'w') { $trsp = 1; } - else { help(); } } -Getopt::Mixed::cleanup(); -if (($ml && $footers eq '')|| # no -l without -L - ($ad && $ads eq '')|| # no -a without -A - ($ifile eq '')|| # no empty -i - ($ofile eq '')) # no empty -o -{ help(); } - - -if ($mua eq 'mutt') { - if (defined $locale && $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') { +if (defined $_t_sigsmax) { $sign = $_t_sigsmax ? $_t_sigsmax : undef; } +if (defined $_t_ver) { version(); } +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' || $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/^([^%]*)/o; + m/^([^%]*)/; ($mutt_contenttype) = Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~ - m/^([^%]*)/o; + m/^([^%]*)/; ($mutt_pgpsigned) = - Locale::gettext::gettext("[-- End of signed data --]\n") =~ - m/^(.*?)\n/mo; + 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/mo; + m/^(.*)\n/m; ($mutt_pgpclearsigned) = Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~ - m/^(.*?)\n/mo; + m/^(.*)\n/m; ($mutt_pgpclearsigstart) = - Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~ - m/^(.*?)\n/mo; + 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/mo; + m/^(.*)\n/m; ($mutt_pgpoutstart) = - Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~ - m/^([^%]*)/o; + 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") =~ - m/^(.*?)\n/mo; + 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'); ($gpg_WARNING) = Locale::gettext::gettext("WARNING: using insecure random number generator!!\n") =~ - m/^(.*?: )/o; + m/^([^:]*: )/; ($gpg_Warning) = Locale::gettext::gettext("WARNING: message was encrypted with a weak key in the symmetric cipher.\n") =~ - m/^(.*?: )/o; + m/^([^:]*: )/; ($gpg_Cantcheck) = Locale::gettext::gettext("Can't check signature: %s\n") =~ - m/^([^%]*)/o; + m/^([^%]*)/; ($gpg_aka) = Locale::gettext::gettext((' 'x16).'aka "%s"') =~ - m/^(.*?)"/o; + m/^([^"«%]*)["«%]/; ($gpg_bad) = Locale::gettext::gettext('BAD signature from "%s"') =~ - m/^(.*?)"/o; + m/^([^"«%]*)["«%]/; ($gpg_expired) = Locale::gettext::gettext("Note: This key has expired!\n") =~ - m/^(.*?)\n/mo; + m/^(.*)\n/m; ($gpg_good) = Locale::gettext::gettext('Good signature from "%s"') =~ - m/^(.*?)"/o; + m/^(([^"«%]*))["«%]/; ($gpg_bug) = Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~ - m/^([^%]*)/o; + 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'; } - esc(\$mutt_attachment); - esc(\$mutt_contenttype); - esc(\$mutt_pgpsigned); - esc(\$mutt_beginsigned); - esc(\$mutt_pgpclearsigned); - esc(\$mutt_pgpclearsigstart); - esc(\$mutt_pgpencrypted); - esc(\$mutt_pgpoutstart); - esc(\$mutt_pgpoutend); - - esc(\$gpg_WARNING); - esc(\$gpg_Warning); - esc(\$gpg_Cantcheck); - esc(\$gpg_aka); - esc(\$gpg_bad); - esc(\$gpg_expired); - esc(\$gpg_good); - esc(\$gpg_bug); -} -else { - if ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); } } - -esc(\$spass_prefix); +elsif ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); } + +if (($ml && $footers eq '')|| # no -l without -L + ($ad && $ads eq '')|| # no -a without -A + ($nohdr && $pgpshort)|| # --body and --pgp-short are like oil and water + (($nohdr||$hdrs) && ($sani||$reply))|| # no sanitizing without headers :) + ($ifile eq '')|| # no empty -i + ($ofile eq '')) # no empty -o +{ help(); } # Read message: -if (!open(IN, $ifile)) { print STDERR "Could not open $ifile: $!\n"; exit(EX_IOERR); } +if (!open(IN, $ifile)) + { print STDERR "Could not open $ifile: $!\n"; exit(EX_IOERR); } my @message = ; close IN; +# First, check msg length and stop processing if msg is too long: +if ((defined $maxlines) && (@message > $maxlines)) { + if ($mua eq 'mutt') { + my $x = 0; + if (!$nohdr) { + do { $x++; } while ($x<$#message && $message[$x]!~/^$/); + $x++; + } + splice(@message, $x, 0, + ("[---=| Processing by $0 skipped: message too long |=---]\n\n")); + } + write_msg(($mda?'|'.SENDMAIL." $mda":">$ofile"), \@message); + + if ($mua eq 'mutt') { exit(EX_OK); } + exit(EX_DATAERR); +} + # this should be self-explanatory: process_msg(\@message); # Finally, print clean lines: -if ($ofile ne 'NONE') { - write_msg(($mda?'|'.SENDMAIL." $mda":">$ofile"), \@message); -} +write_msg(($mda?'|'.SENDMAIL." $mda":">$ofile"), \@message); # vim600:set foldmethod=marker: # eof