#!/usr/bin/perl -w
-# $Id: t-prot,v 1.222 2005/02/14 14:19:14 jochen Exp $
+# $Id: t-prot,v 1.236 2005/04/25 16:35:56 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 constant VER => '1.101';
use constant REV => '';
-use constant REL => q$Revision: 1.222 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL => q$Revision: 1.236 $=~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';
$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
+ $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $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
-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
+ --body input has no headers; does not work with --pgp-short;
+ multipart messages will not be detected
-c merge multiple blank lines
--check[=FLAGS] check various criteria, print error message and quit;
see man page for details
$sigint = 1;
}
-# esc(): escapes a scalar reference for use in perl regexp
-sub esc { ${$_[0]} =~ s/([\[\]\(\)\*\.\-\^\$\@])/\\$1/go; }
-
# remove_footers(): remove any trailing appearance of footers contained
# in the given directory.
sub remove_footers {
# 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),
($$L[$x+1] !~ /^$/) &&
($$L[$x+1] !~ /^[\s^]/) &&
($$L[$x] !~ /-$/) &&
+ ($$L[$x+1] !~ /^\Q[...]\E\s*$/) &&
($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e.+?\a)?\[-- .* --]/) &&
(length($$L[$x])+index($$L[$x+1], ' ')>$max ||
(index($$L[$x+1], ' ')<0 && length($$L[$x])+length($$L[$x+1])>$max)) &&
my $ok = 0;
while ($X<$Z) {
- if ($$L[$X] =~ /^gpg:\s(?:$gpg_WARNING|$gpg_Warning|$gpg_bad|$gpg_Cantcheck|$gpg_expired)/o)
+ if ($$L[$X] =~ /^gpg:\s(?:\Q$gpg_WARNING\E|\Q$gpg_Warning\E|\Q$gpg_bad\E|\Q$gpg_Cantcheck\E|\Q$gpg_expired\E)/o)
{ return 0; }
- if ($$L[$X] =~ /^gpg:\s$gpg_bug/o)
+ if ($$L[$X] =~ /^gpg:\s\Q$gpg_bug/o)
{ return 0; }
- if ($$L[$X] =~ /^gpg:\s$gpg_good/o)
+ if ($$L[$X] =~ /^gpg:\s\Q$gpg_good/o)
{ $ok = 1; }
$X++;
}
for (my $x=0; $x<scalar(@$L); $x++) {
if ($$V[$x]) { next; }
- if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o)
+ if ($$L[$x]=~/^(?:\e.+?\a)?(?:\Q$mutt_pgpoutstart\E)/o)
{
my $from;
for (my $m=0; $m<scalar(@$H); $m++) {
if ($$H[$m] =~ /^From:/) {
$from = $$H[$m];
$m++;
- while ($$H[$m] =~ /^\s/) { $from .= $$H[$m]; $m++; }
+ while (exists($$H[$m]) && $$H[$m] =~ /^\s/) { $from .= $$H[$m]; $m++; }
last;
}
}
($from) = $from=~m/([a-z\d][a-z_\d\+-\.]*\@(?:[a-z_\d\+-\.]+\.)+[a-z]{2,})/i;
- esc(\$from);
my $uid = 1;
for (my $i=$x+1; $i<scalar(@$L); $i++) {
- if ($pgpshort && $$L[$i] =~ /^gpg:\s$gpg_aka/o) { $uid++; }
+ if ($pgpshort && $$L[$i] =~ /^gpg:\s\Q$gpg_aka/o) { $uid++; }
if ($pgpshort && $uid>1 &&
- $$L[$i] =~ /^gpg:\s$gpg_aka/o && $$L[$i] !~ /$from/)
+ $$L[$i] =~ /^gpg:\s\Q$gpg_aka/o && $$L[$i] !~ /\Q$from/)
{
splice(@$L, $i, 1);
splice(@$V, $i, 1);
$i--;
}
- elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend)/o)
+ elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:\Q$mutt_pgpoutend\E)/o)
{
if ($pgpmove ||
($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
}
}
elsif ($tmp &&
- $$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpencrypted|$mutt_pgpclearsigned|$mutt_pgpsigned)/o)
+ $$L[$x]=~/^(?:\e.+?\a)?(?:\Q$mutt_pgpencrypted\E|\Q$mutt_pgpclearsigned\E|\Q$mutt_pgpsigned\E)/o)
{
splice(@$L, $x+1, 0, @{$tmp[$tmp]});
for (my $i=$x; $i<scalar(@{$tmp[$tmp]}); $i++) {
# First, 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);
+ # 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(@hdr); $x++) {
if ($hdr[$x] =~ /^Content-Type:\s+(.*)$/i) {
}
@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 {
}
}
- # 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.
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)?\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] !~ /^(?:\e.+?\a)?(?:\Q$mutt_contenttype\E)(?:text\/plain|application\/pgp)/io))) ||
+ ($$lines[$x] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpsigned\E|\Q$mutt_pgpclearsigned\E|\Q$mutt_pgpencrypted\E)/o))
{
# Strip attachments to prepare further processing
unshift(@att, @$lines[$x..$#$lines]);
# 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)?\Q$mutt_attachment\E\d+.* --\]/o &&
+ $att[$x+1] =~ /^(?:\e.+?\a)?(?:\Q$mutt_contenttype\E)message\/rfc822/o)
{
$x += 2;
while ($att[$x] !~ /^\s*$/) { $x++; }
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))
+ $$lines[$x] !~ /^(?:\e.+?\a)?(?:\Q$mutt_attachment\E)/o &&
+ $$lines[$x] !~ /^(?:\e.+?\a)?(?:\Q$mutt_contenttype\E)/o)) &&
+ ((!$spass) || $$lines[$x]!~/^\Q$spass_prefix/o))
{
if ($mua eq 'mutt' && (!$tmp) &&
- $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o) {
+ $$lines[$x] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpoutstart\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)?(?:\Q$mutt_beginsigned\E)/o ||
+ $$lines[$x] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpclearsigstart\E)/o)) {
$tmp = 0;
} elsif (!$tmp) {
$k = 1;
my $p = 0; # levels of pgp signed parts
for (my $i=$x+1; $i<scalar(@$lines); $i++) {
- if ($$lines[$i] =~ /^(?:\e.+?\a)?(?:$mutt_pgpclearsigstart)/o) {
+ if ($$lines[$i] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpclearsigstart\E)/o) {
$p++;
}
}
splice(@att, 0, $i);
unshift(@att, "\n");
goto CLEAN;
- } elsif ($att[$i] =~ /^(?:\e.+?\a)?(?:$mutt_pgpclearsigned)/o) {
+ } elsif ($att[$i] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpclearsigned\E)/o) {
splice(@att, 0, $i+1);
$p--;
goto STAIRS;
# 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,
+ $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, 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 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 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; }
$bigqx = $2?$2:10;
if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); }
}
+ elsif ($opt eq 'body') { $nohdr = 1; $hdrs = 1; }
elsif ($opt eq 'c') { $cr = 1; }
elsif ($opt eq 'check') {
$check = 1;
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
{ help(); }
m/^([^%]*)/o;
($gpg_aka) =
Locale::gettext::gettext((' 'x16).'aka "%s"') =~
- m/^(.*?)"/o;
+ m/^(.*?)["«%]/o;
($gpg_bad) =
Locale::gettext::gettext('BAD signature from "%s"') =~
- m/^(.*?)"/o;
+ m/^(.*?)["«%]/o;
($gpg_expired) =
Locale::gettext::gettext("Note: This key has expired!\n") =~
m/^(.*?)\n/mo;
($gpg_good) =
Locale::gettext::gettext('Good signature from "%s"') =~
- m/^(.*?)"/o;
+ m/^(.*?)["«%]/o;
($gpg_bug) =
Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
m/^([^%]*)/o;
}
}
- 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);
-
# Read message:
if (!open(IN, $ifile)) { print STDERR "Could not open $ifile: $!\n"; exit(EX_IOERR); }
projects / pkg / t-prot.git / blobdiff