X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=9064ca8c0565abf666dd397031f3973f86bc2998;hb=45f1672bfee50ef8c2ec5938979ee409c5c3db87;hp=dcb6482345f984479a7e20499232cb6e0d60c239;hpb=c768b2faebc3e56f8e519e6ea3661c79d954defe;p=debbugs.git diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi index dcb6482..9064ca8 100755 --- a/cgi/bugreport.cgi +++ b/cgi/bugreport.cgi @@ -1,9 +1,15 @@ -#!/usr/bin/perl -wT +#!/usr/bin/perl use warnings; use strict; -use POSIX qw(strftime tzset); +# Sanitize environent for taint +BEGIN{ + delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; +} + + +use POSIX qw(strftime); use MIME::Parser; use MIME::Decoder; use IO::Scalar; @@ -13,24 +19,33 @@ use Debbugs::Config qw(:globals :text); # for read_log_records use Debbugs::Log qw(read_log_records); -use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message); use Debbugs::CGI qw(:url :html :util); use Debbugs::CGI::Bugreport qw(:all); -use Debbugs::Common qw(buglog getmaintainers); +use Debbugs::Common qw(buglog getmaintainers make_list bug_status); use Debbugs::Packages qw(getpkgsrc); -use Debbugs::Status qw(splitpackages get_bug_status isstrongseverity); +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 List::Util qw(max); + + use CGI::Simple; my $q = new CGI::Simple; +# STDOUT should be using the utf8 io layer +binmode(STDOUT,':raw:encoding(UTF-8)'); my %param = cgi_parameters(query => $q, single => [qw(bug msg att boring terse), qw(reverse mbox mime trim), qw(mboxstat mboxmaint archive), - qw(repeatmerged) + qw(repeatmerged avatars), ], - default => {msg => '', + default => {# msg => '', boring => 'no', terse => 'no', reverse => 'no', @@ -40,25 +55,76 @@ my %param = cgi_parameters(query => $q, mboxmaint => 'no', archive => 'no', repeatmerged => 'yes', + avatars => 'yes', }, ); # This is craptacular. -my $tail_html; - my $ref = $param{bug} or quitcgi("No bug number"); $ref =~ /(\d+)/ or quitcgi("Invalid bug number"); $ref = $1; my $short = "#$ref"; -my $msg = $param{'msg'}; -my $att = $param{'att'}; +my ($msg) = $param{msg} =~ /^(\d+)$/ if exists $param{msg}; +my ($att) = $param{att} =~ /^(\d+)$/ if exists $param{att}; my $boring = $param{'boring'} eq 'yes'; my $terse = $param{'terse'} eq 'yes'; my $reverse = $param{'reverse'} eq 'yes'; my $mbox = $param{'mbox'} eq 'yes'; my $mime = $param{'mime'} eq 'yes'; +my $avatars = $param{avatars} eq 'yes'; + +my %bugusertags; +my %ut; +my %seen_users; -my $trim_headers = ($param{trim} || ($msg?'no':'yes')) eq 'yes'; +my $buglog = buglog($ref); +my $bug_status = bug_status($ref); +if (not defined $buglog or not defined $bug_status) { + print $q->header(-status => "404 No such bug", + -type => "text/html", + -charset => 'utf-8', + ); + print fill_in_template(template=>'cgi/no_such_bug', + variables => {modify_time => strftime('%a, %e %b %Y %T UTC', gmtime), + bug_num => $ref, + }, + ); + exit 0; +} + +# the log should almost always be newer, but just in case +my $log_mtime = +(stat $buglog)[9] || time; +my $status_mtime = +(stat $bug_status)[9] || time; +my $mtime = strftime '%a, %d %b %Y %T GMT', gmtime(max($status_mtime,$log_mtime)); + +if ($q->request_method() eq 'HEAD' and not defined($att) and not $mbox) { + print $q->header(-type => "text/html", + -charset => 'utf-8', + (length $mtime)?(-last_modified => $mtime):(), + ); + exit 0; +} + +for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) { + next unless length($user); + add_user($user,\%ut,\%bugusertags,\%seen_users); +} + +if (defined $param{usertag}) { + for my $usertag (make_list($param{usertag})) { + my %select_ut = (); + my ($u, $t) = split /:/, $usertag, 2; + Debbugs::User::read_usertags(\%select_ut, $u); + unless (defined $t && $t ne "") { + $t = join(",", keys(%select_ut)); + } + add_user($u,\%ut,\%bugusertags,\%seen_users); + push @{$param{tag}}, split /,/, $t; + } +} + + +my $trim_headers = ($param{trim} || ((defined $msg and $msg)?'no':'yes')) eq 'yes'; my $mbox_status_message = $param{mboxstat} eq 'yes'; my $mbox_maint = $param{mboxmaint} eq 'yes'; @@ -70,31 +136,24 @@ $mbox = 1 if $mbox_status_message or $mbox_maint; my $archive = $param{'archive'} eq 'yes'; my $repeatmerged = $param{'repeatmerged'} eq 'yes'; -my $buglog = buglog($ref); - -if (defined $ENV{REQUEST_METHOD} and $ENV{REQUEST_METHOD} eq 'HEAD' and not defined($att) and not $mbox) { - print "Content-Type: text/html; charset=utf-8\n"; - my @stat = stat $buglog; - if (@stat) { - my $mtime = strftime '%a, %d %b %Y %T GMT', gmtime($stat[9]); - print "Last-Modified: $mtime\n"; - } - print "\n"; - exit 0; -} my $buglogfh; if ($buglog =~ m/\.gz$/) { my $oldpath = $ENV{'PATH'}; $ENV{'PATH'} = '/bin:/usr/bin'; - $buglogfh = new IO::File "zcat $buglog |" or &quitcgi("open log for $ref: $!"); + $buglogfh = IO::File->new("zcat $buglog |") or quitcgi("open log for $ref: $!"); $ENV{'PATH'} = $oldpath; } else { - $buglogfh = new IO::File "<$buglog" or &quitcgi("open log for $ref: $!"); + $buglogfh = IO::File->new($buglog,'r') or quitcgi("open log for $ref: $!"); } +my %status = + %{split_status_fields(get_bug_status(bug=>$ref, + bugusertags => \%bugusertags, + ))}; + my @records; eval{ @records = read_log_records($buglogfh); @@ -108,21 +167,26 @@ undef $buglogfh; my $log=''; my $msg_num = 0; my $skip_next = 0; -if (looks_like_number($msg) and ($msg-1) <= $#records) { +if (defined($msg) and ($msg-1) <= $#records) { @records = ($records[$msg-1]); $msg_num = $msg - 1; } my @log; if ( $mbox ) { + binmode(STDOUT,":raw"); my $date = strftime "%a %b %d %T %Y", localtime; if (@records > 1) { - print qq(Content-Disposition: attachment; filename="bug_${ref}.mbox"\n); - print "Content-Type: text/plain\n\n"; + print $q->header(-type => "text/plain", + content_disposition => qq(attachment; filename="bug_${ref}.mbox"), + (length $mtime)?(-last_modified => $mtime):(), + ); } else { $msg_num++; - print qq(Content-Disposition: attachment; filename="bug_${ref}_message_${msg_num}.mbox"\n); - print "Content-Type: message/rfc822\n\n"; + print $q->header(-type => "message/rfc822", + content_disposition => qq(attachment; filename="bug_${ref}_message_${msg_num}.mbox"), + (length $mtime)?(-last_modified => $mtime):(), + ); } if ($mbox_status_message and @records > 1) { my $status_message=''; @@ -162,11 +226,11 @@ END # we want to include control messages anyway my $record_wanted_anyway = 0; my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im; - next if exists $seen_message_ids{$msg_id}; - next if $msg_id =~/handler\..+\.ack(?:info|done)?\@/; + next if defined $msg_id and exists $seen_message_ids{$msg_id}; + next if defined $msg_id and $msg_id =~/handler\..+\.ack(?:info|done)?\@/; $record_wanted_anyway = 1 if $record->{text} =~ /^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; + $seen_message_ids{$msg_id} = 1 if defined $msg_id; my @lines = split( "\n", $record->{text}, -1 ); if ( $lines[ 1 ] =~ m/^From / ) { my $tmp = $lines[ 0 ]; @@ -183,6 +247,18 @@ END } else { + if (defined $att and defined $msg and @records) { + binmode(STDOUT,":raw"); + $msg_num++; + print handle_email_message($records[0]->{text}, + ref => $ref, + msg_num => $msg_num, + att => $att, + msg => $msg, + trim_headers => $trim_headers, + ); + exit 0; + } my %seen_msg_ids; for my $record (@records) { $msg_num++; @@ -191,7 +267,11 @@ else { next; } $skip_next = 1 if $record->{type} eq 'html' and not $boring; - push @log, handle_record($record,$ref,$msg_num,\%seen_msg_ids); + push @log, handle_record($record,$ref,$msg_num, + \%seen_msg_ids, + trim_headers => $trim_headers, + avatars => $avatars, + ); } } @@ -211,218 +291,124 @@ my $tpack; my $tmain; my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime; -$tail_html = $gHTMLTail; -$tail_html =~ s/SUBSTITUTE_DTIME/$dtime/; -my %status = %{get_bug_status(bug=>$ref)}; unless (%status) { - print "Content-Type: text/html; charset=utf-8\n\n"; + print $q->header(-type => "text/html", + -charset => 'utf-8', + (length $mtime)?(-last_modified => $mtime):(), + ); print fill_in_template(template=>'cgi/no_such_bug', variables => {modify_time => $dtime, bug_num => $ref, }, - ) + ); exit 0; } -$|=1; +#$|=1; -$tpack = lc $status{'package'}; -my @tpacks = splitpackages($tpack); -if ($status{severity} eq 'normal') { - $showseverity = ''; -} elsif (isstrongseverity($status{severity})) { - $showseverity = "Severity: $status{severity};\n"; -} else { - $showseverity = "Severity: $status{severity};\n"; -} - -if (@{$status{found_versions}} or @{$status{fixed_versions}}) { - $indexentry.= q(
}; -} +my @packages = make_list($status{package}); -$indexentry .= "Reply ), - qq(or subscribe ), - qq(to this bug.
\n); - print qq(); - printf qq(View this report as an mbox folder, ). - qq(status mbox, maintainer mbox
Send a report that this bug log contains spam.
\n