X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fprocess;h=0dbb3b2777de6f21888cc93e1d1a12876f02e7d3;hb=ada2d48936ad4eebf5d62b8723993f14008751b5;hp=197ae8d4cfe54e2534742dbfca0896bfc806140c;hpb=46fa42780ecb746d7bec2fb01190b05584b9283e;p=debbugs.git
diff --git a/scripts/process b/scripts/process
index 197ae8d..0dbb3b2 100755
--- a/scripts/process
+++ b/scripts/process
@@ -13,21 +13,22 @@ use IO::File;
use MIME::Parser;
use Debbugs::MIME qw(decode_rfc1522 create_mime_message getmailbody);
-use Debbugs::Mail qw(send_mail_message encode_headers);
-use Debbugs::Packages qw(getpkgsrc);
+use Debbugs::Mail qw(send_mail_message encode_headers get_addresses);
+use Debbugs::Packages qw(getpkgsrc binary_to_source);
use Debbugs::User qw(read_usertags write_usertags);
-use Debbugs::Common qw(:lock get_hashname);
-use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge lockreadbug);
+use Debbugs::Common qw(:lock get_hashname package_maintainer);
+use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge lockreadbug read_bug splitpackages :versions);
use Debbugs::CGI qw(html_escape bug_url);
-use Debbugs::Log qw(:misc);
+use Debbugs::Log qw(:misc :write);
use Debbugs::Text qw(:templates);
-use Debbugs::Status qw(:versions);
use Debbugs::Config qw(:globals :config);
+use Debbugs::Control qw(append_action_to_log);
+
chdir( "$gSpoolDir" ) || die "chdir spool: $!\n";
#open(DEBUG,"> /tmp/debbugs.debug");
@@ -128,6 +129,7 @@ if ($entity and $entity->head->tags) {
my %header;
+my @common_headers;
for my $hdr (@headerlines) {
$hdr = decode_rfc1522($hdr);
$_ = $hdr;
@@ -139,6 +141,9 @@ for my $hdr (@headerlines) {
# print DEBUG ">$_<\n";
if (s/^(\S+):\s*//) {
my $v = lc $1;
+ if ($v eq 'x-loop') {
+ push @common_headers, 'X-Loop',$_;
+ }
print DEBUG ">$v=$_<\n";
$header{$v} = $_;
} else {
@@ -147,6 +152,8 @@ for my $hdr (@headerlines) {
}
$header{'message-id'} = '' if not defined $header{'message-id'};
+push @common_headers, 'X-Loop',$gMaintainerEmail;
+
# remove blank lines
shift @bodylines while @bodylines and $bodylines[0] !~ /\S/;
@@ -168,6 +175,9 @@ my %pheader;
# extract pseudo-headers
for my $phline (@bodylines)
{
+ # Remove BOM markers from UTF-8 strings
+ # Fixes #488554
+ $phline =~ s/\xef\xbb\xbf//g;
last if $phline !~ m/^([\w-]+):\s*(\S.*)/;
my ($fn, $fv) = ($1, $2);
$fv =~ s/\s*$//;
@@ -220,10 +230,9 @@ if ($tryref >= 0)
{
my $bfound;
($bfound, $data)= &lockreadbugmerge($tryref);
- if ($bfound) {
+ if ($bfound and not $data->{archived}) {
$ref= $tryref;
} else {
- &htmllog("Reply","sent", $replyto,"Unknown problem report number $tryref.");
&sendmessage(create_mime_message(
[From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
@@ -233,7 +242,8 @@ if ($tryref >= 0)
References => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
Precedence => 'bulk',
"X-$gProject-PR-Message" => 'error',
- ],message_body_template('process_unknown_bug_number',
+ @common_headers,
+ ],message_body_template('mail/process_unknown_bug_number',
{subject => $subject,
date => $header{date},
baddress => $baddress,
@@ -255,8 +265,7 @@ if (defined $pheader{source}) {
$source_package = $pheader{source};
}
elsif (defined $data->{package} or defined $pheader{package}) {
- my $pkg_src = getpkgsrc();
- $source_package = $pkg_src->{defined $data->{package}?$data->{package}:$pheader{package}};
+ $source_package = binary_to_source(binary => $data->{package} // $pheader{package});
}
$source_pr_header = "X-$gProject-PR-Source: $source_package\n"
if defined $source_package and length $source_package;
@@ -291,7 +300,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
push @generalcc, "$gForwardList\@$gListDomain";
$generalcc= "$gForwardList\@$gListDomain";
} else {
- $generalcc='';
+ $generalcc='';
}
} else { # Done
if (defined $data->{done} and length($data->{done}) and
@@ -315,7 +324,6 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
push @generalcc,"$gStrongList\@$gListDomain";
}
if ($ref<0) {
- &htmllog("Warning","sent",$replyto,"Message ignored.");
&sendmessage(create_mime_message(
[From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
@@ -325,6 +333,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
References => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
Precedence => 'bulk',
"X-$gProject-PR-Message" => 'error',
+ @common_headers,
],message_body_template('mail/process_no_bug_number',
{subject => $subject,
date => $header{date},
@@ -395,7 +404,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
if ($codeletter eq 'F') {
&htmllog("Reply","sent",$replyto,"You have marked $gBug as forwarded.");
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => "$replyto",
Subject => "$gBug#$ref: marked as forwarded ($data->{subject})",
@@ -418,7 +427,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
} else {
&htmllog("Reply","sent",$replyto,"You have taken responsibility.");
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
Subject => "$gBug#$ref: marked as done ($data->{subject})",
@@ -442,13 +451,13 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
&htmllog("Notification","sent",$data->{originator},
"$gBug acknowledged by developer.");
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => "$data->{originator}",
Subject => "$gBug#$ref closed by $markedby ($header{'subject'})",
"Message-ID" => "",
- "In-Reply-To" => "$data->{msgid}",
- References => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
+ (defined $data->{msgid})?("In-Reply-To" => $data->{msgid}):(),
+ References => join(' ',grep {defined $_} ($header{'message-id'},$data->{msgid})),
"X-$gProject-PR-Message" => "they-closed $ref",
"X-$gProject-PR-Package" => "$data->{package}",
"X-$gProject-PR-Keywords" => "$data->{keywords}",
@@ -472,9 +481,9 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
if ($ref<0) { # new bug report
if ($codeletter eq 'U') { # -submitter
- &htmllog("Warning","sent",$replyto,"Message not forwarded.");
&sendmessage(create_mime_message(
- [From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ [@common_headers,
+ From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
Subject => "Message with no $gBug number cannot be sent to submitter! ($subject)",
'Message-ID' => "",
@@ -498,18 +507,21 @@ if ($ref<0) { # new bug report
$data->{fixed_versions} = [];
if (defined $pheader{source}) {
- $data->{package} = $pheader{source};
+ # source packages are identified by the src: prefix
+ $data->{package} = 'src:'.$pheader{source};
} elsif (defined $pheader{package}) {
$data->{package} = $pheader{package};
+ if ($data->{package} =~ /^src:(.+)/) {
+ $pheader{source} = $1;
+ }
} elsif (defined $config{default_package}) {
$data->{package} = $config{default_package},
}
else {
- &htmllog("Warning","sent",$replyto,"Message not forwarded.");
my $body = message_body_template('mail/process_no_package',
);
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
Subject => "Message with no Package: tag cannot be processed! ($subject)",
@@ -577,7 +589,7 @@ if ($ref<0) { # new bug report
$data->{owner}= $pheader{owner};
}
if (defined($pheader{forwarded})) {
- $data->{'forwarded-to'} = $pheader{forwarded};
+ $data->{forwarded} = $pheader{forwarded};
}
&filelock("nextnumber.lock");
open(N,"nextnumber") || die "nextnumber: read: $!";
@@ -633,7 +645,7 @@ my $newsubject= $subject; $newsubject =~ s/^$gBug#$ref:*\s*//;
my $xcchdr= $header{ 'x-debbugs-cc' } || '';
if ($xcchdr =~ m/\S/) {
- push(@resentccs,$xcchdr);
+ push(@resentccs,get_addresses($xcchdr));
$resentccexplain.= fill_template('mail/xdebbugscc',
{xcchdr => $xcchdr},
);
@@ -709,13 +721,20 @@ if (length($resentccval)) {
$resentcc= "Resent-CC: $resentccval\n";
}
+my $common_headers='';
+{
+ my @tmp = @common_headers;
+ while (my ($key,$value) = splice(@tmp, 0,2)) {
+ $common_headers .= qq($key: $value\n);
+ }
+}
if ($codeletter eq 'U') { # sent to -submitter
&htmllog("Message", "sent on", $data->{originator}, "$gBug#$ref.");
&sendmessage(<{originator},@resentccs],[@bccs]);
Subject: $gBug#$ref: $newsubject
Reply-To: $replyto, $ref-quiet\@$gEmailDomain
${orgsender}Resent-To: $data->{originator}
-${resentcc}Resent-Date: $tdate
+${resentcc}${common_headers}Resent-Date: $tdate
Resent-Message-ID:
Resent-Sender: $gMaintainerEmail
X-$gProject-PR-Message: report $ref
@@ -735,7 +754,7 @@ Subject: $gBug#$ref: $newsubject
Reply-To: $replyto, $ref\@$gEmailDomain
Resent-From: $header{'from'}
${orgsender}Resent-To: $gSubmitList\@$gListDomain
-${resentcc}Resent-Date: $tdate
+${resentcc}${common_headers}Resent-Date: $tdate
Resent-Message-ID:
Resent-Sender: $gMaintainerEmail
X-$gProject-PR-Message: $report_followup $ref
@@ -769,7 +788,7 @@ ${orgsender}Resent-To: $resentccval
Resent-Date: $tdate
Resent-Message-ID:
Resent-Sender: $gMaintainerEmail
-X-$gProject-PR-Message: $report_followup $ref
+${common_headers}X-$gProject-PR-Message: $report_followup $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
${source_pr_header}$fwd
@@ -862,7 +881,7 @@ if (not exists $header{'x-debbugs-no-ack'} and
}
);
&sendmessage(create_mime_message(
- ["X-Loop" => "$gMaintainerEmail",
+ [@common_headers,
From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
To => $replyto,
Subject => $t_h{subject},
@@ -916,16 +935,14 @@ die "wot no exit";
sub htmllog {
my ($whatobj,$whatverb,$where,$desc) = @_;
- my $hash = get_hashname($ref);
- open(AP,">>db-h/$hash/$ref.log") || die "opening db-h/$hash/$ref.log (lh): $!";
- print(AP
- "\6\n".
- "$whatobj $whatverb".
- ($where eq '' ? "" : " to ".html_escape($where)."").
- ":
\n". $desc.
- "\n\3\n") || die "writing db-h/$hash/$ref.log (lh): $!";
- close(AP) || die "closing db-h/$hash/$ref.log (lh): $!";
-}
+ append_action_to_log(bug => $ref,
+ action => "$whatobj $whatverb",
+ requester => '',
+ request_addr => $where,
+ desc => $desc,
+ get_lock => 0,
+ );
+}
sub stripbccs {
my $msg = shift;
@@ -982,12 +999,14 @@ sub sendmessage {
my $hash = get_hashname($ref);
#save email to the log
- open(AP,">>db-h/$hash/$ref.log") || die "opening db-h/$hash/$ref.log (lo): $!";
- print(AP "\2\n",join("\4",@$recips),"\n\5\n",
- escape_log(stripbccs($msg)),"\n\3\n") ||
- die "writing db-h/$hash/$ref.log (lo): $!";
- close(AP) || die "closing db-h/$hash/$ref.log (lo): $!";
-
+ my $logfh = IO::File->new("db-h/${hash}/${ref}.log",'w') or
+ die "opening db-h/$hash/${ref}.log: $!";
+ write_log_records(logfh => $logfh,
+ records => {text => stripbccs($msg),
+ type => 'recips',
+ recips => [@{$recips}],
+ },
+ );
if (ref($bcc)) {
shift @$recips if $recips->[0] eq '-t';
push @$recips, @$bcc;
@@ -1050,57 +1069,38 @@ sub fill_template{
}
+# this shole routine is *bad*; will be changed to use
+# Debbugs::Recipients and stuff therin in short order.
sub checkmaintainers {
return if $maintainerschecked++;
return if !length($data->{package});
- my %maintainerof;
- open(MAINT,"$gMaintainerFile") || die die "maintainers open: $!";
- while () {
- m/^\n$/ && next;
- m/^\s*$/ && next;
- m/^(\S+)\s+(\S.*\S)\s*\n$/ || die "maintainers bogus \`$_'";
- $a= $1; $b= $2; $a =~ y/A-Z/a-z/;
- # use the package which is normalized to lower case; we do this because we lc the pseudo headers.
- $maintainerof{$a}= $2;
- }
- close(MAINT);
- open(MAINT,"$gMaintainerFileOverride") || die die "maintainers.override open: $!";
- while () {
- m/^\n$/ && next;
- m/^\s*$/ && next;
- m/^(\S+)\s+(\S.*\S)\s*\n$/ || die "maintainers.override bogus \`$_'";
- $a= $1; $b= $2; $a =~ y/A-Z/a-z/;
- # use the package which is normalized to lower case; we do this because we lc the pseudo headers.
- $maintainerof{$a}= $2;
- }
- close(MAINT);
- my %pkgsrc;
- open(SOURCES,"$gPackageSource") || die "pkgsrc open: $!";
- while () {
- next unless m/^(\S+)\s+\S+\s+(\S.*\S)\s*$/;
- ($a,$b)=($1,$2);
- $a =~ y/A-Z/a-z/;
- $pkgsrc{$a} = $b;
- }
- close(SOURCES);
+
my $anymaintfound=0; my $anymaintnotfound=0;
- for my $p (split(m/[ \t?,():]+/,$data->{package})) {
+ for my $p (splitpackages($data->{package})) {
$p =~ y/A-Z/a-z/;
- $p =~ /([a-z0-9.+-]+)/;
+ $p =~ /((?:src:)?[a-z0-9.+-]+)/;
$p = $1;
next unless defined $p;
if (defined $gSubscriptionDomain) {
- if (defined($pkgsrc{$p})) {
- push @addsrcaddrs, "$pkgsrc{$p}\@$gSubscriptionDomain";
+ my @source = binary_to_source(binary => $p,
+ source_only => 1,
+ );
+ if (@source) {
+ push @addsrcaddrs,
+ map {"$_\@$gSubscriptionDomain"} @source;
} else {
push @addsrcaddrs, "$p\@$gSubscriptionDomain";
}
}
- if (defined($maintainerof{$p})) {
- print DEBUG "maintainer add >$p|$maintainerof{$p}<\n";
- my $addmaint= $maintainerof{$p};
- push(@maintaddrs,$addmaint) unless
- $addmaint eq $replyto || grep($_ eq $addmaint, @maintaddrs);
+ # this is utter hackery until we switch to Debbugs::Recipients
+ my @maints = package_maintainer(binary => $p);
+ if (@maints) {
+ print DEBUG "maintainer add >$p|".join(',',@maints)."<\n";
+ my %temp;
+ @temp{@maintaddrs} = @maintaddrs;
+ push(@maintaddrs,
+ grep {$_ ne $replyto and
+ not exists $temp{$_}} @maints);
$anymaintfound++;
} else {
print DEBUG "maintainer none >$p<\n";
@@ -1132,9 +1132,18 @@ sub bug_list_forward{
my ($bug_fn) = @_;
# Read the bug information and package information for passing to
# the mailing list
+ my $bug_fh = IO::File->new("incoming/P$bug_fn",'r') or
+ die "Unable to open incoming/P$bug_fn $!";
+
+ if (not defined $config{bug_subscription_domain} or not
+ length $config{bug_subscription_domain}) {
+ unlink("incoming/P$bug_fn") or
+ die "unlinking incoming/P$bug_fn: $!";
+ exit 0;
+ }
+
my ($bug_number) = $bug_fn =~ /^L(\d+)\./;
- my ($bfound, $data)= lockreadbugmerge($bug_number);
- my $bug_fh = IO::File->new("incoming/P$bug_fn",'r') or die "Unable to open incoming/P$bug_fn $!";
+ my $data = read_bug(bug => $bug_number);
local $/ = undef;
my $bug_message = <$bug_fh>;
@@ -1159,10 +1168,10 @@ sub bug_list_forward{
# If we don't have a bug address, something has gone horribly wrong.
print STDERR "Doesn't match: $bug_address\n" and exit 1 unless defined $bug_address;
$bug_address =~ s/\@.+//;
- print DEBUG "Sending message to bugs=$bug_address\@$gListDomain\n";
+ print DEBUG "Sending message to bugs=$bug_address\@$config{bug_subscription_domain}\n";
print DEBUG $header.qq(\n\n).$body;
send_mail_message(message => $header.qq(\n\n).$body,
- recipients => ["bugs=$bug_address\@$gListDomain"],
+ recipients => ["bugs=$bug_address\@$config{bug_subscription_domain}"],
envelope_from => $envelope_from,
encode_headers => 0,
);