]> git.donarmstrong.com Git - debbugs.git/blobdiff - scripts/process
fix lack of unlocking in process before we start control
[debbugs.git] / scripts / process
index afe0b189b6dd3400b82fd78ed3b3ab0ff95f2b2b..5b7175f5d032c57c8e7de9e627f7564fa1130581 100755 (executable)
@@ -18,10 +18,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 +30,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
 
@@ -82,7 +84,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 +123,7 @@ if ($baddress eq 'list') {
     bug_list_forward($nn) if $codeletter eq 'L';
 }
 
+
 my $baddressroot= $baddress;
 $baddress= "$tryref-$baddress" if defined $tryref;
 
@@ -172,7 +175,7 @@ for my $hdr (@headerlines) {
     $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;
@@ -210,6 +213,7 @@ if (@bodylines and $bodylines[0] =~ /^-----BEGIN PGP SIGNED/) {
 
 #psuedoheaders
 my %pheader;
+my @control_bits;
 # extract pseudo-headers
 for my $phline (@bodylines)
 {
@@ -221,9 +225,13 @@ for my $phline (@bodylines)
     $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";
 }
 
@@ -267,12 +275,14 @@ $subject =~ s/^Re:\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 +302,8 @@ if (defined $tryref) {
                                   messageid => $header{'message-id'},
                                  },
                                 )),'');
-        &appendlog;
-        &finish;
+        appendlog($ref,$msg);
+        finish();
     }
 } else { 
     &filelock('lock/-1'); 
@@ -329,7 +339,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 +357,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 +393,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
                                   messageid => $header{'message-id'},
                                  },
                                 )),'');
-       &appendlog;
-       &finish;
+       appendlog($ref,$msg);
+       finish();
     }
 
     &checkmaintainers;
@@ -400,8 +410,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);
@@ -440,8 +452,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(
@@ -515,9 +531,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 +556,8 @@ if ($ref<0) { # new bug report
                                   messageid => $header{'message-id'},
                                  },
                                 )),'');
-       &appendlog;
-       &finish;
+       appendlog($ref,$msg);
+       finish();
     }
 
     $data->{found_versions} = [];
@@ -579,8 +595,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}) {
@@ -943,18 +959,138 @@ 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,
+                               );
+               if ($terminate_control) {
+                   last;
+               }
+           }
+           else {
+               $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 {
@@ -1089,6 +1225,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' =>