X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fprocess;h=516bd314505089aee2e1ae84360714dbdd746efb;hb=4a71b4c56f1bb4bfc9fb3fc7915511ea4a557800;hp=afe0b189b6dd3400b82fd78ed3b3ab0ff95f2b2b;hpb=969cae121449f73db709ed09894c7ca985833a21;p=debbugs.git

diff --git a/scripts/process b/scripts/process
index afe0b18..516bd31 100755
--- a/scripts/process
+++ b/scripts/process
@@ -7,7 +7,9 @@
 use warnings;
 use strict;
 
-use POSIX qw(strftime);
+use locale;
+use POSIX qw(strftime locale_h);
+setlocale(LC_TIME, "C");
 
 use IO::File;
 
@@ -18,10 +20,10 @@ use Debbugs::MIME qw(decode_rfc1522 create_mime_message getmailbody);
 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 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);
 
@@ -30,7 +32,9 @@ use Debbugs::Text qw(:templates);
 use Debbugs::Config qw(:globals :config);
 
 use Debbugs::Control qw(append_action_to_log);
-use Encode qw(encode_utf8);
+use Debbugs::Control::Service qw(valid_control control_line);
+use Debbugs::Recipients qw(determine_recipients);
+use Encode qw(encode_utf8 decode);
 
 =head1 NAME
 
@@ -75,6 +79,7 @@ my $debugfh = IO::File->new('/dev/null','w') or
 if ($DEBUG > 0) {
     $debugfh = \*STDERR;
 }
+binmode($debugfh,':raw:encoding(UTF-8)');
 
 # these are the valid bug addresses
 my %baddress = (B => 'submit',
@@ -82,7 +87,7 @@ my %baddress = (B => 'submit',
 	        Q => 'quiet',
 		F => 'forwarded',
 		D => 'done',
-		S => 'submitter',
+		U => 'submitter',
 		L => 'list',
 	       );
 my $valid_codeletters = join('',keys %baddress);
@@ -121,6 +126,7 @@ if ($baddress eq 'list') {
     bug_list_forward($nn) if $codeletter eq 'L';
 }
 
+
 my $baddressroot= $baddress;
 $baddress= "$tryref-$baddress" if defined $tryref;
 
@@ -169,13 +175,14 @@ my %header;
 
 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";
+    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;
+    $fwd .= encode_utf8($hdr)."\n" if $ins;
     # print {$debugfh} ">$_<\n";
     if (s/^(\S+):\s*//) {
 	my $v = lc $1;
@@ -210,20 +217,26 @@ if (@bodylines and $bodylines[0] =~ /^-----BEGIN PGP SIGNED/) {
 
 #psuedoheaders
 my %pheader;
+my @control_bits;
 # extract pseudo-headers
 for my $phline (@bodylines)
 {
     # Remove BOM markers from UTF-8 strings
     # Fixes #488554
     $phline =~ s/\xef\xbb\xbf//g;
+    $phline =~ s/\N{U+FEFF}//g;
     last if $phline !~ m/^([\w-]+):\s*(\S.*)/;
     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;
+    if ($fn =~ /^control$/) {
+	push @control_bits,$fv;
+    } else {
+	# Don't lc owner or forwarded
+	$fv = lc $fv unless $fn =~ /^(?:owner|forwarded|usertags|version|source-version)$/;
+	$pheader{$fn} = $fv;
+    }
     print {$debugfh} ">$fn~$fv<\n";
 }
 
@@ -238,7 +251,9 @@ my $i = 0;
 ++$i while $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'};
@@ -263,16 +278,32 @@ if (!defined($header{'subject'}))
 }
 
 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)",
@@ -292,8 +323,8 @@ if (defined $tryref) {
 				   messageid => $header{'message-id'},
 				  },
 				 )),'');
