X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=t-prot;h=bb2a0c239de4cfe3b298f7df91e392d25bde5aab;hb=16728fd5c22256ccbfd2566942df5c07eb18a194;hp=ff9d8115c7415d857a3ef25d8c8b8894ff259e75;hpb=b0d9c2864745744a3d0266f0461770b006483bdb;p=pkg%2Ft-prot.git diff --git a/t-prot b/t-prot index ff9d811..bb2a0c2 100755 --- a/t-prot +++ b/t-prot @@ -1,13 +1,13 @@ #!/usr/bin/perl -w -# $Id: t-prot,v 1.248 2006/11/30 14:06:27 jochen Exp $ +# $Id: t-prot,v 1.285 2010/02/15 20:13:00 jochen Exp $ require 5.006; use strict; use Fcntl qw(O_EXCL O_WRONLY O_CREAT); use Getopt::Mixed qw(nextOption); -use constant VER => '2.2'; +use constant VER => '2.15'; use constant REV => ''; -use constant REL => q$Revision: 1.248 $=~m/(\d+(?:\.\d+)+)/; +use constant REL => q$Revision: 1.285 $=~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'; @@ -23,9 +23,9 @@ 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 $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $sig $sigint - $sign $spass $spass_prefix $sysl $trad $trsp + $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 @@ -36,10 +36,12 @@ use vars qw( ); -# 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 +$maxlines = undef; # no limit of message lines $indent = '>'; # Indent string, regexp to identify a quoted line $kminl = 65; # see decomb() for details $kmaxl = 80; @@ -53,7 +55,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 @@ -86,8 +88,8 @@ $gpg_bug = '... this is a bug ('; # help(): print help text and exit with appropriate exit code sub help { print "Usage: $0 [options] - -a remove ad footers; requires -A -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; @@ -100,19 +102,21 @@ sub help { -e force ellipsis for excessive punctuation --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) -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 + -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 + --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 @@ -122,9 +126,10 @@ sub help { --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] supress 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 @@ -145,6 +150,71 @@ sub sigint_handler { $sigint = 1; } +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. sub remove_footers { @@ -160,12 +230,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; @@ -173,12 +245,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; } } @@ -250,11 +322,12 @@ sub decomb { (index($$L[$x+1], $indent)!=0) && ($$L[$x+1] !~ /^$/) && ($$L[$x+1] !~ /^[\s^]/) && - ($$L[$x] !~ /-$/) && + ($$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) && @@ -343,7 +416,8 @@ sub pgp { if (index($$H[$m], 'From:')==0) { $from = $$H[$m]; $m++; - while (exists($$H[$m]) && $$H[$m] =~ /^\s/) { $from .= $$H[$m]; $m++; } + while (exists($$H[$m]) && $$H[$m] =~ /^\s/) + { $from .= $$H[$m]; $m++; } last; } } @@ -352,19 +426,16 @@ sub pgp { my $uid = 1; for (my $i=$x+1; $i1 && - index($$L[$i], "gpg: $gpg_aka")==0 && - index($$L[$i], $from)<0) - { - splice(@$L, $i, 1); - splice(@$V, $i, 1); - $i--; + if ($pgpshort && index($$L[$i], "gpg: $gpg_aka")==0) { + $uid++; + + if ($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)/o) { if ($pgpmove || ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i))) { @@ -435,7 +506,7 @@ 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: if (!$nohdr) { for ($x=0; $x<$#$lines; $x++) { if (@$lines[$x] =~ /^$/) { last; }; } @@ -445,6 +516,9 @@ sub process_msg { # 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); @@ -542,9 +616,8 @@ sub process_msg { if (index($$lines[$x], $indent)==0) { $y++; } } } - $y = $y/$z; - if ($y>=$check_ratio) { + if ($y/$z>=$check_ratio) { print $msg_ratio; exit EX_UNAVAILABLE; } @@ -680,12 +753,13 @@ sub process_msg { if ($kamm) { decomb($lines, \@vrb); } # Now care about TOFU. - # One common mispractice is M$ style TOFU: - if ($ms) { + # One common mispractice is M$ and Groupwise style TOFU: + if ($ms||$gw) { # bloat this array if you want more internationalization: my @tofu = ('Original Message', 'Original-Nachricht', 'Ursprüngliche Nachricht', + 'Ursprüngliche Nachricht', 'Ursprungliche Nachricht', 'Mensagem original', 'Ursprungligt meddelande', @@ -699,7 +773,10 @@ sub process_msg { 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; @@ -710,6 +787,8 @@ sub process_msg { if ((!$k) && $$lines[$x] !~ /^\s*$/o && ((!$mua) || ($mua eq 'mutt' && + # 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] !~ @@ -845,14 +924,14 @@ sub process_msg { # Care for trailing whitespaces: if ($trsp) { for ($x=0; $x=0; $x--) { - if ((!$vrb[$x]) && $$lines[$x] =~ /^\s*$/) { + if ((!$vrb[$x]) && + (($mua eq 'mutt' && $$lines[$x] =~ /^\e[^\a]+\a\s*$/o) || + $$lines[$x] =~ /^\s*$/o)) + { if ($t<2) { $t++; } else { splice(@$lines, $x, 1); } } else { $t = 0; } @@ -894,20 +976,22 @@ 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, $nohdr, $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); + $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); my $ifile = '-'; # use STDIN if nothing specified # 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 body 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'); + ' s t v w bigq:s body check:s debug>d diff ftr-ad ftr-ml groupwise'. + ' help>h kminl=i kmaxl=i kdiff=i lax-security locale=s max-lines=i'. + ' ms-smart mua>M pgp-short pgp-move pgp-move-vrf reply sani sigsmax:i'. + ' spass version>v'); while (my ($opt, $val, $pretty) = nextOption()) { if ($opt eq 'a') { $ad = 1; } elsif ($opt eq 'A') { $ads = $val; } @@ -921,11 +1005,12 @@ while (my ($opt, $val, $pretty) = nextOption()) { elsif ($opt eq 'c') { $cr = 1; } elsif ($opt eq 'check') { $check = 1; - while ($val && $val =~ s/^([^,\s]+)(?:,(\S+))?$/$2/) { + while ($val && $val =~ /^([^,\s]+)(?:,(\S+))?$/) { my $foo = $1; + $val = $2; - if ($foo =~ /^ratio=(0?\.\d+)$/) { - $check_ratio = $1?$1:1; + if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) { + $check_ratio = $1?$1:0.75; } } } @@ -934,6 +1019,7 @@ while (my ($opt, $val, $pretty) = nextOption()) { 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 'groupwise') { $gw = 1; } elsif ($opt eq 'i') { $ifile = $val; } elsif ($opt eq 'k') { $kamm = 1; } elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; } @@ -944,6 +1030,7 @@ while (my ($opt, $val, $pretty) = nextOption()) { elsif ($opt eq 'lax-security') { $lax = 1; } elsif ($opt eq 'locale') { $locale = $val; } elsif ($opt eq 'm') { $ms = 1; } + elsif ($opt eq 'max-lines') { $maxlines = $val; } elsif ($opt eq 'ms-smart') { $ms_smart = 1; $ms = 1; } elsif ($opt eq 'M') { $mua = lc($val); @@ -960,8 +1047,10 @@ while (my ($opt, $val, $pretty) = nextOption()) { elsif ($opt eq 'pgp-move') { $pgpmove = 1; } elsif ($opt eq 'pgp-move-vrf') { $pgpmovevrf = 1; } elsif ($opt eq 'r') { $hdrs = 1; } + elsif ($opt eq 'reply') { $reply = 1; } elsif ($opt eq 'S') { $lsig = $val ? $val : $maxsig; } elsif ($opt eq 's') { $sig = 1; } + elsif ($opt eq 'sani') { $sani = 1; } elsif ($opt eq 'sigsmax') { $sign = $val ? $val : undef; } elsif ($opt eq 'spass') { $spass = 1; } elsif ($opt eq 't') { $trad = 1; } @@ -970,11 +1059,12 @@ while (my ($opt, $val, $pretty) = nextOption()) { else { help(); } } Getopt::Mixed::cleanup(); -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 - ($ifile eq '')|| # no empty -i - ($ofile eq '')) # no empty -o +if (($ml && $footers eq '')|| # no -l without -L + ($ad && $ads eq '')|| # no -a without -A + ($nohdr && $pgpshort)|| # --body and --pgp-short are oil and water + (($nohdr||$hdrs) && ($sani||$reply))|| # no sanitazing without headers :) + ($ifile eq '')|| # no empty -i + ($ofile eq '')) # no empty -o { help(); } @@ -1040,16 +1130,34 @@ if ($mua eq 'mutt') { } } -else { - if ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); } -} +elsif ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { 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 ($ofile ne 'NONE') { + 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);