use warnings;
use strict;
-use POSIX qw(strftime);
+use POSIX qw(strftime locale_h);
+setlocale(LC_TIME, "C");
use IO::File;
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 buglog package_maintainer overwritefile);
+use Debbugs::Common qw(:lock get_hashname buglog package_maintainer overwritefile make_list);
use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge lockreadbug new_bug read_bug splitpackages :versions);
-use Debbugs::CGI qw(html_escape bug_url);
+use Debbugs::CGI qw(html_escape bug_links);
use Debbugs::Log qw(:misc :write);
use Debbugs::Config qw(:globals :config);
-use Debbugs::Control qw(append_action_to_log);
-use Encode qw(encode_utf8);
+use Debbugs::Control qw(append_action_to_log valid_usertag);
+use Debbugs::Control::Service qw(valid_control control_line);
+use Debbugs::Recipients qw(determine_recipients);
+use Encode qw(encode_utf8 decode);
+use List::AllUtils qw(first uniqnum);
=head1 NAME
if ($DEBUG > 0) {
$debugfh = \*STDERR;
}
+binmode($debugfh,':raw:encoding(UTF-8)');
# these are the valid bug addresses
my %baddress = (B => 'submit',
Q => 'quiet',
F => 'forwarded',
D => 'done',
- S => 'submitter',
+ U => 'submitter',
L => 'list',
);
my $valid_codeletters = join('',keys %baddress);
bug_list_forward($nn) if $codeletter eq 'L';
}
+
my $baddressroot= $baddress;
$baddress= "$tryref-$baddress" if defined $tryref;
my @common_headers;
for my $hdr (@headerlines) {
+ my $orig_hdr = $hdr;
$hdr = decode_rfc1522($hdr);
$_ = $hdr;
s/\n\s/ /g;
finish() if m/^x-loop: (\S+)$/i && $1 eq "$gMaintainerEmail";
- my $ins = !m/^subject:/i && !m/^reply-to:/i && !m/^return-path:/i
- && !m/^From / && !m/^X-Debbugs-/i;
- $fwd .= $hdr."\n" if $ins;
+ my $ins = !m/^(?:(?:subject|reply-to|return-path|
+ mail-followup-to|
+ references):
+ |From\s|X-Debbugs-)/xi;
+ $fwd .= $orig_hdr."\n" if $ins;
# print {$debugfh} ">$_<\n";
if (s/^(\S+):\s*//) {
my $v = lc $1;
push @common_headers, 'X-Loop',$_;
}
print {$debugfh} ">$v=$_<\n";
- $header{$v} = $_;
+ # Handle a comma which is escaped being passed through un-escaped. See
+ # https://bugs.debian.org/1041638
+ if ($_ =~ m/,/ and not $orig_hdr =~ m/,/) {
+ $header{$v} = handle_escaped_commas($_,$orig_hdr);
+ } else {
+ $header{$v} = $_;
+ }
} else {
print {$debugfh} "!>$_<\n";
}
#psuedoheaders
my %pheader;
+my @control_bits;
+my @usertag_bits;
# 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.*)/;
+ $phline =~ s/\N{U+FEFF}//g;
+ last if $phline !~ m/^([\w-]+): # psuedoheader
+ (?:\s|\N{U+00A0})* # zero or more spaces, including
+ # non-breaking space
+ (\S.*)/x; # pseudoheader value
my ($fn, $fv) = ($1, $2);
$fv =~ s/\s*$//;
- print {$debugfh} ">$fn|$fv|\n";
$fn = lc $fn;
- # Don't lc owner or forwarded
- $fv = lc $fv unless $fn =~ /^(?:owner|forwarded|usertags|version|source-version)$/;
- $pheader{$fn} = $fv;
+ # pluralize tag/usertag
+ $fn = $fn.'s' if $fn =~ /^(?:tag|usertag)$/;
+ print {$debugfh} ">$fn|$fv|\n";
+ if ($fn =~ /^control$/) {
+ push @control_bits,$fv;
+ } elsif ($fn =~ /^(?:user|usertags)$/) {
+ $fv = lc $fv;
+ push @usertag_bits, [$fn, $fv];
+ } else {
+ # Don't lc owner or forwarded
+ $fv = lc $fv unless $fn =~ /^(?:owner|forwarded|version|source-version|done)$/;
+ $pheader{$fn} = $fv;
+ }
print {$debugfh} ">$fn~$fv<\n";
}
# set $i to beginning of encoded body data, so we can dump it out
# verbatim later
my $i = 0;
-++$i while $msg[$i] =~ /./;
+++$i while $i <= $#msg and $msg[$i] =~ /./;
$fwd .= join("\n",@msg[$i..$#msg]);
+binmode($debugfh,':raw');
print {$debugfh} "***\n$fwd\n***\n";
+binmode($debugfh,':raw:encoding(UTF-8)');
if (defined $header{'resent-from'} && !defined $header{'from'}) {
$header{'from'} = $header{'resent-from'};
}
my $ref=-1;
-$subject =~ s/^Re:\s*//i; $_= $subject."\n";
+# remove Re: from the subject line
+$subject =~ s/^Re:\s*//i;
+# remove remaining mailing list name markers from the subject line if
+# this appears to be a message that has traversed a mailing list
+if (exists $header{'list-id'} or exists $header{'list-subscribe'} or
+ (exists $header{'precedence'} and defined $header{'precedence'} and
+ $header{'precedence'} eq 'bulk') or
+ exists $header{'mailing-list'} or exists $header{'list-processor-version'}
+ ){
+ # if a mailing list didn't match any of the above, it's probably
+ # so horribly configured that we wouldn't be able to figure it out
+ # anyway.
+ $subject =~ s/^\[.*\]\s*//i;
+}
+$_= $subject."\n";
if (not defined $tryref and m/^Bug ?\#(\d+)\D/i) {
$tryref = $1 if $1 > 0;
}
+my $locks = 0;
my $data;
if (defined $tryref) {
- my $bfound;
- ($bfound, $data)= &lockreadbugmerge($tryref);
- if ($bfound and not $data->{archived}) {
- $ref= $tryref;
+ my $locks_recv;
+ ($locks_recv, $data)= &lockreadbugmerge($tryref);
+ $locks += $locks_recv;
+ if ($locks_recv and not $data->{archived}) {
+ $ref= $tryref;
} else {
&sendmessage(create_mime_message(
- [From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ [From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
To => $replyto,
Subject => "Unknown problem report $gBug#$tryref ($subject)",
'Message-ID' => "<handler.x.$nn.unknown\@$gEmailDomain>",
}
$receivedat= "done\@$gEmailDomain";
$markaswhat= 'done';
- $set_done= $header{'from'};
+ $set_done= $pheader{'done'} // $header{'from'};
if ( length( $gListDomain ) > 0 && length( $gDoneList ) > 0 ) {
$generalcc= "$gDoneList\@$gListDomain";
push @generalcc, "$gDoneList\@$gListDomain";
}
if ($ref<0) {
&sendmessage(create_mime_message(
- [From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ [From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
To => $replyto,
Subject => "Message with no $gBug number ignored by $receivedat ($subject)",
'Message-ID' => "<handler.x.$nn.warnignore\@$gEmailDomain>",
for $ref (@process) {
if ($ref != $orgref) {
&unfilelock;
+ $locks--;
$data = &lockreadbug($ref)
|| die "huh ? $ref from $orgref out of ".join(' ',@process);
+ $locks++;
}
$data->{done}= $set_done if defined($set_done);
$data->{forwarded}= $set_forwarded if defined($set_forwarded);
# Add bug mailing list to $generalbcc as appropriate
# This array is used to specify bcc in the cases where we're using create_mime_message.
- my @generalbcc = (@generalcc,@addsrcaddrs,"bugs=$ref\@$gListDomain");
- my $generalbcc = join(', ', $generalcc, @addsrcaddrs,"bugs=$ref\@$gListDomain");
+ my @generalbcc = @generalcc;
+ if (defined $config{subscription_domain} and length $config{subscription_domain}) {
+ @generalbcc = (@generalbcc, @addsrcaddrs);
+ }
+ if (defined $config{bug_subscription_domain} and length $config{bug_subscription_domain}) {
+ @generalbcc = (@generalbcc, "bugs=$ref\@$config{bug_subscription_domain}");
+ }
+ my $generalbcc = join(', ', @generalbcc);
$generalbcc =~ s/\s+\n\s+/ /g;
$generalbcc =~ s/^\s+/ /; $generalbcc =~ s/\s+$//;
if (length $generalbcc) {$generalbcc = "Bcc: $generalbcc\n"};
writebug($ref, $data);
my $hash = get_hashname($ref);
- open(O,"db-h/$hash/$ref.report") || die "read original report: $!";
- my $orig_report= join('',<O>); close(O);
+ my $orig_report_fh = IO::File->new("db-h/$hash/$ref.report") or
+ die "Unable to read original report: $!";
+ my $orig_report;
+ { local $/; $orig_report = <$orig_report_fh>;}
+ close($orig_report_fh) or
+ die "Unable to close original report filehandle: $!";
if ($codeletter eq 'F') {
&htmllog("Reply","sent",$replyto,"You have marked $gBug as forwarded.");
&sendmessage(create_mime_message(
[@common_headers,
- From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
To => "$replyto",
Subject => "$gBug#$ref: marked as forwarded ($data->{subject})",
"Message-ID" => "<header.$ref.$nn.ackfwdd\@$gEmailDomain>",
"X-$gProject-PR-Keywords" => $data->{keywords},
# Only have a X-$gProject-PR-Source when we know the source package
(defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
+ "Reply-To" => "$ref\@$gEmailDomain",
+ "Content-Type" => 'text/plain; charset="utf-8"',
],message_body_template('mail/process_mark_as_forwarded',
{date => $header{date},
messageid => $header{'message-id'},
&htmllog("Reply","sent",$replyto,"You have taken responsibility.");
&sendmessage(create_mime_message(
[@common_headers,
- From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
To => $replyto,
Subject => "$gBug#$ref: marked as done ($data->{subject})",
"Message-ID" => "<handler.$ref.$nn.ackdone\@$gEmailDomain>",
"X-$gProject-PR-Keywords" => $data->{keywords},
# Only have a X-$gProject-PR-Source when we know the source package
(defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
+ "Reply-To" => "$ref\@$gEmailDomain",
+ "Content-Type" => 'text/plain; charset="utf-8"',
],message_body_template('mail/process_mark_as_done',
{date => $header{date},
messageid => $header{'message-id'},
"$gBug acknowledged by developer.");
&sendmessage(create_mime_message(
[@common_headers,
- From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
To => "$data->{originator}",
Subject => "$gBug#$ref closed by $markedby ($header{'subject'})",
"Message-ID" => "<handler.$ref.$nn.notifdone\@$gEmailDomain>",
(defined $data->{msgid})?("In-Reply-To" => $data->{msgid}):(),
- References => join(' ',grep {defined $_} ($header{'message-id'},$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}",
+ (defined $data->{package})?("X-$gProject-PR-Package" => $data->{package}):(),
+ (defined $data->{keywords})?("X-$gProject-PR-Keywords" => $data->{keywords}):(),
# Only have a X-$gProject-PR-Source when we know the source package
(defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
"Reply-To" => "$ref\@$gEmailDomain",
if ($codeletter eq 'U') { # -submitter
&sendmessage(create_mime_message(
[@common_headers,
- From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
To => $replyto,
Subject => "Message with no $gBug number cannot be sent to submitter! ($subject)",
'Message-ID' => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
if (defined $pheader{source}) {
# source packages are identified by the src: prefix
- $data->{package} = 'src:'.$pheader{source};
+ $data->{package} = $pheader{source};
+ $data->{package} =~ s/(^|,\s*)/${1}src:/g;
} elsif (defined $pheader{package}) {
$data->{package} = $pheader{package};
if ($data->{package} =~ /^src:(.+)/) {
);
&sendmessage(create_mime_message(
[@common_headers,
- From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
To => $replyto,
Subject => "Message with no Package: tag cannot be processed! ($subject)",
"Message-ID" => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
$data->{msgid} = $header{'message-id'};
writebug($ref, $data);
# Deal with usertags
- if (exists $pheader{usertags}) {
- my $user = $replyto;
- $user = $pheader{user} if exists $pheader{user};
- $user =~ s/,.*//;
- $user =~ s/^.*<(.*)>.*$/$1/;
- $user =~ s/[(].*[)]//;
- $user =~ s/^\s*(\S+)\s+.*$/$1/;
- if ($user ne '' and Debbugs::User::is_valid_user($user)) {
- $pheader{usertags} =~ s/(?:^\s+|\s+$)//g;
- my %user_tags;
- read_usertags(\%user_tags,$user);
- for my $tag (split /[,\s]+/, $pheader{usertags}) {
- if ($tag =~ /^[a-zA-Z0-9.+\@-]+/) {
- my %bugs_with_tag;
- @bugs_with_tag{@{$user_tags{$tag}||[]}} = (1) x @{$user_tags{$tag}||[]};
- $bugs_with_tag{$ref} = 1;
- $user_tags{$tag} = [keys %bugs_with_tag];
- }
- }
- write_usertags(\%user_tags,$user);
- }
- else {
- $brokenness .= fill_template('mail/invalid_user',
- {user => $user}
- );
- }
+ my $current_user;
+ unshift @usertag_bits, ['user', $replyto];
+ for my $field (@usertag_bits) {
+ my ($name, $value) = @$field;
+ if ($name eq 'user') {
+ my $user = $value;
+ $user =~ s/,.*//;
+ $user =~ s/^.*<(.*)>.*$/$1/;
+ $user =~ s/[(].*[)]//;
+ $user =~ s/^\s*(\S+)\s+.*$/$1/;
+ if ($user ne '' and Debbugs::User::is_valid_user($user)) {
+ $current_user = $user;
+ } else {
+ $brokenness .= fill_template('mail/invalid_user',
+ {user => $user}
+ );
+ }
+ }
+ if ($name eq 'usertags' and defined $current_user){
+ my %user_tags;
+ read_usertags(\%user_tags, $current_user);
+ $value =~ s/(?:^\s+|\s+$)//g;
+ for my $tag (split /[,\s]+/, $value) {
+ if (valid_usertag($tag)) {
+ my %bugs_with_tag;
+ @bugs_with_tag{@{$user_tags{$tag}||[]}} = (1) x @{$user_tags{$tag}||[]};
+ $bugs_with_tag{$ref} = 1;
+ $user_tags{$tag} = [keys %bugs_with_tag];
+ }
+ }
+ write_usertags(\%user_tags,$current_user);
+ }
}
overwritefile("db-h/$hash/$ref.report",
map {"$_\n"} @msg);
}
# Send mail to the per bug list subscription too
-push @bccs, "bugs=$ref\@$gListDomain";
+if (defined $config{bug_subscription_domain} and length $config{bug_subscription_domain}) {
+ push @bccs, "bugs=$ref\@$config{bug_subscription_domain}";
+}
if (defined $pheader{source}) {
# Prefix source versions with the name of the source package. They
$resentcc= "Resent-CC: $resentccval\n";
}
+my $referencesval = join(' ',grep {defined $_} $header{'references'},$data->{msgid});
+my $references = '';
+if (!$newref && length($referencesval)) {
+ $references = "References: $referencesval\n";
+}
+
my $common_headers='';
{
my @tmp = @common_headers;
X-$gProject-PR-Message: report $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
END
chomp $enc_msg;
$enc_msg = encode_utf8($enc_msg).$fwd."\n";
X-$gProject-PR-Message: $report_followup $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
END
chomp $enc_msg;
$enc_msg = encode_utf8($enc_msg).$fwd."\n";
${common_headers}X-$gProject-PR-Message: $report_followup $ref
X-$gProject-PR-Package: $data->{package}
X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
END
chomp $enc_msg;
$enc_msg = encode_utf8($enc_msg).$fwd."\n";
);
&sendmessage(create_mime_message(
[@common_headers,
- From => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+ From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
To => $replyto,
Subject => $t_h{subject},
"Message-ID" => $t_h{messageid},
}
appendlog($ref,$msg);
+# unlock the locks we have received
+while ($locks--) {unfilelock();}
+
+## handle control messages at this point, immediately before finishing
+my %clonebugs = (-1 => $ref);
+my %bug_affected;
+if (@control_bits) {
+ my $transcript_scalar = '';
+ open my $transcript, ">:scalar:utf8", \$transcript_scalar or
+ die "Unable to create transcript scalar: $!";
+ print {$transcript} "Processing control commands:\n\n";
+ my %affected_packages;
+ my %recipients;
+ # this is the hashref which is passed to all control calls
+ my %limit = ();
+ my $errors = 0;
+ my $unknowns = 0;
+
+ my @common_control_options =
+ (transcript => $transcript,
+ requester => $header{from},
+ request_addr => $baddress.'@'.$config{email_domain},
+ request_msgid => $header{'message-id'},
+ request_subject => $header{subject},
+ request_nn => $nn,
+ request_replyto => $replyto,
+ message => [$msg],
+ affected_bugs => \%bug_affected,
+ affected_packages => \%affected_packages,
+ recipients => \%recipients,
+ limit => \%limit,
+ );
+ if (@gExcludeFromControl and grep {$replyto =~ m/\Q$_\E/} @gExcludeFromControl) {
+ print {$transcript} fill_template('mail/excluded_from_control');
+ print {$transcript} "Stopping processing here.\n\n";
+ } else {
+ for my $control_bit (@control_bits) {
+ $control_bit =~ s/\xef\xbb\xbf//g;
+ next unless $control_bit =~ m/\S/;
+ eval {
+ my $temp = decode("utf8",$control_bit,Encode::FB_CROAK);
+ $control_bit = $temp;
+ };
+ print {$transcript} "> $control_bit\n";
+ next if $control_bit =~ /^\s*\#/;
+ my $action = '';
+ my $ok;
+ if (defined valid_control($control_bit)) {
+ my ($new_errors,$terminate_control) =
+ control_line(line => $control_bit,
+ clonebugs => \%clonebugs,
+ limit => \%limit,
+ common_control_options => \@common_control_options,
+ errors => \$errors,
+ transcript => $transcript,
+ debug => 0,
+ ok => \$ok,
+ replyto => $replyto,
+ );
+ if ($terminate_control) {
+ last;
+ }
+ }
+ else {
+ print {$transcript} "Unknown command or malformed arguments to command.\n\n";
+ $errors++;
+ if (++$unknowns >= 5) {
+ print {$transcript} "Too many unknown commands, stopping here.\n\n";
+ last;
+ }
+ }
+ }
+ }
+ my $temp_transcript = $transcript_scalar;
+ eval{
+ $temp_transcript = decode("utf8",$temp_transcript,Encode::FB_CROAK);
+ };
+ my @maintccs = determine_recipients(recipients => \%recipients,
+ address_only => 1,
+ cc => 1,
+ );
+ my $error_text = $errors > 0 ? " (with $errors error" . ($errors > 1 ? "s" : "") . ")" : "";
+ my $reply =
+ create_mime_message(['X-Loop' => $gMaintainerEmail,
+ From => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
+ To => $replyto,
+ @maintccs ? (Cc => join(', ',@maintccs)):(),
+ Subject => "Processed${error_text}: $header{subject}",
+ 'Message-ID' => "<handler.s.$nn.transcript\@$gEmailDomain>",
+ 'In-Reply-To' => $header{'message-id'},
+ References => join(' ',grep {defined $_} $header{'message-id'},$data->{msgid}),
+ Precedence => 'bulk',
+ keys %affected_packages ?("X-${gProject}-PR-Package" => join(' ',keys %affected_packages)):(),
+ keys %affected_packages ?("X-${gProject}-PR-Source" =>
+ join(' ',
+ map {defined $_ ?(ref($_)?@{$_}:$_):()}
+ binary_to_source(binary => [keys %affected_packages],
+ source_only => 1))):(),
+ "X-$gProject-PR-Message" => 'transcript',
+ @common_headers,
+ ],
+ fill_template('mail/message_body',
+ {body => $temp_transcript},
+ ));
+
+ utime(time,time,"db-h");
+
+ send_mail_message(message => $reply,
+ recipients => [exists $header{'x-debbugs-no-ack'}?():$replyto,
+ make_list(values %{{determine_recipients(recipients => \%recipients,
+ address_only => 1,
+ )}}
+ ),
+ ]
+ );
+
+}
+
+
finish();
sub appendlog {
write_log_records(logfh => $logfh,
records => {text => stripbccs($msg),
type => 'recips',
- recips => [@{$recips}],
+ recips => [map {encode_utf8($_)} @{$recips}],
},
);
if (ref($bcc)) {
my $variables = {config => \%config,
defined($ref)?(ref => $ref):(),
defined($data)?(data => $data):(),
+ refs => [sort
+ uniqnum(defined($ref)?($ref):(),
+ map {exists $clonebugs{$_}?$clonebugs{$_}:$_}
+ keys %bug_affected)],
%{$extra_var},
};
- my $hole_var = {'&bugurl' =>
- sub{"$_[0]: ".
- 'http://'.$config{cgi_domain}.'/'.
- Debbugs::CGI::bug_links(bug=>$_[0],
- links_only => 1,
- );
- }
- };
return fill_in_template(template => $template,
variables => $variables,
- hole_var => $hole_var,
+ output_type => 'text',
);
}
$p =~ /((?:src:)?[a-z0-9.+-]+)/;
$p = $1;
next unless defined $p;
- if (defined $gSubscriptionDomain) {
+ if (defined $config{subscription_domain} and length $config{subscription_domain}) {
my @source = binary_to_source(binary => $p,
source_only => 1,
);
if (@source) {
push @addsrcaddrs,
- map {"$_\@$gSubscriptionDomain"} @source;
+ map {"$_\@$config{subscription_domain}"} @source;
} else {
- push @addsrcaddrs, "$p\@$gSubscriptionDomain";
+ push @addsrcaddrs, "$p\@$config{subscription_domain}";
}
}
# this is utter hackery until we switch to Debbugs::Recipients
projects / debbugs.git / blobdiff