X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgreport.cgi;h=1ea9a17a314160b2c83314677852e8f5f6312235;hb=05f158937d8e18b9bec70594f465fc078ed3bc59;hp=570100dad78d8adb7066671ded9701438260aad4;hpb=58239417800ff2f0c8d5f65a3e183b9c92ce95a3;p=debbugs.git

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 570100d..1ea9a17 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -13,6 +13,12 @@
 use warnings;
 use strict;
 
+# Sanitize environent for taint
+BEGIN{
+    delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+}
+
+binmode(STDOUT,':encoding(UTF-8)');
 use POSIX qw(strftime nice);
 
 use Debbugs::Config qw(:globals :text :config);
@@ -24,6 +30,8 @@ use Debbugs::Common qw(getparsedaddrs make_list getmaintainers getpseudodesc);
 use Debbugs::Bugs qw(get_bugs bug_filter newest_bug);
 use Debbugs::Packages qw(getsrcpkgs getpkgsrc get_versions);
 
+use Debbugs::Status qw(splitpackages);
+
 use Debbugs::CGI qw(:all);
 
 use Debbugs::CGI::Pkgreport qw(:all);
@@ -52,6 +60,7 @@ our %param = cgi_parameters(query => $q,
 				       qw(bug-rev pend-rev sev-rev),
 				       qw(maxdays mindays version),
 				       qw(data which dist newest),
+				       qw(noaffects),
 				      ],
 			    default => $default_params,
 			   );
@@ -75,12 +84,33 @@ if (exists $param{form_options} and defined $param{form_options}) {
      }
      for my $incexc (qw(include exclude)) {
 	  next unless exists $param{$incexc};
-	  $param{$incexc} = [grep /\S\:\S/, make_list($param{$incexc})];
+	  # normalize tag to tags
+	  $param{$incexc} = [map {s/^tag:/tags:/; $_} grep /\S\:\S/, make_list($param{$incexc})];
+     }
+     for my $key (keys %package_search_keys) {
+	  next unless exists $param{key};
+	  $param{$key} = [map {split /\s*,\s*/} make_list($param{$key})];
+     }
+     # kill off keys for which empty values are meaningless
+     for my $key (qw(package src submitter affects severity status dist)) {
+	  next unless exists $param{$key};
+	  $param{$key} = [grep {defined $_ and length $_}
+			  make_list($param{$key})];
      }
      print $q->redirect(munge_url('pkgreport.cgi?',%param));
      exit 0;
 }
 
