X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI%2FBugreport.pm;h=f2ae9ac410c6ed98955d6016f1f6d76e6fbc879e;hb=1fc2d1468742f5478aa2592cc31a450c2ea7f141;hp=b3f4ec6defafd3cb7287029ba9859abbc8d72743;hpb=507e7fb021c286bcb59d961f9f25c89410d451a2;p=debbugs.git
diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index b3f4ec6..f2ae9ac 100644
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -41,6 +41,7 @@ use Debbugs::UTF8;
use Debbugs::Config qw(:config);
use POSIX qw(strftime);
use Encode qw(decode_utf8 encode_utf8);
+use URI::Escape qw(uri_escape);
BEGIN{
($VERSION) = q$Revision: 494 $ =~ /^Revision:\s+([^\s+])/;
@@ -148,10 +149,10 @@ sub display_entity {
if ($_ eq 'From' and $param{avatars}) {
my $libravatar_url = __libravatar_url(decode_rfc1522($head_field));
if (defined $libravatar_url and length $libravatar_url) {
- push @headers,q(\n);
+ push @headers,q(\n);
}
}
- push @headers, qq(
) . html_escape(decode_rfc1522($head_field))."
\n";
+ push @headers, qq(\n";
}
print {$output} join(qq(), @headers);
} else {
@@ -172,7 +173,6 @@ sub display_entity {
my $body = $entity->stringify_body;
# this attachment has its own content type, so we must not
# try to convert it to UTF-8 or do anything funky.
- my @layers = PerlIO::get_layers($output);
binmode($output,':raw');
print {$output} "Content-Type: $type";
my ($charset) = $head->get('Content-Type:') =~ m/charset\s*=\s*\"?([\w-]+)\"?/i;
@@ -187,10 +187,10 @@ sub display_entity {
print {$output} "\n";
my $decoder = MIME::Decoder->new($head->mime_encoding);
$decoder->decode(IO::Scalar->new(\$body), $output);
- if (grep {/utf8/} @layers) {
- binmode($output,':utf8');
- }
- return;
+ # we don't reset the layers here, because it makes no
+ # sense to add anything to the output handle after this
+ # point.
+ return(1);
}
elsif (not exists $param{att}) {
my @dlargs = (msg=>$xmessage, att=>$#$attachments);
@@ -206,26 +206,30 @@ sub display_entity {
}
}
- return if not $param{outer} and $disposition eq 'attachment' and not exists $param{att};
- return unless ($type =~ m[^text/?] and
- $type !~ m[^text/(?:html|enriched)(?:;|$)]) or
- $type =~ m[^application/pgp(?:;|$)] or
- $entity->parts;
+ return 0 if not $param{outer} and $disposition eq 'attachment' and not exists $param{att};
+ return 0 unless (($type =~ m[^text/?] and
+ $type !~ m[^text/(?:html|enriched)(?:;|$)]) or
+ $type =~ m[^application/pgp(?:;|$)] or
+ $entity->parts);
if ($entity->is_multipart) {
my @parts = $entity->parts;
foreach my $part (@parts) {
- display_entity(entity => $part,
- bug_num => $ref,
- outer => 0,
- msg_num => $xmessage,
- output => $output,
- attachments => $attachments,
- terse => $param{terse},
- exists $param{msg}?(msg=>$param{msg}):(),
- exists $param{att}?(att=>$param{att}):(),
- exists $param{avatars}?(avatars=>$param{avatars}):(),
- );
+ my $raw_output =
+ display_entity(entity => $part,
+ bug_num => $ref,
+ outer => 0,
+ msg_num => $xmessage,
+ output => $output,
+ attachments => $attachments,
+ terse => $param{terse},
+ exists $param{msg}?(msg=>$param{msg}):(),
+ exists $param{att}?(att=>$param{att}):(),
+ exists $param{avatars}?(avatars=>$param{avatars}):(),
+ );
+ if ($raw_output) {
+ return $raw_output;
+ }
# print {$output} "\n";
}
} elsif ($entity->parts) {
@@ -270,7 +274,11 @@ sub display_entity {
((?:\>\;)?[)]?(?:'|\&\#39\;)?[:.\,]?(?:\s|$)) # terminators
}{$1$2}gox;
# Add links to bug closures
- $body =~ s[(closes:\s*(?:bug)?\#?\s?\d+(?:,?\s*(?:bug)?\#?\s?\d+)*)]
+ $body =~ s[((?:closes|see):\s* # start of closed/referenced bugs
+ (?:bug)?\#?\s?\d+\s? # first bug
+ (?:,?\s*(?:bug)?\#?\s?\d+)* # additional bugs
+ (?:\s|\n|\)|\]|\}|\.|\,|$)) # ends with a space, newline, end of string, or ); fixes #747267
+ ]
[my $temp = $1;
$temp =~ s{(\d+)}
{bug_links(bug=>$1)}ge;
@@ -279,13 +287,14 @@ sub display_entity {
length $config{cve_tracker}
) {
# Add links to CVE vulnerabilities (closes #568464)
- $body =~ s{(^|\s)(CVE-\d{4}-\d{4,})(\s|[,.-\[\]]|$)}
+ $body =~ s{(^|\s|[\(\[])(CVE-\d{4}-\d{4,})(\s|[,.-\[\]\)]|$)}
{$1$2$3}gxm;
}
if (not exists $param{att}) {
print {$output} qq($body
\n);
}
}
+ return 0;
}
@@ -314,19 +323,20 @@ sub handle_email_message{
$parser->output_to_core(1);
my $entity = $parser->parse_data( $email);
my @attachments = ();
- display_entity(entity => $entity,
- bug_num => $param{ref},
- outer => 1,
- msg_num => $param{msg_num},
- output => $output_fh,
- attachments => \@attachments,
- terse => $param{terse},
- exists $param{msg}?(msg=>$param{msg}):(),
- exists $param{att}?(att=>$param{att}):(),
- exists $param{trim_headers}?(trim_headers=>$param{trim_headers}):(),
- exists $param{avatars}?(avatars=>$param{avatars}):(),
- );
- return decode_utf8($output);
+ my $raw_output =
+ display_entity(entity => $entity,
+ bug_num => $param{ref},
+ outer => 1,
+ msg_num => $param{msg_num},
+ output => $output_fh,
+ attachments => \@attachments,
+ terse => $param{terse},
+ exists $param{msg}?(msg=>$param{msg}):(),
+ exists $param{att}?(att=>$param{att}):(),
+ exists $param{trim_headers}?(trim_headers=>$param{trim_headers}):(),
+ exists $param{avatars}?(avatars=>$param{avatars}):(),
+ );
+ return $raw_output?$output:decode_utf8($output);
}
=head2 handle_record
@@ -447,7 +457,7 @@ sub __libravatar_url {
return undef;
}
($email) = get_addresses($email);
- return $config{libravatar_uri}.md5_hex(lc($email)).($config{libravatar_uri_options}//'');
+ return $config{libravatar_uri}.uri_escape($email.($config{libravatar_uri_options}//''));
}