X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=39a0ccb5a1961b2a3ef96afd17deda7e49c61d3e;hb=refs%2Fheads%2Fdebian;hp=2de103a674cdbc608888febc7ee96f5f1b860348;hpb=f2846be52134de17fc60ef5fd837d3e6b464eac1;p=debbugs.git diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi index 2de103a..39a0ccb 100755 --- a/cgi/bugreport.cgi +++ b/cgi/bugreport.cgi @@ -19,19 +19,25 @@ use Debbugs::Config qw(:globals :text :config); # for read_log_records use Debbugs::Log qw(:read); -use Debbugs::CGI qw(:url :html :util :cache); +use Debbugs::Log::Spam; +use Debbugs::CGI qw(:url :html :util :cache :usertags); use Debbugs::CGI::Bugreport qw(:all); use Debbugs::Common qw(buglog getmaintainers make_list bug_status); use Debbugs::Packages qw(getpkgsrc); use Debbugs::Status qw(splitpackages split_status_fields get_bug_status isstrongseverity); -use Debbugs::User; - use Scalar::Util qw(looks_like_number); use Debbugs::Text qw(:templates); +use URI::Escape qw(uri_escape_utf8); +use List::AllUtils qw(max); + +if (defined $ENV{REMOTE_ADDR} and $ENV{REMOTE_ADDR} =~ /(?:218\.175\.56\.14|64\.126\.93\.93|72\.17\.168\.57|208\.138\.29\.104|66\.63\.250\.28|71\.70\.91\.207|219\.129\.83\.13)/) { + print "Content-Type: text/html\n\nGo away."; + sleep(5); + exit 0; +} -use List::Util qw(max); use CGI::Simple; @@ -185,18 +191,6 @@ if (defined $param{usertag}) { } } - -my $buglogfh; -if ($buglog =~ m/\.gz$/) { - my $oldpath = $ENV{'PATH'}; - $ENV{'PATH'} = '/bin:/usr/bin'; - $buglogfh = IO::File->new("zcat $buglog |") or quitcgi("open log for $ref: $!"); - $ENV{'PATH'} = $oldpath; -} else { - $buglogfh = IO::File->new($buglog,'r') or quitcgi("open log for $ref: $!"); -} - - my %status; if ($need_status) { %status = %{split_status_fields(get_bug_status(bug=>$ref, @@ -205,14 +199,14 @@ if ($need_status) { } my @records; +my $spam; eval{ - @records = read_log_records(logfh => $buglogfh,inner_file => 1); + @records = read_log_records(bug_num => $ref,inner_file => 1); + $spam = Debbugs::Log::Spam->new(bug_num => $ref); }; if ($@) { quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@"); } -undef $buglogfh; - my $log=''; my $msg_num = 0; @@ -225,7 +219,8 @@ my @log; if ( $mbox ) { binmode(STDOUT,":raw"); my $date = strftime "%a %b %d %T %Y", localtime; - if (@records > 1) { + my $multiple_messages = @records > 1; + if ($multiple_messages) { print $q->header(-type => "application/mbox", -cache_control => 'public, max-age=600', -etag => $etag, @@ -237,10 +232,10 @@ if ( $mbox ) { print $q->header(-type => "message/rfc822", -cache_control => 'public, max-age=86400', -etag => $etag, - content_disposition => qq(attachment; filename="bug_${ref}_message_${msg_num}.mbox"), + content_disposition => qq(attachment; filename="bug_${ref}_message_${msg_num}.eml"), ); } - if ($mbox_status_message and @records > 1) { + if ($mbox_status_message and $multiple_messages) { my $status_message=''; my @status_fields = (retitle => 'subject', package => 'package', @@ -279,14 +274,16 @@ END my $record_wanted_anyway = 0; my ($msg_id) = record_regex($record,qr/^Message-Id:\s+<(.+)>/im); next if defined $msg_id and exists $seen_message_ids{$msg_id}; - next if defined $msg_id and $msg_id =~/handler\..+\.ack(?:info|done)?\@/; + next if not defined $msg and defined $msg_id and $msg_id =~/handler\..+\.ack(?:info|done)?\@/; $record_wanted_anyway = 1 if record_regex($record,qr/^Received: \(at control\)/); next if not $boring and not $record->{type} eq $wanted_type and not $record_wanted_anyway and @records > 1; $seen_message_ids{$msg_id} = 1 if defined $msg_id; + # skip spam messages if we're outputting more than one message + next if $multiple_messages and $spam->is_spam($msg_id); my @lines; if ($record->{inner_file}) { - push @lines, $record->{fh}->getline; - push @lines, $record->{fh}->getline; + push @lines, scalar $record->{fh}->getline; + push @lines, scalar $record->{fh}->getline; chomp $lines[0]; chomp $lines[1]; } else { @@ -299,10 +296,15 @@ END unshift @lines, "From unknown $date"; } print $lines[0]."\n"; - print map { s/^(>*From )/>$1/; $_."\n" } @lines[ 1 .. $#lines ]; + print map { s/^(>*From )/>$1/ if $multiple_messages; + $_."\n" } @lines[ 1 .. $#lines ]; if ($record->{inner_file}) { my $fh = $record->{fh}; - print $_ while (<$fh>); + local $/; + while (<$fh>) { + s/^(>*From )/>$1/gm if $multiple_messages; + print $_; + } } } exit 0; @@ -338,6 +340,9 @@ else { trim_headers => $trim_headers, avatars => $avatars, terse => $terse, + # if we're only looking at one record, allow + # spam to be output + spam => (@records > 1)?$spam:undef, ); } } @@ -423,7 +428,9 @@ $status{blockedby_array} = []; if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) { for my $b (@blockedby) { my %s = %{get_bug_status($b)}; - next if $s{"pending"} eq 'fixed' || length $s{done}; + next if (defined $s{pending} and + $s{"pending"} eq 'fixed') or + length $s{done}; push @{$status{blockedby_array}},{bug_num => $b, subject => $s{subject}, status => \%s}; } } @@ -460,14 +467,21 @@ print fill_in_template(template => 'cgi/bugreport', msg => $msg, isstrongseverity => \&Debbugs::Status::isstrongseverity, html_escape => \&Debbugs::CGI::html_escape, + uri_escape => \&URI::Escape::uri_escape_utf8, looks_like_number => \&Scalar::Util::looks_like_number, make_list => \&Debbugs::Common::make_list, }, hole_var => {'&package_links' => \&Debbugs::CGI::package_links, '&bug_links' => \&Debbugs::CGI::bug_links, '&version_url' => \&Debbugs::CGI::version_url, - '&bug_url' => \&Debbugs::CGI::bug_url, '&strftime' => \&POSIX::strftime, '&maybelink' => \&Debbugs::CGI::maybelink, }, ); + +__END__ + +# Local Variables: +# indent-tabs-mode: nil +# cperl-indent-level: 4 +# End: