-#!/usr/bin/perl -wT
+#!/usr/bin/perl
use warnings;
use strict;
+# Sanitize environent for taint
+BEGIN{
+ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+}
+
+
use POSIX qw(strftime);
use MIME::Parser;
use MIME::Decoder;
use Debbugs::Config qw(:globals :text);
# for read_log_records
-use Debbugs::Log qw(read_log_records);
+use Debbugs::Log qw(:read);
use Debbugs::CGI qw(:url :html :util);
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 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 => '',
boring => 'no',
mboxmaint => 'no',
archive => 'no',
repeatmerged => 'yes',
+ avatars => 'yes',
},
);
# This is craptacular.
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 $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';
+$mbox = 1 if $mbox_status_message or $mbox_maint;
+
+# Not used by this script directly, but fetch these so that pkgurl() and
+# friends can propagate them correctly.
+my $archive = $param{'archive'} eq 'yes';
+my $repeatmerged = $param{'repeatmerged'} eq 'yes';
my %bugusertags;
my %ut;
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;
+ no_such_bug($q,$ref);
+}
+
+sub no_such_bug {
+ my ($q,$ref) = @_;
+ print $q->header(-status => 404,
+ -content_type => "text/html",
+ -charset => 'utf-8',
+ -cache_control => 'public, max-age=600',
+ );
+ 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 $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';
-$mbox = 1 if $mbox_status_message or $mbox_maint;
-
-
-# Not used by this script directly, but fetch these so that pkgurl() and
-# friends can propagate them correctly.
-my $archive = $param{'archive'} eq 'yes';
-my $repeatmerged = $param{'repeatmerged'} eq 'yes';
-
-
-
my $buglogfh;
if ($buglog =~ m/\.gz$/) {
my $oldpath = $ENV{'PATH'};
my @records;
eval{
- @records = read_log_records($buglogfh);
+ @records = read_log_records(logfh => $buglogfh,inner_file => 1);
};
if ($@) {
quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@");
}
my @log;
if ( $mbox ) {
+ binmode(STDOUT,":raw");
my $date = strftime "%a %b %d %T %Y", localtime;
if (@records > 1) {
print $q->header(-type => "text/plain",
my $wanted_type = $mbox_maint?'recips':'incoming-recv';
# 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)?\@/;
- $record_wanted_anyway = 1 if $record->{text} =~ /^Received: \(at control\)/;
+ 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)?\@/;
+ $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;
- my @lines = split( "\n", $record->{text}, -1 );
+ $seen_message_ids{$msg_id} = 1 if defined $msg_id;
+ my @lines;
+ if ($record->{inner_file}) {
+ push @lines, $record->{fh}->getline;
+ push @lines, $record->{fh}->getline;
+ chomp $lines[0];
+ chomp $lines[1];
+ } else {
+ @lines = split( "\n", $record->{text}, -1 );
+ }
if ( $lines[ 1 ] =~ m/^From / ) {
- my $tmp = $lines[ 0 ];
- $lines[ 0 ] = $lines[ 1 ];
- $lines[ 1 ] = $tmp;
+ @lines = reverse @lines;
}
if ( !( $lines[ 0 ] =~ m/^From / ) ) {
unshift @lines, "From unknown $date";
- }
- map { s/^(>*From )/>$1/ } @lines[ 1 .. $#lines ];
- print join( "\n", @lines ) . "\n";
+ }
+ print $lines[0]."\n";
+ print map { s/^(>*From )/>$1/; $_."\n" } @lines[ 1 .. $#lines ];
+ if ($record->{inner_file}) {
+ my $fh = $record->{fh};
+ print $_ while (<$fh>);
+ }
}
exit 0;
}
else {
if (defined $att and defined $msg and @records) {
+ binmode(STDOUT,":raw");
$msg_num++;
- print handle_email_message($records[0]->{text},
+ print handle_email_message($records[0],
ref => $ref,
msg_num => $msg_num,
att => $att,
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,
+ );
}
}
my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime;
unless (%status) {
- 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;
+ no_such_bug($q,$ref);
}
#$|=1;
-my %package;
-my @packages = splitpackages($status{package});
-
-foreach my $pkg (@packages) {
- if ($pkg =~ /^src\:/) {
- my ($srcpkg) = $pkg =~ /^src:(.*)/;
- $package{$pkg} = {maintainer => exists($maintainer{$srcpkg}) ? $maintainer{$srcpkg} : '(unknown)',
- source => $srcpkg,
- package => $pkg,
- is_source => 1,
- };
- }
- else {
- $package{$pkg} = {maintainer => exists($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)',
- exists($pkgsrc{$pkg}) ? (source => $pkgsrc{$pkg}) : (),
- package => $pkg,
- };
- }
+
+my @packages = make_list($status{package});
+
+
+my %packages_affects;
+for my $p_a (qw(package affects)) {
+ foreach my $pkg (make_list($status{$p_a})) {
+ if ($pkg =~ /^src\:/) {
+ my ($srcpkg) = $pkg =~ /^src:(.*)/;
+ $packages_affects{$p_a}{$pkg} =
+ {maintainer => exists($maintainer{$srcpkg}) ? $maintainer{$srcpkg} : '(unknown)',
+ source => $srcpkg,
+ package => $pkg,
+ is_source => 1,
+ };
+ }
+ else {
+ $packages_affects{$p_a}{$pkg} =
+ {maintainer => exists($maintainer{$pkg}) ? $maintainer{$pkg} : '(unknown)',
+ exists($pkgsrc{$pkg}) ? (source => $pkgsrc{$pkg}) : (),
+ package => $pkg,
+ };
+ }
+ }
}
# fixup various bits of the status
print fill_in_template(template => 'cgi/bugreport',
variables => {status => \%status,
- package => \%package,
+ package => $packages_affects{'package'},
+ affects => $packages_affects{'affects'},
log => $log,
bug_num => $ref,
version_graph => $version_graph,
projects / debbugs.git / blobdiff