X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fservice.in;h=0cfe4f0f50757abab382d52f2526e1b2c1a8cd25;hb=acf5b623e6379e7e8053cf9e795d8b4931f26c3b;hp=0f1d9ade85defba6dba6b14a6c16b1a265e94a59;hpb=5b07a00be15ac3ce34a2aea8bcf11de9be3c9cd0;p=debbugs.git diff --git a/scripts/service.in b/scripts/service.in index 0f1d9ad..0cfe4f0 100755 --- a/scripts/service.in +++ b/scripts/service.in @@ -1,17 +1,25 @@ #!/usr/bin/perl -# $Id: service.in,v 1.105 2005/07/24 17:31:18 cjwatson Exp $ +# $Id: service.in,v 1.118 2005/10/19 01:22:14 don Exp $ # # Usage: service .nn # Temps: incoming/P.nn use File::Copy; use MIME::Parser; -use Debbugs::MIME qw(decode_rfc1522); +use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522); +use Debbugs::Mail qw(send_mail_message); +use Debbugs::User; +use HTML::Entities qw(encode_entities); +use Debbugs::Versions::Dpkg; -$config_path = '/etc/debbugs'; -$lib_path = '/usr/lib/debbugs'; +use Debbugs::Config qw(:globals :config); +use Debbugs::CGI qw(html_escape); +use Debbugs::Control qw(:archive :log); +use Debbugs::Log qw(:misc); -require "$config_path/config"; +use Mail::RFC822::Address; + +$lib_path = $gLibPath; require "$lib_path/errorlib"; $ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'}; @@ -47,6 +55,9 @@ my $entity = eval { $parser->parse_data(join('',@log)) }; # header and decoded body respectively my (@headerlines, @bodylines); +# Bug numbers to send e-mail to, hash so that we don't send to the +# same bug twice. +my (%bug_affected); if ($entity and $entity->head->tags) { @headerlines = @{$entity->head->header}; @@ -72,12 +83,13 @@ if ($entity and $entity->head->tags) { } for (@headerlines) { + $_ = decode_rfc1522($_); s/\n\s/ /g; print ">$_<\n" if $debug; if (s/^(\S+):\s*//) { my $v = lc $1; print ">$v=$_<\n" if $debug; - $header{$v} = decode_rfc1522($_); + $header{$v} = $_; } else { print "!>$_<\n" if $debug; } @@ -115,6 +127,8 @@ if ( defined($header{'reply-to'}) && $header{'reply-to'} ne "" ) { $replyto = $header{'from'}; } +# This is an error counter which should be incremented every time there is an error. +my $errors = 0; $controlrequestaddr= $control ? "control\@$gEmailDomain" : "request\@$gEmailDomain"; $transcript=''; &transcript("Processing commands for $controlrequestaddr:\n\n"); @@ -126,11 +140,20 @@ $mergelowstate= 'idle'; $midix=0; $extras=""; +my $user = $replyto; +$user =~ s/,.*//; +$user =~ s/^.*<(.*)>.*$/$1/; +$user =~ s/[(].*[)]//; +$user =~ s/^\s*(\S+)\s+.*$/$1/; +$user = "" unless (Debbugs::User::is_valid_user($user)); +my $indicated_user = 0; + my $quickabort = 0; -my $fuckheads = "(" . join("|", @gFuckheads) . ")"; -if (@gFuckheads and $replyto =~ m/$fuckheads/) { - &transcript("This service is unavailable.\n\n"); +my $fuckheads = "(" . join("|", @gExcludeFromControl) . ")"; +if (@gExcludeFromControl and $replyto =~ m/$fuckheads/) { + &transcript("You have been specifically excluded from using the\ncontrol interface.\n\n"); + &transcript("Have a nice day\n\n."); $quickabort = 1; } @@ -155,7 +178,7 @@ for ($procline=0; $procline<=$#bodylines; $procline++) { &transcript("> $_\n"); next if m/^\s*\#/; $action= ''; - if (m/^stop/i || m/^quit/i || m/^--/ || m/^thank/i) { + if (m/^stop\s*$/i || m/^quit\s*$/i || m/^--\s*$/ || m/^thank(?:s|\s*you)?\s*$/i || m/^kthxbye\s*$/i) { &transcript("Stopping processing here.\n\n"); last; } elsif (m/^debug\s+(\d+)$/i && $1 >= 0 && $1 <= 1000) { @@ -170,12 +193,15 @@ for ($procline=0; $procline<=$#bodylines; $procline++) { "detailed logs for $gBug#$ref"); } elsif (m/^index(\s+full)?$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); + $errors++; $ok++; # well, it's not really ok, but it fixes #81224 :) } elsif (m/^index-summary\s+by-package$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); + $errors++; $ok++; # well, it's not really ok, but it fixes #81224 :) } elsif (m/^index-summary(\s+by-number)?$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); + $errors++; $ok++; # well, it's not really ok, but it fixes #81224 :) } elsif (m/^index(\s+|-)pack(age)?s?$/i) { &sendlynxdoc("pkgindex.cgi?indexon=pkg",'index of packages'); @@ -193,12 +219,15 @@ for ($procline=0; $procline<=$#bodylines; $procline++) { $ok++; } elsif (m/^send-unmatched(\s+this|\s+-?0)?$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); + $errors++; $ok++; # well, it's not really ok, but it fixes #81224 :) } elsif (m/^send-unmatched\s+(last|-1)$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); + $errors++; $ok++; # well, it's not really ok, but it fixes #81224 :) } elsif (m/^send-unmatched\s+(old|-2)$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); + $errors++; $ok++; # well, it's not really ok, but it fixes #81224 :) } elsif (m/^getinfo\s+([\w-.]+)$/i) { # the following is basically a Debian-specific kludge, but who cares @@ -231,20 +260,178 @@ END soon: UNSUBSCRIBE_TEXT soon: MAILINGLISTS_TEXT END + } elsif (m/^user\s+(\S+)\s*$/i) { + my $newuser = $1; + if (Debbugs::User::is_valid_user($newuser)) { + my $olduser = ($user ne "" ? " (was $user)" : ""); + &transcript("Setting user to $newuser$olduser.\n"); + $user = $newuser; + $indicated_user = 1; + } else { + &transcript("Selected user id ($newuser) invalid, sorry\n"); + $errors++; + $user = ""; + $indicated_user = 1; + } + } elsif (m/^usercategory\s+(\S+)(\s+\[hidden\])?\s*$/i) { + $ok++; + my $catname = $1; + my $hidden = ($2 ne ""); + + my $prefix = ""; + my @cats; + my $bad = 0; + my $catsec = 0; + if ($user eq "") { + &transcript("No valid user selected\n"); + $errors++; + next; + } + if (not $indicated_user and defined $user) { + &transcript("User is $user\n"); + $indicated_user = 1; + } + while (++$procline <= $#bodylines) { + unless ($bodylines[$procline] =~ m/^\s*([*+])\s*(\S.*)$/) { + $procline--; + last; + } + &transcript("> $bodylines[$procline]\n"); + next if $bad; + my ($o, $txt) = ($1, $2); + if ($#cats == -1 && $o eq "+") { + &transcript("User defined category specification must start with a category name. Skipping.\n\n"); + $errors++; + $bad = 1; + next; + } + if ($o eq "+") { + unless (ref($cats[-1]) eq "HASH") { + $cats[-1] = { "nam" => $cats[-1], + "pri" => [], "ttl" => [] }; + } + $catsec++; + my ($desc, $ord, $op); + if ($txt =~ m/^(.*\S)\s*\[((\d+):\s*)?\]\s*$/) { + $desc = $1; $ord = $3; $op = ""; + } elsif ($txt =~ m/^(.*\S)\s*\[((\d+):\s*)?(\S+)\]\s*$/) { + $desc = $1; $ord = $3; $op = $4; + } elsif ($txt =~ m/^([^[\s]+)\s*$/) { + $desc = ""; $op = $1; + } else { + &transcript("Unrecognised syntax for category section. Skipping.\n\n"); + $errors++; + $bad = 1; + next; + } + $ord = 999 unless defined $ord; + + if ($op) { + push @{$cats[-1]->{"pri"}}, $prefix . $op; + push @{$cats[-1]->{"ttl"}}, $desc; + push @ords, "$ord $catsec"; + } else { + @cats[-1]->{"def"} = $desc; + push @ords, "$ord DEF"; + $catsec--; + } + @ords = sort { my ($a1, $a2, $b1, $b2) = split / /, "$a $b"; + $a1 <=> $b1 || $a2 <=> $b2; } @ords; + $cats[-1]->{"ord"} = [map { m/^.* (\S+)/; $1 eq "DEF" ? $catsec + 1 : $1 } @ords]; + } elsif ($o eq "*") { + $catsec = 0; + my ($name); + if ($txt =~ m/^(.*\S)(\s*\[(\S+)\])\s*$/) { + $name = $1; $prefix = $3; + } else { + $name = $txt; $prefix = ""; + } + push @cats, $name; + } + } + # XXX: got @cats, now do something with it + my $u = Debbugs::User::get_user($user); + if (@cats) { + &transcript("Added usercategory $catname.\n\n"); + $u->{"categories"}->{$catname} = [ @cats ]; + if (not $hidden) { + push @{$u->{visible_cats}},$catname; + } + } else { + &transcript("Removed usercategory $catname.\n\n"); + delete $u->{"categories"}->{$catname}; + @{$u->{visible_cats}} = grep {$_ ne $catname} @{$u->{visible_cats}}; + } + $u->write(); + } elsif (m/^usertags?\s+\#?(-?\d+)\s+(([=+-])\s*)?(\S.*)?$/i) { + $ok++; + $ref = $1; $addsubcode = $3 || "+"; $tags = $4; + if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { + $ref = $clonebugs{$ref}; + } + if ($user eq "") { + &transcript("No valid user selected\n"); + $errors++; + $indicated_user = 1; + } elsif (&setbug) { + if (not $indicated_user and defined $user) { + &transcript("User is $user\n"); + $indicated_user = 1; + } + &nochangebug; + my %ut; + Debbugs::User::read_usertags(\%ut, $user); + my @oldtags = (); my @newtags = (); my @badtags = (); + my %chtags; + for my $t (split /[,\s]+/, $tags) { + if ($t =~ m/^[a-zA-Z0-9.+\@-]+$/) { + $chtags{$t} = 1; + } else { + push @badtags, $t; + } + } + if (@badtags) { + &transcript("Ignoring illegal tag/s: ".join(', ', @badtags).".\nPlease use only alphanumerics, at, dot, plus and dash.\n"); + $errors++; + } + for my $t (keys %chtags) { + $ut{$t} = [] unless defined $ut{$t}; + } + for my $t (keys %ut) { + my %res = map { ($_, 1) } @{$ut{$t}}; + push @oldtags, $t if defined $res{$ref}; + my $addop = ($addsubcode eq "+" or $addsubcode eq "="); + my $del = (defined $chtags{$t} ? $addsubcode eq "-" + : $addsubcode eq "="); + $res{$ref} = 1 if ($addop && defined $chtags{$t}); + delete $res{$ref} if ($del); + push @newtags, $t if defined $res{$ref}; + $ut{$t} = [ sort { $a <=> $b } (keys %res) ]; + } + if (@oldtags == 0) { + &transcript("There were no usertags set.\n"); + } else { + &transcript("Usertags were: " . join(" ", @oldtags) . ".\n"); + } + &transcript("Usertags are now: " . join(" ", @newtags) . ".\n"); + Debbugs::User::write_usertags(\%ut, $user); + } } elsif (!$control) { &transcript(<= 3) { &transcript("Too many unknown commands, stopping here.\n\n"); last; } -#### interesting ones start here +#### "developer only" ones start here } elsif (m/^close\s+\#?(-?\d+)(?:\s+(\d.*))?$/i) { $ok++; $ref= $1; + $bug_affected{$ref}=1; $version= $2; if (&setbug) { &transcript("'close' is deprecated; see http://$gWebDomain/Developer$gHTMLSuffix#closing.\n"); @@ -302,6 +489,7 @@ END } elsif (m/^reassign\s+\#?(-?\d+)\s+(\S+)(?:\s+(\d.*))?$/i) { $ok++; $ref= $1; $newpackage= $2; + $bug_affected{$ref}=1; $version= $3; $newpackage =~ y/A-Z/a-z/; if (&setbug) { @@ -327,9 +515,10 @@ END m/^reopen\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($noriginator=$2, 1) : 0) { $ok++; $ref= $1; + $bug_affected{$ref}=1; if (&setbug) { if (@{$data->{fixed_versions}}) { - &transcript("'reopen' is deprecated when a bug has been closed with a version;\nuse 'found' or 'submitter' as appropriate instead.\n"); + &transcript("'reopen' may be inappropriate when a bug has been closed with a version;\nyou may need to use 'found' to remove fixed versions.\n"); } if (!length($data->{done})) { &transcript("$gBug is already open, cannot reopen.\n\n"); @@ -346,13 +535,16 @@ END } while (&getnextbug); } } - } elsif (m/^found\s+\#?(-?\d+)(?:\s+(\d.*))?$/i) { + } elsif (m{^found\s+\#?(-?\d+) + (?:\s+((?:$config{package_name_re}\/)? + $config{package_version_re}))?$}ix) { $ok++; $ref= $1; $version= $2; if (&setbug) { if (!length($data->{done}) and not defined($version)) { &transcript("$gBug is already open, cannot reopen.\n\n"); + $errors++; &nochangebug; } else { $action= @@ -365,18 +557,19 @@ END # tracking, because a bug may be closed by multiple # people in different branches. Until we have something # more flexible, we set it every time a bug is fixed, - # and clear it precisely when a found command is - # received for the rightmost fixed-in version, which - # equates to the most recent fixing of the bug, or when - # a versionless found command is received. - if (defined $version) { - my $lastfixed = - (reverse @{$data->{fixed_versions}})[0]; - # TODO: what if $data->{package} is a source package? + # and clear it when a bug is found in a version greater + # than any version in which the bug is fixed or when + # a bug is found and there is no fixed version + if (defined $version) { + my ($version_only) = $version =~ m{([^/]+)$}; addfoundversions($data, $data->{package}, $version, 'binary'); - if (defined $lastfixed and $version eq $lastfixed) { - $data->{done} = ''; - } + my @fixed_order = sort {Debbugs::Versions::Dpkg::vercmp($a,$b);} + map {s{.+/}{}; $_;} @{$data->{fixed_versions}}; + if (not @fixed_order or (Debbugs::Versions::Dpkg::vercmp($version_only,$fixed_order[-1]) >= 0)) { + $action = "$gBug marked as found in version $version and reopened." + if length $data->{done}; + $data->{done} = ''; + } } else { # Versionless found; assume old-style "not fixed at # all". @@ -386,14 +579,70 @@ END } while (&getnextbug); } } - } elsif (m/^submitter\s+\#?(-?\d+)\s+\!$/i ? ($newsubmitter=$replyto, 1) : + } elsif (m[^notfound\s+\#?(-?\d+) + (?:\s+(?:$config{package_name_re}\/)? + ($config{package_version_re}))$]ix) { + $ok++; + $ref= $1; + $version= $2; + if (&setbug) { + $action= "$gBug no longer marked as found in version $version."; + if (length($data->{done})) { + $extramessage= "(By the way, this $gBug is currently marked as done.)\n"; + } + do { + &addmaintainers($data); + removefoundversions($data, $data->{package}, $version, 'binary'); + } while (&getnextbug); + } + } + elsif (m[^fixed\s+\#?(-?\d+)\s+ + ((?:$config{package_name_re}\/)? + $config{package_version_re})\s*$]ix) { + $ok++; + $ref= $1; + $version= $2; + if (&setbug) { + $action= + defined($version) ? + "$gBug marked as fixed in version $version." : + "$gBug reopened."; + do { + &addmaintainers($data); + addfixedversions($data, $data->{package}, $version, 'binary'); + } while (&getnextbug); + } + } + elsif (m[^notfixed\s+\#?(-?\d+)\s+ + ((?:$config{package_name_re}\/)? + $config{package_version_re})\s*$]ix) { + $ok++; + $ref= $1; + $version= $2; + if (&setbug) { + $action= + defined($version) ? + "$gBug no longer marked as fixed in version $version." : + "$gBug reopened."; + do { + &addmaintainers($data); + removefixedversions($data, $data->{package}, $version, 'binary'); + } while (&getnextbug); + } + } + elsif (m/^submitter\s+\#?(-?\d+)\s+\!$/i ? ($newsubmitter=$replyto, 1) : m/^submitter\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($newsubmitter=$2, 1) : 0) { $ok++; $ref= $1; + $bug_affected{$ref}=1; if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { $ref = $clonebugs{$ref}; } - if (&getbug) { + if (not Mail::RFC822::Address::valid($newsubmitter)) { + transcript("$newsubmitter is not a valid e-mail address; not changing submitter\n"); + $errors++; + } + elsif (&getbug) { if (&checkpkglimit) { &foundbug; &addmaintainers($data); @@ -421,7 +670,9 @@ The submitter address recorded for your $gBug report #$ref: $data->{subject} has been changed. -The new submitter address for this report is +The old submitter address for this report was +$oldsubmitter. +The new submitter address is $newsubmitter. This change was made by @@ -442,6 +693,7 @@ END } elsif (m/^forwarded\s+\#?(-?\d+)\s+(\S.*\S)$/i) { $ok++; $ref= $1; $whereto= $2; + $bug_affected{$ref}=1; if (&setbug) { if (length($data->{forwarded})) { $action= "Forwarded-to-address changed from $data->{forwarded} to $whereto."; @@ -462,6 +714,7 @@ END } elsif (m/^notforwarded\s+\#?(-?\d+)$/i) { $ok++; $ref= $1; + $bug_affected{$ref}=1; if (&setbug) { if (!length($data->{forwarded})) { &transcript("$gBug is not marked as having been forwarded.\n\n"); @@ -478,17 +731,20 @@ END m/^priority\s+\#?(-?\d+)\s+([-0-9a-z]+)$/i) { $ok++; $ref= $1; + $bug_affected{$ref}=1; $newseverity= $2; if (!grep($_ eq $newseverity, @gSeverityList, "$gDefaultSeverity")) { &transcript("Severity level \`$newseverity' is not known.\n". "Recognized are: $gShowSeverities.\n\n"); + $errors++; } elsif (exists $gObsoleteSeverities{$newseverity}) { &transcript("Severity level \`$newseverity' is obsolete. " . - "$gObsoleteSeverities{$newseverity}\n\n"); + "Use $gObsoleteSeverities{$newseverity} instead.\n\n"); + $errors++; } elsif (&setbug) { $printseverity= $data->{severity}; $printseverity= "$gDefaultSeverity" if $printseverity eq ''; - $action= "Severity set to \`$newseverity'."; + $action= "Severity set to \`$newseverity' from \`$printseverity'"; do { &addmaintainers($data); if (defined $gStrongList and isstrongseverity($newseverity)) { @@ -500,6 +756,7 @@ END } elsif (m/^tags?\s+\#?(-?\d+)\s+(([=+-])\s*)?(\S.*)?$/i) { $ok++; $ref = $1; $addsubcode = $3; $tags = $4; + $bug_affected{$ref}=1; $addsub = "add"; if (defined $addsubcode) { $addsub = "sub" if ($addsubcode eq "-"); @@ -518,6 +775,7 @@ END if (@badtags) { &transcript("Unknown tag/s: ".join(', ', @badtags).".\n". "Recognized are: ".join(' ', @gTags).".\n\n"); + $errors++; } if (&setbug) { if ($data->{keywords} eq '') { @@ -551,9 +809,114 @@ END $data->{keywords} =~ s/\s*$//; } while (&getnextbug); } + } elsif (m/^(un)?block\s+\#?(-?\d+)\s+(by|with)\s+\s*(\S.*)?$/i) { + $ok++; + my $bugnum = $2; my $blockers = $4; + $addsub = "add"; + $addsub = "sub" if ($1 eq "un"); + if ($bugnum =~ m/^-\d+$/ && defined $clonebugs{$bugnum}) { + $bugnum = $clonebugs{$bugnum}; + } + + my @okayblockers; + my @badblockers; + foreach my $b (split /[\s,]+/, $blockers) { + $b=~s/^\#//; + if ($b=~/[0-9]+/) { + $ref=$b; + if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { + $ref = $clonebugs{$ref}; + } + if (&getbug) { + &foundbug; + push @okayblockers, $ref; + + # add to the list all bugs that are merged with $b, + # because all of their data must be kept in sync + @thisbugmergelist= split(/ /,$data->{mergedwith}); + &cancelbug; + + foreach $ref (@thisbugmergelist) { + if (&getbug) { + push @okayblockers, $ref; + &cancelbug; + } + } + } + else { + ¬foundbug; + push @badblockers, $ref; + } + } + else { + push @badblockers, $b; + } + } + if (@badblockers) { + &transcript("Unknown blocking bug/s: ".join(', ', @badblockers).".\n"); + $errors++; + } + + $ref=$bugnum; + if (&setbug) { + if ($data->{blockedby} eq '') { + &transcript("Was not blocked by any bugs.\n"); + } else { + &transcript("Was blocked by: $data->{blockedby}\n"); + } + if ($addsub eq "set") { + $action= "Blocking bugs of $bugnum set to: " . join(", ", @okayblockers); + } elsif ($addsub eq "add") { + $action= "Blocking bugs of $bugnum added: " . join(", ", @okayblockers); + } elsif ($addsub eq "sub") { + $action= "Blocking bugs of $bugnum removed: " . join(", ", @okayblockers); + } + my %removedblocks; + my %addedblocks; + do { + &addmaintainers($data); + my @oldblockerlist = split ' ', $data->{blockedby}; + $data->{blockedby} = '' if ($addsub eq "set"); + foreach my $b (@okayblockers) { + $data->{blockedby} = manipset($data->{blockedby}, $b, + ($addsub ne "sub")); + } + + foreach my $b (@oldblockerlist) { + if (! grep { $_ eq $b } split ' ', $data->{blockedby}) { + push @{$removedblocks{$b}}, $ref; + } + } + foreach my $b (split ' ', $data->{blockedby}) { + if (! grep { $_ eq $b } @oldblockerlist) { + push @{$addedblocks{$b}}, $ref; + } + } + } while (&getnextbug); + + # Now that the blockedby data is updated, change blocks data + # to match the changes. + foreach $ref (keys %addedblocks) { + if (&getbug) { + foreach my $b (@{$addedblocks{$ref}}) { + $data->{blocks} = manipset($data->{blocks}, $b, 1); + } + &savebug; + } + } + foreach $ref (keys %removedblocks) { + if (&getbug) { + foreach my $b (@{$removedblocks{$ref}}) { + $data->{blocks} = manipset($data->{blocks}, $b, 0); + } + &savebug; + } + } + } } elsif (m/^retitle\s+\#?(-?\d+)\s+(\S.*\S)\s*$/i) { $ok++; $ref= $1; $newtitle= $2; + $bug_affected{$ref}=1; if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { $ref = $clonebugs{$ref}; } @@ -561,8 +924,9 @@ END if (&checkpkglimit) { &foundbug; &addmaintainers($data); + my $oldtitle = $data->{subject}; $data->{subject}= $newtitle; - $action= "Changed $gBug title."; + $action= "Changed $gBug title to `$newtitle' from `$oldtitle'."; &savebug; &transcript("$action\n"); if (length($data->{done})) { @@ -578,6 +942,7 @@ END } elsif (m/^unmerge\s+\#?(-?\d+)$/i) { $ok++; $ref= $1; + $bug_affected{$ref} = 1; if (&setbug) { if (!length($data->{mergedwith})) { &transcript("$gBug is not marked as being merged with any others.\n\n"); @@ -587,6 +952,7 @@ END $action= "Disconnected #$ref from all other report(s)."; @newmergelist= split(/ /,$data->{mergedwith}); $discref= $ref; + @bug_affected{@newmergelist} = 1 x @newmergelist; do { &addmaintainers($data); $data->{mergedwith}= ($ref == $discref) ? '' @@ -596,8 +962,8 @@ END } } elsif (m/^merge\s+#?(-?\d+(\s+#?-?\d+)+)\s*$/i) { $ok++; - @tomerge= sort { $a <=> $b } split(/\s+#?/,$1); - @newmergelist= (); + my @tomerge= sort { $a <=> $b } split(/\s+#?/,$1); + my @newmergelist= (); my %tags = (); my %found = (); my %fixed = (); @@ -608,24 +974,27 @@ END if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { $ref = $clonebugs{$ref}; } - next if grep($_ eq $ref,@newmergelist); + next if grep($_ == $ref,@newmergelist); if (!&getbug) { ¬foundbug; @newmergelist=(); last } if (!&checkpkglimit) { &cancelbug; @newmergelist=(); last; } &foundbug; &transcript("D| adding $ref ($data->{mergedwith})\n") if $dl; $mismatch= ''; - &checkmatch('package','m_package',$data->{package}); - &checkmatch('forwarded addr','m_forwarded',$data->{forwarded}); + &checkmatch('package','m_package',$data->{package},@newmergelist); + &checkmatch('forwarded addr','m_forwarded',$data->{forwarded},@newmergelist); $data->{severity} = '$gDefaultSeverity' if $data->{severity} eq ''; - &checkmatch('severity','m_severity',$data->{severity}); - &checkmatch('done mark','m_done',length($data->{done}) ? 'done' : 'open'); - &checkmatch('owner','m_owner',$data->{owner}); + &checkmatch('severity','m_severity',$data->{severity},@newmergelist); + &checkmatch('blocks','m_blocks',$data->{blocks},@newmergelist); + &checkmatch('blocked-by','m_blockedby',$data->{blockedby},@newmergelist); + &checkmatch('done mark','m_done',length($data->{done}) ? 'done' : 'open',@newmergelist); + &checkmatch('owner','m_owner',$data->{owner},@newmergelist); foreach my $t (split /\s+/, $data->{keywords}) { $tags{$t} = 1; } foreach my $f (@{$data->{found_versions}}) { $found{$f} = 1; } foreach my $f (@{$data->{fixed_versions}}) { $fixed{$f} = 1; } if (length($mismatch)) { &transcript("Mismatch - only $gBugs in same state can be merged:\n". $mismatch."\n"); + $errors++; &cancelbug; @newmergelist=(); last; } push(@newmergelist,$ref); @@ -639,7 +1008,8 @@ END for $ref (@newmergelist) { &getbug || die "huh ? $gBug $ref disappeared during merge"; &addmaintainers($data); - $data->{mergedwith}= join(' ',grep($_ ne $ref,@newmergelist)); + @bug_affected{@newmergelist} = 1 x @newmergelist; + $data->{mergedwith}= join(' ',grep($_ != $ref,@newmergelist)); $data->{keywords}= join(' ', keys %tags); $data->{found_versions}= [sort keys %found]; $data->{fixed_versions}= [sort keys %fixed]; @@ -648,6 +1018,69 @@ END &transcript("$action\n\n"); } &endmerge; + } elsif (m/^forcemerge\s+\#?(-?\d+(?:\s+\#?-?\d+)+)\s*$/i) { + $ok++; + my @temp = split /\s+\#?/,$1; + my $master_bug = shift @temp; + my $master_bug_data; + my @tomerge = sort { $a <=> $b } @temp; + unshift @tomerge,$master_bug; + &transcript("D| force merging ".join(',',@tomerge)."\n") if $dl; + my @newmergelist= (); + my %tags = (); + my %found = (); + my %fixed = (); + # Here we try to do the right thing. + # First, if the bugs are in the same package, we merge all of the found, fixed, and tags. + # If not, we discard the found and fixed. + # Everything else we set to the values of the first bug. + &getmerge; + while (defined($ref= shift(@tomerge))) { + &transcript("D| checking merge $ref\n") if $dl; + $ref+= 0; + if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { + $ref = $clonebugs{$ref}; + } + next if grep($_ == $ref,@newmergelist); + if (!&getbug) { ¬foundbug; @newmergelist=(); last } + if (!&checkpkglimit) { &cancelbug; @newmergelist=(); last; } + &foundbug; + &transcript("D| adding $ref ($data->{mergedwith})\n") if $dl; + $master_bug_data = $data if not defined $master_bug_data; + if ($data->{package} ne $master_bug_data->{package}) { + &transcript("Mismatch - only $gBugs in the same package can be forcibly merged:\n". + "$gBug $ref is not in the same package as $master_bug\n"); + $errors++; + &cancelbug; @newmergelist=(); last; + } + for my $t (split /\s+/,$data->{keywords}) { + $tags{$t} = 1; + } + @found{@{$data->{found_versions}}} = (1) x @{$data->{found_versions}}; + @fixed{@{$data->{fixed_versions}}} = (1) x @{$data->{fixed_versions}}; + push(@newmergelist,$ref); + push(@tomerge,split(/ /,$data->{mergedwith})); + &cancelbug; + } + if (@newmergelist) { + @newmergelist= sort { $a <=> $b } @newmergelist; + $action= "Forcibly Merged @newmergelist."; + delete @fixed{keys %found}; + for $ref (@newmergelist) { + &getbug || die "huh ? $gBug $ref disappeared during merge"; + &addmaintainers($data); + @bug_affected{@newmergelist} = 1 x @newmergelist; + $data->{mergedwith}= join(' ',grep($_ != $ref,@newmergelist)); + $data->{keywords}= join(' ', keys %tags); + $data->{found_versions}= [sort keys %found]; + $data->{fixed_versions}= [sort keys %fixed]; + my @field_list = qw(forwarded package severity blocks blockedby owner done); + @{$data}{@field_list} = @{$master_bug_data}{@field_list}; + &savebug; + } + &transcript("$action\n\n"); + } + &endmerge; } elsif (m/^clone\s+#?(\d+)\s+((-\d+\s+)*-\d+)\s*$/i) { $ok++; @@ -656,9 +1089,11 @@ END $newbugsneeded = scalar(@newclonedids); $ref = $origref; + $bug_affected{$ref} = 1; if (&setbug) { if (length($data->{mergedwith})) { - &transcript("$gBug is marked as being merged with others.\n\n"); + &transcript("$gBug is marked as being merged with others. Use an existing clone.\n\n"); + $errors++; &nochangebug; } else { &filelock("nextnumber.lock"); @@ -675,24 +1110,42 @@ END } else { $action= "$gBug $origref cloned as bugs $firstref-$lastref."; } + + my $blocks = $data->{blocks}; + my $blockedby = $data->{blockedby}; + &getnextbug; my $ohash = get_hashname($origref); - $ref = $firstref; + my $clone = $firstref; + @bug_affected{@newclonedids} = 1 x @newclonedids; for $newclonedid (@newclonedids) { - $clonebugs{$newclonedid} = $ref; + $clonebugs{$newclonedid} = $clone; - my $hash = get_hashname($ref); - copy("db-h/$ohash/$origref.log", "db-h/$hash/$ref.log"); - copy("db-h/$ohash/$origref.status", "db-h/$hash/$ref.status"); - copy("db-h/$ohash/$origref.summary", "db-h/$hash/$ref.summary"); - copy("db-h/$ohash/$origref.report", "db-h/$hash/$ref.report"); - &bughook('new', $ref, $data); - - $ref++; + my $hash = get_hashname($clone); + copy("db-h/$ohash/$origref.log", "db-h/$hash/$clone.log"); + copy("db-h/$ohash/$origref.status", "db-h/$hash/$clone.status"); + copy("db-h/$ohash/$origref.summary", "db-h/$hash/$clone.summary"); + copy("db-h/$ohash/$origref.report", "db-h/$hash/$clone.report"); + &bughook('new', $clone, $data); + + # Update blocking info of bugs blocked by or blocking the + # cloned bug. + foreach $ref (split ' ', $blocks) { + &getbug; + $data->{blockedby} = manipset($data->{blockedby}, $clone, 1); + &savebug; + } + foreach $ref (split ' ', $blockedby) { + &getbug; + $data->{blocks} = manipset($data->{blocks}, $clone, 1); + &savebug; + } + + $clone++; } } } - } elsif (m/^package\s+(\S.*\S)?\s*$/i) { + } elsif (m/^package\:?\s+(\S.*\S)?\s*$/i) { $ok++; my @pkgs = split /\s+/, $1; if (scalar(@pkgs) > 0) { @@ -707,6 +1160,7 @@ END m/^owner\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($newowner = $2, 1) : 0) { $ok++; $ref = $1; + $bug_affected{$ref} = 1; if (&setbug) { if (length $data->{owner}) { $action = "Owner changed from $data->{owner} to $newowner."; @@ -725,6 +1179,7 @@ END } elsif (m/^noowner\s+\#?(-?\d+)$/i) { $ok++; $ref = $1; + $bug_affected{$ref} = 1; if (&setbug) { if (length $data->{owner}) { $action = "Removed annotation that $gBug was owned by " . @@ -738,8 +1193,56 @@ END &nochangebug; } } + } elsif (m/^unarchive\s+#?(\d+)$/i) { + $ok++; + $ref = $1; + $bug_affected{$ref} = 1; + my $transcript; + eval { + bug_unarchive(bug => $ref, + transcript => \$transcript, + affected_bugs => \%bug_affected, + requester => $header{from}, + request_addr => $controlrequestaddr, + message => \@log, + ); + }; + if ($@) { + $errors++; + } + transcript($transcript."\n"); + } elsif (m/^archive\s+#?(\d+)$/i) { + $ok++; + $ref = $1; + $bug_affected{$ref} = 1; + if (&setbug) { + if (exists $data->{unarchived}) { + my $transcript; + nochangebug(); + eval { + bug_archive(bug => $ref, + transcript => \$transcript, + ignore_time => 1, + affected_bugs => \%bug_affected, + requester => $header{from}, + request_addr => $controlrequestaddr, + message => \@log, + ); + }; + if ($@) { + $errors++; + } + transcript($transcript."\n"); + } + else { + transcript("$gBug $ref has not been archived previously\n\n"); + nochangebug(); + $errors++; + } + } } else { &transcript("Unknown command or malformed arguments to command.\n\n"); + $errors++; if (++$unknowns >= 5) { &transcript("Too many unknown commands, stopping here.\n\n"); last; @@ -750,6 +1253,7 @@ if ($procline>$#bodylines) { &transcript(">\nEnd of message, stopping processing here.\n\n"); } if (!$ok && !quickabort) { + $errors++; &transcript("No commands successfully parsed; sending the help text(s).\n"); &sendhelp; &transcript("\n"); @@ -783,19 +1287,35 @@ if (@maintccs) { $maintccs .= "Cc: " . join(",\n ",@maintccs) . "\n"; } +my %packagepr; +for my $maint (keys %maintccreasons) { + for my $package (keys %{$maintccreasons{$maint}}) { + next unless length $package; + $packagepr{$package} = 1; + } +} +my $packagepr = ''; +$packagepr = "X-${gProject}-PR-Package: " . join(keys %packagepr) . "\n" if keys %packagepr; + +# Add Bcc's to subscribed bugs +push @bcc, map {"bugs=$_\@$gListDomain"} keys %bug_affected; + if (!defined $header{'subject'} || $header{'subject'} eq "") { $header{'subject'} = "your mail"; } +# Error text here advertises how many errors there were +my $error_text = $errors > 0 ? " (with $errors errors)":''; + $reply= < Precedence: bulk -X-$gProject-PR-Message: transcript +${packagepr}X-$gProject-PR-Message: transcript ${transcript}Please contact me if you need assistance. @@ -805,36 +1325,31 @@ $extras END $repliedshow= join(', ',$replyto,@maintccaddrs); +# -1 is the service.in log &filelock("lock/-1"); open(AP,">>db-h/-1.log") || &quit("open db-h/-1.log: $!"); print(AP "\2\n$repliedshow\n\5\n$reply\n\3\n". "\6\n". "Request received from ". - &sani($header{'from'})."\n". - "to ".&sani($controlrequestaddr)."\n". + html_escape($header{'from'})."\n". + "to ".html_escape($controlrequestaddr)."\n". "\3\n". - "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/-1.log: $!"); + "\7\n",escape_log(@log),"\n\3\n") || &quit("writing db-h/-1.log: $!"); close(AP) || &quit("open db-h/-1.log: $!"); &unfilelock; utime(time,time,"db-h"); -&sendmailmessage($reply,$replyto,@maintccaddrs,@bcc); +&sendmailmessage($reply,exists $header{'x-debbugs-no-ack'}?():$replyto,@maintccaddrs,@bcc); unlink("incoming/P$nn") || &quit("unlinking incoming/P$nn: $!"); sub sendmailmessage { local ($message,@recips) = @_; $message = "X-Loop: $gMaintainerEmail\n" . $message; - print "mailing to >@recips<\n" if $debug; - $c= open(D,"|-"); - defined($c) || &quit("mailing forking for sendmail: $!"); - if (!$c) { # ie, we are the child process - exec '/usr/lib/sendmail','-f'."$gMaintainerEmail",'-odb','-oem','-oi',get_addresses(@recips); - die $!; - } - print(D $message) || &quit("writing to sendmail process: $!"); - $!=0; close(D); $? && &quit("sendmail gave exit status $? ($!)"); + send_mail_message(message => $message, + recipients => \@recips, + ); $midix++; } @@ -849,7 +1364,7 @@ sub sendhelp { #} sub checkmatch { - local ($string,$mvarname,$svarvalue) = @_; + local ($string,$mvarname,$svarvalue,@newmergelist) = @_; local ($mvarvalue); if (@newmergelist) { eval "\$mvarvalue= \$$mvarname"; @@ -870,11 +1385,27 @@ sub checkmatch { sub checkpkglimit { if (keys %limit_pkgs and not defined $limit_pkgs{$data->{package}}) { &transcript("$gBug number $ref belongs to package $data->{package}, skipping.\n\n"); + $errors++; return 0; } return 1; } +sub manipset { + my $list = shift; + my $elt = shift; + my $add = shift; + + my %h = map { $_ => 1 } split ' ', $list; + if ($add) { + $h{$elt}=1; + } + else { + delete $h{$elt}; + } + return join ' ', sort keys %h; +} + # High-level bug manipulation calls # Do announcements themselves # @@ -983,7 +1514,7 @@ sub getnextbug { # &transcript("$action\n\n") # endmerge -sub notfoundbug { &transcript("$gBug number $ref not found.\n\n"); } +sub notfoundbug { &transcript("$gBug number $ref not found. (Is it archived?)\n\n"); } sub foundbug { &transcript("$gBug#$ref: $data->{subject}\n"); } sub getmerge { @@ -1005,7 +1536,8 @@ sub endmerge { sub getbug { &dlen("getbug $ref"); $lowstate eq 'idle' || die "$state ?"; - if (($data = &lockreadbug($ref))) { + # Only use unmerged bugs here + if (($data = &lockreadbug($ref,'db-h'))) { $sref= $ref; $lowstate= "open"; &dlex("getbug => 1"); @@ -1030,16 +1562,13 @@ sub savebug { $lowstate eq 'open' || die "$lowstate ?"; length($action) || die; $ref == $sref || die "read $sref but saving $ref ?"; - my $hash = get_hashname($ref); - open(L,">>db-h/$hash/$ref.log") || &quit("opening db-h/$hash/$ref.log: $!"); - print(L - "\6\n". - "".&sani($action)."\n". - "Request was from ".&sani($header{'from'})."\n". - "to ".&sani($controlrequestaddr).". \n". - "\3\n". - "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/$hash/$ref.log: $!"); - close(L) || &quit("closing db-h/$hash/$ref.log: $!"); + append_action_to_log(bug => $ref, + action => $action, + requester => $header{from}, + request_addr => $controlrequestaddr, + message => \@log, + get_lock => 0, + ); unlockwritebug($ref, $data); $lowstate= "idle"; &dlex("savebug"); @@ -1189,7 +1718,7 @@ sub ensuremaintainersloaded { m/^\s*$/ && next; m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers bogus \`$_'"); $a= $1; $b= $2; $a =~ y/A-Z/a-z/; - $maintainerof{$1}= $2; + $maintainerof{$a}= $2; } close(MAINT); open(MAINT,"$gMaintainerFileOverride") || die &quit("maintainers.override open: $!"); @@ -1198,7 +1727,7 @@ sub ensuremaintainersloaded { m/^\s*$/ && next; m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers.override bogus \`$_'"); $a= $1; $b= $2; $a =~ y/A-Z/a-z/; - $maintainerof{$1}= $2; + $maintainerof{$a}= $2; } open(SOURCES, "$gPackageSource") || &quit("pkgsrc open: $!");