@EXPORT = ();
%EXPORT_TAGS = ();
- @EXPORT_OK = (qw(get_bugs count_bugs newest_bug));
+ @EXPORT_OK = (qw(get_bugs count_bugs newest_bug bug_filter));
$EXPORT_TAGS{all} = [@EXPORT_OK];
}
use Debbugs::Config qw(:config);
use Params::Validate qw(validate_with :types);
use IO::File;
-use Debbugs::Status qw(splitpackages);
+use Debbugs::Status qw(splitpackages get_bug_status);
use Debbugs::Packages qw(getsrcpkgs);
use Debbugs::Common qw(getparsedaddrs getmaintainers getmaintainers_reverse make_list);
use Fcntl qw(O_RDONLY);
use MLDBM qw(DB_File Storable);
+use List::Util qw(first);
+use Carp;
=head2 get_bugs
return $next_number+0;
}
+=head2 bug_filter
+
+ bug_filter
+
+Allows filtering bugs on commonly used criteria
+
+=cut
+
+sub bug_filter {
+ my %param = validate_with(params => \@_,
+ spec => {bug => {type => SCALAR,
+ regex => qr/^\d+$/,
+ },
+ status => {type => HASHREF,
+ optional => 1,
+ },
+ seen_merged => {type => HASHREF,
+ optional => 1,
+ },
+ repeat_merged => {type => BOOLEAN,
+ optional => 1,
+ },
+ include => {type => HASHREF,
+ optional => 1,
+ },
+ exclude => {type => HASHREF,
+ optional => 1,
+ },
+ min_days => {type => SCALAR,
+ optional => 1,
+ },
+ max_days => {type => SCALAR,
+ optional => 1,
+ },
+ },
+ );
+ if (exists $param{repeat_merged} and
+ not $param{repeat_merged} and
+ not defined $param{seen_merged}) {
+ croak "repeat_merged false requires seen_merged to be passed";
+ }
+
+ if (not exists $param{status}) {
+ my $location = getbuglocation($param{bug}, 'summary');
+ return 0 if not defined $location or not length $location;
+ $param{status} = readbug( $param{bug}, $location );
+ return 0 if not defined $param{status};
+ }
+
+ if (exists $param{include}) {
+ return 1 if (!__bug_matches($param{include}, $param{status}));
+ }
+ if (exists $param{exclude}) {
+ return 1 if (__bug_matches($param{exclude}, $param{status}));
+ }
+ if (exists $param{repeat_merged} and not $param{repeat_merged}) {
+ my @merged = sort {$a<=>$b} $param{bug}, split(/ /, $param{status}{mergedwith});
+ return 1 if first {defined $_} @{$param{seen_merged}}{@merged};
+ @{$param{seen_merged}}{@merged} = (1) x @merged;
+ }
+ my $daysold = int((time - $param{status}{date}) / 86400); # seconds to days
+ if (exists $param{min_days}) {
+ return 1 unless $param{min_days} <= $daysold;
+ }
+ if (exists $param{max_days}) {
+ return 1 unless $param{max_days} == -1 or
+ $param{max_days} >= $daysold;
+ }
+ return 0;
+}
+
=head2 get_bugs_by_idx
return @bugs;
}
+=head1 PRIVATE FUNCTIONS
+
+=head2 __handle_pkg_src_and_maint
+
+ my @packages = __handle_pkg_src_and_maint(map {exists $param{$_}?($_,$param{$_}):()}
+ qw(package src maint)
+ );
+
+Turn package/src/maint into a list of packages
+
+=cut
+
sub __handle_pkg_src_and_maint{
my %param = validate_with(params => \@_,
spec => {package => {type => SCALAR|ARRAYREF,
return grep {$packages{$_} >= $package_keys} keys %packages;
}
+my %field_match = (
+ 'subject' => \&__contains_field_match,
+ 'tags' => sub {
+ my ($field, $values, $status) = @_;
+ my %values = map {$_=>1} @$values;
+ foreach my $t (split /\s+/, $status->{$field}) {
+ return 1 if (defined $values{$t});
+ }
+ return 0;
+ },
+ 'severity' => \&__exact_field_match,
+ 'pending' => \&__exact_field_match,
+ 'originator' => \&__contains_field_match,
+ 'forwarded' => \&__contains_field_match,
+ 'owner' => \&__contains_field_match,
+);
+
+sub __bug_matches {
+ my ($hash, $status) = @_;
+ foreach my $key( keys( %$hash ) ) {
+ my $value = $hash->{$key};
+ my $sub = $field_match{$key};
+ return 1 if ($sub->($key, $value, $status));
+ }
+ return 0;
+}
+
+sub __exact_field_match {
+ my ($field, $values, $status) = @_;
+ my @values = @$values;
+ my @ret = grep {$_ eq $status->{$field} } @values;
+ $#ret != -1;
+}
+
+sub __contains_field_match {
+ my ($field, $values, $status) = @_;
+ foreach my $data (@$values) {
+ return 1 if (index($status->{$field}, $data) > -1);
+ }
+ return 0;
+}
+
+
+
+
1;
use Debbugs::Config;
use CGI::Simple;
-use Debbugs::CGI qw(cgi_parameters);
-require './common.pl';
+use Debbugs::CGI qw(:util :url :html);
+use Debbugs::Common qw(getmaintainers);
+use Debbugs::Bugs qw(count_bugs);
+use Debbugs::Status qw(:status);
nice(5);
my %sortkey = ();
if ($indexon eq "pkg") {
$tag = "package";
- %count = countbugs(sub {my %d=@_; return splitpackages($d{"pkg"})});
+ %count = count_bugs(function => sub {my %d=@_; return splitpackages($d{"pkg"})});
if (defined $param{first}) {
%count = map {
if (/^\Q$param{first}\E/) {
foreach my $pkg (keys %count) {
$sortkey{$pkg} = lc $pkg;
$htmldescrip{$pkg} = sprintf('<a href="%s">%s</a> (%s)',
- pkgurl($pkg),
- htmlsanit($pkg),
- htmlmaintlinks(sub { $_[0] == 1 ? 'maintainer: '
+ pkg_url(pkg => $pkg),
+ html_escape($pkg),
+ htmlize_maintlinks(sub { $_[0] == 1 ? 'maintainer: '
: 'maintainers: ' },
$maintainers{$pkg}));
}
}
} keys %count;
}
- %count = countbugs(sub {my %d=@_;
+ %count = countbugs(function => sub {my %d=@_;
return map {
$pkgsrc->{$_} || $_
} splitpackages($d{"pkg"});
$sortkey{$src} = lc $src;
$htmldescrip{$src} = sprintf('<a href="%s">%s</a> (%s)',
srcurl($src),
- htmlsanit($src),
- htmlmaintlinks(sub { $_[0] == 1 ? 'maintainer: '
+ html_escape($src),
+ htmlize_maintlinks(sub { $_[0] == 1 ? 'maintainer: '
: 'maintainers: ' },
$maintainers{$src}));
}
} elsif ($indexon eq "maint") {
$tag = "maintainer";
my %email2maint = ();
- %count = countbugs(sub {my %d=@_;
+ %count = count_bugs(function => sub {my %d=@_;
return map {
my @me = getparsedaddrs($maintainers{$_});
foreach my $addr (@me) {
$note .= "different addresses.</p>\n";
foreach my $maint (keys %count) {
$sortkey{$maint} = lc $email2maint{$maint} || "(unknown)";
- $htmldescrip{$maint} = htmlmaintlinks('', $email2maint{$maint});
+ $htmldescrip{$maint} = htmlize_maintlinks('', $email2maint{$maint});
}
} elsif ($indexon eq "submitter") {
$tag = "submitter";
my %fullname = ();
- %count = countbugs(sub {my %d=@_;
+ %count = count_bugs(function => sub {my %d=@_;
my @se = getparsedaddrs($d{"submitter"} || "");
foreach my $addr (@se) {
$fullname{$addr->address} = $addr->format
$sortkey{$sub} = lc $fullname{$sub};
$htmldescrip{$sub} = sprintf('<a href="%s">%s</a>',
submitterurl($sub),
- htmlsanit($fullname{$sub}));
+ html_escape($fullname{$sub}));
}
$note = "<p>Note that people may use different email accounts for\n";
$note .= "different bugs, so there may be other reports filed under\n";
$note .= "different addresses.</p>\n";
} elsif ($indexon eq "tag") {
$tag = "tag";
- %count = countbugs(sub {my %d=@_; return split ' ', $d{tags}; });
+ %count = count_bugs(function => sub {my %d=@_; return split ' ', $d{tags}; });
if (defined $param{first}) {
%count = map {
if (/^\Q$param{first}\E/) {
$sortkey{$keyword} = lc $keyword;
$htmldescrip{$keyword} = sprintf('<a href="%s">%s</a>',
tagurl($keyword),
- htmlsanit($keyword));
+ html_escape($keyword));
}
}
package debbugs;
+use warnings;
use strict;
use POSIX qw(strftime nice);
-require './common.pl';
-
use Debbugs::Config qw(:globals :text :config);
use Debbugs::User;
use Debbugs::CGI qw(version_url maint_decode);
-use Debbugs::Common qw(getparsedaddrs :date make_list);
-use Debbugs::Bugs qw(get_bugs);
+use Debbugs::Common qw(getparsedaddrs :date make_list getmaintainers);
+use Debbugs::Bugs qw(get_bugs bug_filter);
use Debbugs::Packages qw(getsrcpkgs getpkgsrc get_versions);
-use Debbugs::Status qw(get_bug_status);
+use Debbugs::Status qw(:status);
+use Debbugs::CGI qw(:all);
use vars qw($gPackagePages $gWebDomain %gSeverityDisplay @gSeverityList);
nice(5);
-my $userAgent = detect_user_agent();
-
use CGI::Simple;
my $q = new CGI::Simple;
-#my %param = readparse();
-
-my %param = cgi_parameters(query => $q,
- single => [qw(ordering archive repeatmerged),
- qw(bug-rev pend-rev sev-rev),
- qw(maxdays mindays version),
- qw(data which dist),
- ],
- default => {ordering => 'normal',
- archive => 0,
- repeatmerged => 1,
- },
- );
+
+our %param = cgi_parameters(query => $q,
+ single => [qw(ordering archive repeatmerged),
+ qw(bug-rev pend-rev sev-rev),
+ qw(maxdays mindays version),
+ qw(data which dist),
+ ],
+ default => {ordering => 'normal',
+ archive => 0,
+ repeatmerged => 1,
+ },
+ );
# map from yes|no to 1|0
for my $key (qw(repeatmerged bug-rev pend-rev sev-rev)) {
}
-my $repeatmerged = ($param{'repeatmerged'} || "yes") eq "yes";
my $archive = ($param{'archive'} || "no") eq "yes";
my $include = $param{'&include'} || $param{'include'} || "";
my $exclude = $param{'&exclude'} || $param{'exclude'} || "";
my $version = $param{'version'} || undef;
my $dist = $param{'dist'} || undef;
my $arch = $param{'arch'} || undef;
-my $show_list_header = ($param{'show_list_header'} || $userAgent->{'show_list_header'} || "yes" ) eq "yes";
-my $show_list_footer = ($param{'show_list_footer'} || $userAgent->{'show_list_footer'} || "yes" ) eq "yes";
{
if (defined $param{'vt'}) {
);
my @select_key = (qw(submitter maint pkg package src usertag),
- qw(status tag maintenc owner)
+ qw(status tag maintenc owner severity)
);
if (exists $param{which} and exists $param{data}) {
my $Archived = $archive ? " Archived" : "";
-my $this = "";
+our $this = munge_url('pkgreport.cgi?',
+ %param,
+ );
my %indexentry;
my %strings = ();
push @{$bugusertags{$b}}, $t;
}
}
- set_option("bugusertags", \%bugusertags);
+# set_option("bugusertags", \%bugusertags);
}
my @bugs;
# Set the title sanely and clean up parameters
my @title;
-use Data::Dumper;
-print STDERR Dumper(\%param);
while (my ($key,$value) = splice @search_key_order, 0, 2) {
next unless exists $param{$key};
my @entries = ();
$title .= " in $dist";
}
-$title = htmlsanit($title);
+$title = html_escape($title);
my @names; my @prior; my @order;
determine_ordering();
sub output_package_info{
my ($srcorbin,$package) = @_;
- my $showpkg = htmlsanit($package);
+ my $showpkg = html_escape($package);
my $maintainers = getmaintainers();
my $maint = $maintainers->{$package};
if (defined $maint) {
print '<p>';
- print htmlmaintlinks(sub { $_[0] == 1 ? "Maintainer for $showpkg is "
+ print htmlize_maintlinks(sub { $_[0] == 1 ? "Maintainer for $showpkg is "
: "Maintainers for $showpkg are "
},
$maint);
print "<p>You may want to refer to the following individual bug pages:\n";
}
#push @pkgs, $src if ( $src && !grep(/^\Q$src\E$/, @pkgs) );
- print join( ", ", map( "<A href=\"" . pkgurl($_) . "\">$_</A>", @pkgs ) );
+ print join( ", ", map( "<A href=\"" . html_escape(munge_url($this,package=>$_)) . "\">$_</A>", @pkgs ) );
print ".\n";
}
my @references;
} else {
if ($package and defined $gPackagePages) {
push @references, sprintf "to the <a href=\"%s\">%s package page</a>",
- urlsanit("http://${debbugs::gPackagePages}/$package"), htmlsanit("$package");
+ html_escape("http://${debbugs::gPackagePages}/$package"), html_escape("$package");
}
if (defined $gSubscriptionDomain) {
my $ptslink = $package ? $srcforpkg : $src;
}
# Only output this if the source listing is non-trivial.
if ($srcorbin eq 'binary' and $srcforpkg) {
- push @references, sprintf "to the source package <a href=\"%s\">%s</a>'s bug page", srcurl($srcforpkg), htmlsanit($srcforpkg);
+ push @references, sprintf "to the source package <a href=\"%s\">%s</a>'s bug page", html_escape(munge_url($this,src=>$srcforpkg,package=>[])), html_escape($srcforpkg);
}
}
if (@references) {
if (defined $param{maint} || defined $param{maintenc}) {
print "<p>If you find a bug not listed here, please\n";
printf "<a href=\"%s\">report it</a>.</p>\n",
- urlsanit("http://${debbugs::gWebDomain}/Reporting${debbugs::gHTMLSuffix}");
+ html_escape("http://${debbugs::gWebDomain}/Reporting${debbugs::gHTMLSuffix}");
}
if (not $maint and not @bugs) {
print "<p>There is no record of the " .
- ($srcorbin eq 'binary' ? htmlsanit($package) . " package"
- : htmlsanit($src) . " source package").
+ ($srcorbin eq 'binary' ? html_escape($package) . " package"
+ : html_escape($src) . " source package").
", and no bugs have been filed against it.</p>";
$showresult = 0;
}
while (my ($key,$value) = each %archive_values) {
next if $key eq lc($param{archive});
push @archive_links, qq(<a href=").
- urlsanit(pkg_url((
+ html_escape(pkg_url((
map {
$_ eq 'archive'?():($_,$param{$_})
} keys %param),
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 = htmlsanit($version) || "";
- my $pkgsane = htmlsanit($pkg);
+ my $v = html_escape($version) || "";
+ my $pkgsane = html_escape($pkg);
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 = htmlsanit($version) || "";
- my $srcsane = htmlsanit($src);
+ my $v = html_escape($version) || "";
+ my $srcsane = html_escape($src);
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> </td></tr>\n";
-my $includetags = htmlsanit(join(" ", grep { !m/^subj:/i } map {split /[\s,]+/} ref($include)?@{$include}:$include));
-my $excludetags = htmlsanit(join(" ", grep { !m/^subj:/i } map {split /[\s,]+/} ref($exclude)?@{$exclude}:$exclude));
-my $includesubj = htmlsanit(join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } map {split /[\s,]+/} ref($include)?@{$include}:$include));
-my $excludesubj = htmlsanit(join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } map {split /[\s,]+/} ref($exclude)?@{$exclude}:$exclude));
+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 = ($repeatmerged ? " selected" : "");
-my $sel_rmn = ($repeatmerged ? "" : " selected");
+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 $showversions = '';
if (@{$status{found_versions}}) {
my @found = @{$status{found_versions}};
- $showversions .= join ', ', map {s{/}{ }; htmlsanit($_)} @found;
+ $showversions .= join ', ', map {s{/}{ }; html_escape($_)} @found;
}
if (@{$status{fixed_versions}}) {
$showversions .= '; ' if length $showversions;
$showversions .= '<strong>fixed</strong>: ';
my @fixed = @{$status{fixed_versions}};
- $showversions .= join ', ', map {s{/}{ }; htmlsanit($_)} @fixed;
+ $showversions .= join ', ', map {s{/}{ }; html_escape($_)} @fixed;
}
$result .= ' (<a href="'.
version_url($status{package},
$result .= $showseverity;
$result .= pkg_htmladdresslinks("Reported by: ", \&submitterurl,
$status{originator});
- $result .= ";\nOwned by: " . htmlsanit($status{owner})
+ $result .= ";\nOwned by: " . html_escape($status{owner})
if length $status{owner};
$result .= ";\nTags: <strong>"
- . htmlsanit(join(", ", sort(split(/\s+/, $status{tags}))))
+ . html_escape(join(", ", sort(split(/\s+/, $status{tags}))))
. "</strong>"
if (length($status{tags}));
split(/ /,$status{blocks}));
if (length($status{done})) {
- $result .= "<br><strong>Done:</strong> " . htmlsanit($status{done});
+ $result .= "<br><strong>Done:</strong> " . html_escape($status{done});
my $days = bug_archiveable(bug => $status{id},
status => \%status,
days_until => 1,
foreach my $bug (@bugs) {
my %status = %{get_bug_status(bug=>$bug,
(exists $param{dist}?(dist => $param{dist}):()),
+ usertags => \%bugusertags,
+ (exists $param{version}?(version => $param{version}):()),
+ (exists $param{arch}?(arch => $param{arch}):()),
)};
next unless %status;
- next if bugfilter($bug, %status);
+ next if bug_filter(bug => $bug,
+ status => \%status,
+ (exists $param{repeatmerged}?(repeat_merged => $param{repeatmerged}):()),
+ seen_merged => \%seenmerged,
+ );
my $html = sprintf "<li><a href=\"%s\">#%d: %s</a>\n<br>",
- bugurl($bug), $bug, htmlsanit($status{subject});
+ bug_url($bug), $bug, html_escape($status{subject});
$html .= pkg_htmlindexentrystatus(\%status) . "\n";
push @status, [ $bug, \%status, $html ];
}
$title .= join("; ", grep {($_ || "") ne ""}
map { $title[$_]->[$ttl[$_]] } 1..$#ttl);
}
- $title = htmlsanit($title);
+ $title = html_escape($title);
my $count = $count{"_$order"};
my $bugs = $count == 1 ? "bug" : "bugs";
return 'Package' . (@pkglist > 1 ? 's' : '') . ': ' .
join(', ',
map {
- '<a class="submitter" href="' . pkgurl($_) . '">' .
- $openstrong . htmlsanit($_) . $closestrong . '</a>'
+ '<a class="submitter" href="' . munge_url($this,src=>[],package=>$_) . '">' .
+ $openstrong . html_escape($_) . $closestrong . '</a>'
} @pkglist
);
}
}
sub myurl {
- return urlsanit(pkg_url(map {exists $param{$_}?($_,$param{$_}):()}
+ return html_escape(pkg_url(map {exists $param{$_}?($_,$param{$_}):()}
qw(archive repeatmerged mindays maxdays),
qw(version dist arch pkg src tag maint submitter)
)
projects / debbugs.git / commitdiff