X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=87f688e368fbf167b784ccedba4e1cba2c8bb319;hb=1aa5061f8033c49525c7a2d424c43900cee19771;hp=3ff1cb5c7d2759adae51ff8eb104a2674119dfb6;hpb=50372083ae0dac8ae45be227d335dae55749e847;p=debbugs.git diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi index 3ff1cb5..87f688e 100755 --- a/cgi/bugreport.cgi +++ b/cgi/bugreport.cgi @@ -15,28 +15,61 @@ use MIME::Decoder; use IO::Scalar; use IO::File; +# if we're running out of git, we want to use the git base directory as the +# first INC directory. If you're not running out of git, don't do that. +use File::Basename qw(dirname); +use Cwd qw(abs_path); +our $debbugs_dir; +BEGIN { + $debbugs_dir = + abs_path(dirname(abs_path(__FILE__)) . '/../'); + # clear the taint; we'll assume that the absolute path to __FILE__ is the + # right path if there's a .git directory there + ($debbugs_dir) = $debbugs_dir =~ /([[:print:]]+)/; + if (defined $debbugs_dir and + -d $debbugs_dir . '/.git/') { + } else { + undef $debbugs_dir; + } + # if the first directory in @INC is not an absolute directory, assume that + # someone has overridden us via -I. + if ($INC[0] !~ /^\//) { + undef $debbugs_dir; + } + if (defined $debbugs_dir) { + unshift @INC, $debbugs_dir.'/lib/'; + } +} + use Debbugs::Config qw(:globals :text :config); # for read_log_records use Debbugs::Log qw(:read); use Debbugs::Log::Spam; -use Debbugs::CGI qw(:url :html :util :cache); +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::Common qw(buglog getmaintainers make_list bug_status package_maintainer); +use Debbugs::Packages qw(binary_to_source); +use Debbugs::DB; use Debbugs::Status qw(splitpackages split_status_fields get_bug_status isstrongseverity); - -use Debbugs::User; +use Debbugs::Bug; use Scalar::Util qw(looks_like_number); use Debbugs::Text qw(:templates); - -use List::Util qw(max); - +use URI::Escape qw(uri_escape_utf8); +use List::AllUtils qw(max); + +my $s; +my @schema_arg = (); +if (defined $config{database}) { + $s = Debbugs::DB->connect($config{database}) or + die "Unable to connect to DB"; + @schema_arg = ('schema',$s); +} use CGI::Simple; -my $q = new CGI::Simple; +my $q = CGI::Simple->new(); # STDOUT should be using the utf8 io layer binmode(STDOUT,':raw:encoding(UTF-8)'); @@ -186,18 +219,21 @@ if (defined $param{usertag}) { } } +my $bug = Debbugs::Bug->new(bug => $ref, + @schema_arg, + ); + my %status; if ($need_status) { %status = %{split_status_fields(get_bug_status(bug=>$ref, bugusertags => \%bugusertags, + @schema_arg, ))} } my @records; -my $spam; eval{ - @records = read_log_records(bug_num => $ref,inner_file => 1); - $spam = Debbugs::Log::Spam->new(bug_num => $ref); + @records = $bug->log_records(); }; if ($@) { quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@"); @@ -214,7 +250,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, @@ -226,10 +263,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', @@ -273,11 +310,11 @@ END 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 @records > 1 and $spam->is_spam($msg_id); + next if $multiple_messages and $bug->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 { @@ -290,10 +327,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; @@ -331,7 +373,7 @@ else { terse => $terse, # if we're only looking at one record, allow # spam to be output - spam => (@records > 1)?$spam:undef, + spam => (@records > 1)?$bug:undef, ); } } @@ -342,102 +384,16 @@ $log = join("\n",@log); # All of the below should be turned into a template -my %maintainer = %{getmaintainers()}; -my %pkgsrc = %{getpkgsrc()}; - my $indexentry; my $showseverity; -my $tpack; -my $tmain; - -my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime; - unless (%status) { no_such_bug($q,$ref); } -#$|=1; - - 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 -$status{tags_array} = [sort(make_list($status{tags}))]; -$status{date_text} = strftime('%a, %e %b %Y %T UTC', gmtime($status{date})); -$status{mergedwith_array} = [make_list($status{mergedwith})]; - - -my $version_graph = ''; -if (@{$status{found_versions}} or @{$status{fixed_versions}}) { - $version_graph = q(version graph}; -} - - - -my @blockedby= make_list($status{blockedby}); -$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}; - push @{$status{blockedby_array}},{bug_num => $b, subject => $s{subject}, status => \%s}; - } -} - -my @blocks= make_list($status{blocks}); -$status{blocks_array} = []; -if (@blocks && $status{"pending"} ne 'fixed' && ! length($status{done})) { - for my $b (@blocks) { - my %s = %{get_bug_status($b)}; - next if $s{"pending"} eq 'fixed' || length $s{done}; - push @{$status{blocks_array}}, {bug_num => $b, subject => $s{subject}, status => \%s}; - } -} - -if ($buglog !~ m#^\Q$gSpoolDir/db#) { - $status{archived} = 1; -} - -my $descriptivehead = $indexentry; - print $q->header(-type => "text/html", -charset => 'utf-8', -cache_control => 'public, max-age=300', @@ -445,22 +401,18 @@ print $q->header(-type => "text/html", ); print fill_in_template(template => 'cgi/bugreport', - variables => {status => \%status, - package => $packages_affects{'package'}, - affects => $packages_affects{'affects'}, + variables => {bug => $bug, log => $log, - bug_num => $ref, - version_graph => $version_graph, 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, },