-        &appendlog;
-        &finish;
+        appendlog($ref,$msg);
+        finish();
     }
 } else { 
     &filelock('lock/-1'); 
@@ -329,7 +360,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
     my $generalcc;
     my $set_done;
     if ($codeletter eq 'F') { # Forwarded
-        (&appendlog,&finish) if defined $data->{forwarded} and length($data->{forwarded});
+        (appendlog($ref,$msg),finish()) if defined $data->{forwarded} and length($data->{forwarded});
         $receivedat= "forwarded\@$gEmailDomain";
         $markaswhat= 'forwarded';
         $set_forwarded= $header{'to'};
@@ -347,8 +378,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
         if (defined $data->{done} and length($data->{done}) and
                 not defined $pheader{'source-version'} and
                 not defined $pheader{'version'}) {
-            &appendlog;
-            &finish;
+            appendlog($ref,$msg);
+            finish();
         }
         $receivedat= "done\@$gEmailDomain";
         $markaswhat= 'done';
@@ -383,8 +414,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
 				   messageid => $header{'message-id'},
 				  },
 				 )),'');
-	&appendlog;
-	&finish;
+	appendlog($ref,$msg);
+	finish();
     }
 
     &checkmaintainers;
@@ -400,8 +431,10 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
     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);
@@ -431,8 +464,14 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
 
 	# 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"};
@@ -440,8 +479,12 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
 	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(
@@ -498,10 +541,10 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
               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",
@@ -515,9 +558,9 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
 				    ),
 	     [join("\n",@msg),$orig_report]),'',undef,1);
         }
-	&appendlog;
+	appendlog($ref,$msg);
     }
-    &finish;
+    finish();
 }
 
 if ($ref<0) { # new bug report
@@ -540,8 +583,8 @@ if ($ref<0) { # new bug report
 				   messageid => $header{'message-id'},
 				  },
 				 )),'');
-	&appendlog;
-	&finish;
+	appendlog($ref,$msg);
+	finish();
     }
 
     $data->{found_versions} = [];
@@ -579,8 +622,8 @@ if ($ref<0) { # new bug report
 				  baddress => $baddress,
 				 },
 				),[join("\n", @msg)]), '',undef,1);
-	&appendlog;
-	&finish;
+	appendlog($ref,$msg);
+	finish();
     }
 
     if (defined $config{default_package}) {
@@ -701,7 +744,9 @@ if (defined $gStrongList and isstrongseverity($data->{severity})) {
 }
 
 # 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
@@ -943,18 +988,140 @@ if (not exists $header{'x-debbugs-no-ack'} and
 		       ],$body,[]), '',undef,1);
 }
 
-&appendlog;
-&finish;
+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 errors)":'';
+    my $reply =
+	create_mime_message(['X-Loop'      => $gMaintainerEmail,
+			     From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+			     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 {
-    my $hash = get_hashname($ref);
-    if (!open(AP,">>db-h/$hash/$ref.log")) {
-        print {$debugfh} "failed open log<\n";
-        print {$debugfh} "failed open log err $!<\n";
-        die "opening db-h/$hash/$ref.log (li): $!";
-    }
-    print(AP "\7\n",escape_log($msg),"\n\3\n") || die "writing db-h/$hash/$ref.log (li): $!";
-    close(AP) || die "closing db-h/$hash/$ref.log (li): $!";
+    my ($ref,$msg) = @_;
+    my $log_location = buglog($ref);
+    die "Unable to find .log for $ref"
+	if not defined $log_location;
+    my $logfh = IO::File->new(">>$log_location") or
+	die "Unable to open $log_location for appending: $!";
+    write_log_records(logfh => $logfh,
+		      records => [{type => 'incoming-recv',
+				   text => $msg,
+				  }]);
+    close ($logfh) or die "Unable to close $log_location: $!";
 }
 
 sub finish {
@@ -1041,7 +1208,7 @@ sub sendmessage {
     write_log_records(logfh => $logfh,
 		      records => {text => stripbccs($msg),
 				  type => 'recips',
-				  recips => [@{$recips}],
+				  recips => [map {encode_utf8($_)} @{$recips}],
 				 },
 		     );
     if (ref($bcc)) {
@@ -1089,6 +1256,7 @@ sub fill_template{
      my $variables = {config => \%config,
 		      defined($ref)?(ref    => $ref):(),
 		      defined($data)?(data  => $data):(),
+		      refs => [map {exists $clonebugs{$_}?$clonebugs{$_}:$_} keys %bug_affected],
 		      %{$extra_var},
 		     };
      my $hole_var = {'&bugurl' =>
@@ -1118,15 +1286,15 @@ sub checkmaintainers {
 	$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