+# normalize innclude/exclude keys; currently this is in two locations,
+# which is suboptimal. Closes: #567407
+for my $incexc (qw(include exclude)) {
+    next unless exists $param{$incexc};
+    # normalize tag to tags
+    $param{$incexc} = [map {s/^tag:/tags:/; $_} make_list($param{$incexc})];
+}
+
+
+
 # map from yes|no to 1|0
 for my $key (qw(repeatmerged bug-rev pend-rev sev-rev)) {
      if (exists $param{$key}){
@@ -100,6 +130,10 @@ elsif (lc($param{archive}) eq 'yes') {
      $param{archive} = 1;
 }
 
+# fixup dist
+if (exists $param{dist} and $param{dist} eq '') {
+     delete $param{dist};
+}
 
 my $include = $param{'&include'} || $param{'include'} || "";
 my $exclude = $param{'&exclude'} || $param{'exclude'} || "";
@@ -161,8 +195,7 @@ for my $incexcmap (@inc_exc_mapping) {
 my $maxdays = ($param{'maxdays'} || -1);
 my $mindays = ($param{'mindays'} || 0);
 my $version = $param{'version'} || undef;
-# XXX Once the options/selection is rewritten, this should go away
-my $dist = $param{dist} || undef;
+
 
 our %hidden = map { $_, 1 } qw(status severity classification);
 our %cats = (
@@ -211,21 +244,22 @@ if (defined $param{maintenc}) {
      delete $param{maintenc}
 }
 
+if (exists $param{pkg}) {
+     $param{package} = $param{pkg};
+     delete $param{pkg};
+}
 
 if (not grep {exists $param{$_}} keys %package_search_keys and exists $param{users}) {
      $param{usertag} = [make_list($param{users})];
 }
 
-if (exists $param{pkg}) {
-     $param{package} = $param{pkg};
-     delete $param{pkg};
-}
+my %bugusertags;
+my %ut;
+my %seen_users;
 
-our %bugusertags;
-our %ut;
 for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) {
     next unless length($user);
-    add_user($user);
+    add_user($user,\%ut,\%bugusertags,\%seen_users,\%cats,\%hidden);
 }
 
 if (defined $param{usertag}) {
@@ -236,7 +270,7 @@ if (defined $param{usertag}) {
 	  unless (defined $t && $t ne "") {
 	       $t = join(",", keys(%select_ut));
 	  }
-	  add_user($u);
+	  add_user($u,\%ut,\%bugusertags,\%seen_users,\%cats,\%hidden);
 	  push @{$param{tag}}, split /,/, $t;
      }
 }
@@ -253,42 +287,6 @@ my $this = munge_url('pkgreport.cgi?',
 my %indexentry;
 my %strings = ();
 
-my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime;
-my $tail_html = $gHTMLTail;
-$tail_html = $gHTMLTail;
-$tail_html =~ s/SUBSTITUTE_DTIME/$dtime/;
-
-our %seen_users;
-sub add_user {
-    my $ut = \%ut;
-    my $u = shift;
-
-    return if $seen_users{$u};
-    $seen_users{$u} = 1;
-
-    my $user = Debbugs::User::get_user($u);
-
-    my %vis = map { $_, 1 } @{$user->{"visible_cats"}};
-    for my $c (keys %{$user->{"categories"}}) {
-        $cats{$c} = $user->{"categories"}->{$c};
-	$hidden{$c} = 1 unless defined $vis{$c};
-    }
-
-    for my $t (keys %{$user->{"tags"}}) {
-        $ut->{$t} = [] unless defined $ut->{$t};
-        push @{$ut->{$t}}, @{$user->{"tags"}->{$t}};
-    }
-
-    %bugusertags = ();
-    for my $t (keys %{$ut}) {
-        for my $b (@{$ut->{$t}}) {
-            $bugusertags{$b} = [] unless defined $bugusertags{$b};
-            push @{$bugusertags{$b}}, $t;
-        }
-    }
-#    set_option("bugusertags", \%bugusertags);
-}
-
 my @bugs;
 
 # addusers for source and binary packages being searched for
@@ -308,7 +306,8 @@ for my $package (# For binary packages, add the binary package
 		 ),
 		) {
      next unless defined $package;
-     add_user($package.'@'.$config{usertag_package_domain})
+     add_user($package.'@'.$config{usertag_package_domain},
+	      \%ut,\%bugusertags,\%seen_users,\%cats,\%hidden)
 	  if defined $config{usertag_package_domain};
 }
 
@@ -324,8 +323,9 @@ my @temp = @package_search_key_order;
 while (my ($key,$value) = splice @temp, 0, 2) {
      next unless exists $param{$key};
      my @entries = ();
-     $param{$key} = [map {split /\s*,\s*/} make_list($param{$key})];
      for my $entry (make_list($param{$key})) {
+	  # we'll handle newest below
+	  next if $key eq 'newest';
 	  my $extra = '';
 	  if (exists $param{dist} and ($key eq 'package' or $key eq 'src')) {
 	       my %versions = get_versions(package => $entry,
@@ -350,39 +350,51 @@ while (my ($key,$value) = splice @temp, 0, 2) {
 	       }
 	       $extra= " ($verdesc)" if keys %versions;
 	  }
-	  push @entries, $entry.$extra;
+	  if ($key eq 'maint' and $entry eq '') {
+	       push @entries, "no one (packages without maintainers)"
+	  }
+	  else {
+	       push @entries, $entry.$extra;
+	  }
      }
-     push @title,$value.' '.join(' or ', @entries);
-}
-my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title);
-@title = ();
-
-# we have to special case the maint="" search, unfortunatly.
-if (defined $param{maint} and $param{maint} eq "" or ref($param{maint}) and not @{$param{maint}}) {
-     my %maintainers = %{getmaintainers()};
-     @bugs = get_bugs(function =>
-		      sub {my %d=@_;
-			   foreach my $try (splitpackages($d{"pkg"})) {
-				return 1 if not exists $maintainers{$try};
-			   }
-			   return 0;
-		      }
-		     );
-     $title = $gBugs.' in packages with no maintainer';
+     push @title,$value.' '.join(' or ', @entries) if @entries;
 }
-elsif (defined $param{newest}) {
+if (defined $param{newest}) {
      my $newest_bug = newest_bug();
      @bugs = ($newest_bug - $param{newest} + 1) .. $newest_bug;
-     $title = @bugs.' newest '.$gBugs;
+     push @title, 'in '.@bugs.' newest reports';
+     $param{bugs} = [exists $param{bugs}?make_list($param{bugs}):(),
+		     @bugs,
+		    ];
 }
-else {
-     #yeah for magick!
-     @bugs = get_bugs((map {exists $param{$_}?($_,$param{$_}):()}
-		       keys %package_search_keys, 'archive'),
-		      usertags => \%ut,
-		     );
+
+my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title);
+@title = ();
+
+#yeah for magick!
+@bugs = get_bugs((map {exists $param{$_}?($_,$param{$_}):()}
+		  grep {$_ ne 'newest'}
+		  keys %package_search_keys, 'archive'),
+		 usertags => \%ut,
+		);
+
+# shove in bugs which affect this package if there is a package or a
+# source given (by default), but no affects options given
+if (not exists $param{affects} and not exists $param{noaffects} and
+    (exists $param{src} or
+     exists $param{package})) {
+    push @bugs, get_bugs((map {my $key = $_;
+			       exists $param{$key}?($key =~ /^(?:package|src)$/?'affects':$key,
+						  ($key eq 'src'?[map {"src:$_"}make_list($param{$key})]:$param{$_})):()}
+			  grep {$_ ne 'newest'}
+			  keys %package_search_keys, 'archive'),
+			 usertags => \%ut,
+			);
 }
 
+# filter out included or excluded bugs
+
+
 if (defined $param{version}) {
      $title .= " at version $param{version}";
 }
@@ -424,6 +436,7 @@ my $result = pkg_htmlizebugs(bugs => \@bugs,
 			     (exists $param{dist})?(dist    => $param{dist}):(),
 			    );
 
+print "Cache-Control: public, max-age=300\n";
 print "Content-Type: text/html; charset=utf-8\n\n";
 
 print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
@@ -433,6 +446,7 @@ print "<HTML><HEAD>\n" .
     "</HEAD>\n" .
     '<BODY onload="pagemain();">' .
     "\n";
+print qq(<DIV id="status_mask"></DIV>\n);
 print "<H1>" . "$gProject$Archived $gBug report logs: $title" .
       "</H1>\n";
 
@@ -446,7 +460,7 @@ if (defined $pseudodesc and defined $pkg and exists $pseudodesc->{$pkg}) {
      delete $param{dist};
 }
 
-# output infomration about the packages
+# output information about the packages
 
 for my $package (make_list($param{package}||[])) {
      print generate_package_info(binary => 1,
@@ -474,27 +488,9 @@ if (exists $param{submitter}) {
     print "different addresses.\n";
 }
 
-# my $archive_links;
-# my @archive_links;
-# my %archive_values = (both => 'archived and unarchived',
-# 		      0    => 'not archived',
-# 		      1    => 'archived',
-# 		     );
-# while (my ($key,$value) = each %archive_values) {
-#      next if $key eq lc($param{archive});
-#      push @archive_links, qq(<a href=").
-# 	  html_escape(pkg_url((
-# 		       map {
-# 			    $_ eq 'archive'?():($_,$param{$_})
-# 		       } keys %param),
-# 			    archive => $key
-# 			   )).qq(">$value reports </a>);
-# }
-# print '<p>See the '.join (' or ',@archive_links)."</p>\n";
-
 print $result;
 
-print pkg_javascript() . "\n";
+print fill_in_template(template=>'cgi/pkgreport_javascript');
 
 print qq(<h2 class="outstanding"><!--<a class="options" href="javascript:toggle(1)">-->Options<!--</a>--></h2>\n);
 
@@ -504,115 +500,10 @@ print option_form(template => 'cgi/pkgreport_options',
 		  variables => $form_option_variables,
 		 );
 
-# print "<h2 class=\"outstanding\"><a class=\"options\" href=\"javascript:toggle(1)\">Options</a></h2>\n";
-# print "<div id=\"a_1\">\n";
-# printf "<form action=\"%s\" method=POST>\n", myurl();
-# 
-# print "<table class=\"forms\">\n";
-# 
-# my ($checked_any, $checked_sui, $checked_ver) = ("", "", "");
-# if (defined $dist) {
-#   $checked_sui = "CHECKED";
-# } elsif (defined $version) {
-#   $checked_ver = "CHECKED";
-# } else {
-#   $checked_any = "CHECKED";
-# }
-# 
-# print "<tr><td>Show bugs applicable to</td>\n";
-# print "    <td><input id=\"b_1_1\" name=vt value=none type=radio onchange=\"enable(1);\" $checked_any>anything</td></tr>\n";
-# print "<tr><td></td>";
-# print "    <td><input id=\"b_1_2\" name=vt value=bysuite type=radio onchange=\"enable(1);\" $checked_sui>" . pkg_htmlselectsuite(1,2,1) . " for " . pkg_htmlselectarch(1,2,2) . "</td></tr>\n";
-# 
-# if (defined $pkg) {
-#     my $v = html_escape($version) || "";
-#     my $pkgsane = html_escape($pkg->[0]);
-#     print "<tr><td></td>";
-#     print "    <td><input id=\"b_1_3\" name=vt value=bypkg type=radio onchange=\"enable(1);\" $checked_ver>$pkgsane version <input id=\"b_1_3_1\" name=version value=\"$v\"></td></tr>\n";
-# } elsif (defined $src) {
-#     my $v = html_escape($version) || "";
-#     my $srcsane = html_escape($src->[0]);
-#     print "<tr><td></td>";
-#     print "    <td><input name=vt value=bysrc type=radio onchange=\"enable(1);\" $checked_ver>$srcsane version <input id=\"b_1_3_1\" name=version value=\"$v\"></td></tr>\n";
-# }
-# print "<tr><td>&nbsp;</td></tr>\n";
-# 
-# my $includetags = html_escape(join(" ", grep { !m/^subj:/i } map {split /[\s,]+/} ref($include)?@{$include}:$include));
-# my $excludetags = html_escape(join(" ", grep { !m/^subj:/i } map {split /[\s,]+/} ref($exclude)?@{$exclude}:$exclude));
-# my $includesubj = html_escape(join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } map {split /[\s,]+/} ref($include)?@{$include}:$include));
-# my $excludesubj = html_escape(join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } map {split /[\s,]+/} ref($exclude)?@{$exclude}:$exclude));
-# my $vismindays = ($mindays == 0 ? "" : $mindays);
-# my $vismaxdays = ($maxdays == -1 ? "" : $maxdays);
-# 
-# my $sel_rmy = ($param{repeatmerged} ? " selected" : "");
-# my $sel_rmn = ($param{repeatmerged} ? "" : " selected");
-# my $sel_ordraw = ($ordering eq "raw" ? " selected" : "");
-# my $sel_ordold = ($ordering eq "oldview" ? " selected" : "");
-# my $sel_ordnor = ($ordering eq "normal" ? " selected" : "");
-# my $sel_ordage = ($ordering eq "age" ? " selected" : "");
-# 
-# my $chk_bugrev = ($bug_rev ? " checked" : "");
-# my $chk_pendrev = ($pend_rev ? " checked" : "");
-# my $chk_sevrev = ($sev_rev ? " checked" : "");
-# 
-# print <<EOF;
-# <tr><td>Only include bugs tagged with </td><td><input name=include value="$includetags"> or that have <input name=includesubj value="$includesubj"> in their subject</td></tr>
-# <tr><td>Exclude bugs tagged with </td><td><input name=exclude value="$excludetags"> or that have <input name=excludesubj value="$excludesubj"> in their subject</td></tr>
-# <tr><td>Only show bugs older than</td><td><input name=mindays value="$vismindays" size=5> days, and younger than <input name=maxdays value="$vismaxdays" size=5> days</td></tr>
-# 
-# <tr><td>&nbsp;</td></tr>
-# 
-# <tr><td>Merged bugs should be</td><td>
-# <select name=repeatmerged>
-# <option value=yes$sel_rmy>displayed separately</option>
-# <option value=no$sel_rmn>combined</option>
-# </select>
-# <tr><td>Categorise bugs by</td><td>
-# <select name=ordering>
-# <option value=raw$sel_ordraw>bug number only</option>
-# <option value=old$sel_ordold>status and severity</option>
-# <option value=normal$sel_ordnor>status, severity and classification</option>
-# <option value=age$sel_ordage>status, severity, classification, and age</option>
-# EOF
-# 
-# {
-# my $any = 0;
-# my $o = $param{"ordering"} || "";
-# for my $n (keys %cats) {
-#     next if ($n eq "normal" || $n eq "oldview");
-#     next if defined $hidden{$n};
-#     unless ($any) {
-#         $any = 1;
-# 	print "<option disabled>------</option>\n";
-#     }
-#     my @names = map { ref($_) eq "HASH" ? $_->{"nam"} : $_ } @{$cats{$n}};
-#     my $name;
-#     if (@names == 1) { $name = $names[0]; }
-#     else { $name = " and " . pop(@names); $name = join(", ", @names) . $name; }
-# 
-#     printf "<option value=\"%s\"%s>%s</option>\n",
-#         $n, ($o eq $n ? " selected" : ""), $name;
-# }
-# }
-# 
-# print "</select></td></tr>\n";
-# 
-# printf "<tr><td>Order bugs by</td><td>%s</td></tr>\n",
-#     pkg_htmlselectyesno("pend-rev", "outstanding bugs first", "done bugs first", $pend_rev);
-# printf "<tr><td></td><td>%s</td></tr>\n",
-#     pkg_htmlselectyesno("sev-rev", "highest severity first", "lowest severity first", $sev_rev);
-# printf "<tr><td></td><td>%s</td></tr>\n",
-#     pkg_htmlselectyesno("bug-rev", "oldest bugs first", "newest bugs first", $bug_rev);
-# 
-# print <<EOF;
-# <tr><td>&nbsp;</td></tr>
-# <tr><td colspan=2><input value="Reload page" type="submit"> with new settings</td></tr>
-# EOF
-# 
-# print "</table></form></div>\n";
-
 print "<hr>\n";
-print "<p>$tail_html";
-
+print fill_in_template(template=>'html/html_tail',
+		       hole_var => {'&strftime' => \&POSIX::strftime,
+				   },
+		      );
 print "</body></html>\n";