X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=cgi%2Fpkgreport.cgi;h=d27caa13dc39c58dd5dc0a7216d1086fd39c32a1;hb=fdffad3b44892e2049aa2bc2588bf4ee991360ef;hp=3ddad9bf17431dc1f97cd5cc192d5104a5448fe0;hpb=ed5e21f46b69d8ad26136eebe086afbb76ebc28b;p=debbugs.git diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index 3ddad9b..d27caa1 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -13,7 +13,14 @@ 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 List::AllUtils qw(uniq); use Debbugs::Config qw(:globals :text :config); @@ -32,6 +39,14 @@ use Debbugs::CGI::Pkgreport qw(:all); use Debbugs::Text qw(:templates); +use Debbugs::DB; + +my $s; +if (defined $config{database}) { + $s = Debbugs::DB->connect($config{database}) or + die "Unable to connect to DB"; +} + use CGI::Simple; my $q = new CGI::Simple; @@ -54,6 +69,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, ); @@ -77,7 +93,8 @@ 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}; @@ -93,6 +110,16 @@ if (exists $param{form_options} and defined $param{form_options}) { 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}){ @@ -210,7 +237,8 @@ our %cats = ( "ord" => [2,3,4,1,0,5], } ], "oldview" => [ qw(status severity) ], - "normal" => [ qw(status severity classification) ], + "normal" => [ qw(status severity classification) ], + raw => [{nam => 'Raw',def => 'Raw'}], ); if (exists $param{which} and exists $param{data}) { @@ -226,21 +254,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}) { @@ -251,12 +280,13 @@ 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; } } -quitcgi("You have to choose something to select by") unless grep {exists $param{$_}} keys %package_search_keys; +quitcgi("You have to choose something to select by", '400 Bad Request') + unless grep {exists $param{$_}} keys %package_search_keys; my $Archived = $param{archive} ? " Archived" : ""; @@ -268,42 +298,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 @@ -323,7 +317,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}; } @@ -392,8 +387,27 @@ my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title); grep {$_ ne 'newest'} keys %package_search_keys, 'archive'), usertags => \%ut, + defined $s?(schema => $s):(), ); +# 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, + defined $s?(schema => $s):(), + ); +} + +# filter out included or excluded bugs + + if (defined $param{version}) { $title .= " at version $param{version}"; } @@ -432,9 +446,11 @@ my $result = pkg_htmlizebugs(bugs => \@bugs, exclude => $exclude, this => $this, options => \%param, + defined $s?(schema => $s):(), (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 "\n"; @@ -458,7 +474,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, @@ -486,145 +502,25 @@ 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($value reports ); -# } -# print '
See the '.join (' or ',@archive_links)."
\n"; - print $result; -print pkg_javascript() . "\n"; +print fill_in_template(template=>'cgi/pkgreport_javascript'); print qq($tail_html"; - +print fill_in_template(template=>'html/html_tail', + hole_var => {'&strftime' => \&POSIX::strftime, + }, + ); print "