X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=blobdiff_plain;f=Debbugs%2FCGI%2FBugreport.pm;h=95201d23a20b2c122c5b46218179f0c4c4bd42ca;hp=c9103ba470bdc8cb6797a9da1f59d90c9ae78b9d;hb=539af97afc41be51d7f9d70a7d1e94c0ed0516cc;hpb=02e70ed5c05c0ed436e2f6e51ea2122e8fc0d9d8 diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm index c9103ba..95201d2 100644 --- a/Debbugs/CGI/Bugreport.pm +++ b/Debbugs/CGI/Bugreport.pm @@ -27,15 +27,26 @@ None known. use warnings; use strict; +use utf8; use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT); -use base qw(Exporter); +use Exporter qw(import); use IO::Scalar; use Params::Validate qw(validate_with :types); -use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message); +use Digest::MD5 qw(md5_hex); +use Debbugs::Mail qw(get_addresses :reply); +use Debbugs::MIME qw(decode_rfc1522 create_mime_message); use Debbugs::CGI qw(:url :html :util); use Debbugs::Common qw(globify_scalar english_join); +use Debbugs::UTF8; +use Debbugs::Config qw(:config); +use Debbugs::Log qw(:read); use POSIX qw(strftime); +use Encode qw(decode_utf8 encode_utf8); +use URI::Escape qw(uri_escape_utf8); +use Scalar::Util qw(blessed); +use List::AllUtils qw(sum); +use File::Temp; BEGIN{ ($VERSION) = q$Revision: 494 $ =~ /^Revision:\s+([^\s+])/; @@ -108,13 +119,15 @@ sub display_entity { trim_headers => {type => BOOLEAN, default => 1, }, + avatars => {type => BOOLEAN, + default => 1, + }, } ); - $param{output} = globify_scalar($param{output}); + my $output = globify_scalar($param{output}); my $entity = $param{entity}; my $ref = $param{bug_num}; - my $top = $param{outer}; my $xmessage = $param{msg_num}; my $attachments = $param{attachments}; @@ -129,20 +142,26 @@ sub display_entity { if ($param{outer} and not $param{terse} and not exists $param{att}) { - my $header = $entity->head; - print {$param{output}} "
\n";
-	 if ($param{trim_headers}) {
+	 print {$output} "
\n";
+         if ($param{trim_headers}) {
 	      my @headers;
 	      foreach (qw(From To Cc Subject Date)) {
 		   my $head_field = $head->get($_);
 		   next unless defined $head_field and $head_field ne '';
-		   push @headers, qq($_: ) . html_escape(decode_rfc1522($head_field));
+                   chomp $head_field;
+                   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, qq(
$_: ) . html_escape(decode_rfc1522($head_field))."
\n";
 	      }
-	      print {$param{output}} join(qq(), @headers);
+	      print {$output} join(qq(), @headers);
 	 } else {
-	      print {$param{output}} html_escape(decode_rfc1522($entity->head->stringify));
+	      print {$output} "
".html_escape(decode_rfc1522($entity->head->stringify))."
\n";
 	 }
-	 print {$param{output}} "
\n"; + print {$output} "\n"; } if (not (($param{outer} and $type =~ m{^text(?:/plain)?(?:;|$)}) @@ -155,27 +174,33 @@ sub display_entity { my $head = $entity->head; chomp(my $type = $entity->effective_type); my $body = $entity->stringify_body; - print {$param{output}} "Content-Type: $type"; + # this attachment has its own content type, so we must not + # try to convert it to UTF-8 or do anything funky. + binmode($output,':raw'); + print {$output} "Content-Type: $type"; my ($charset) = $head->get('Content-Type:') =~ m/charset\s*=\s*\"?([\w-]+)\"?/i; - print {$param{output}} qq(; charset="$charset") if defined $charset; - print {$param{output}}"\n"; + print {$output} qq(; charset="$charset") if defined $charset; + print {$output} "\n"; if ($filename ne '') { my $qf = $filename; $qf =~ s/"/\\"/g; $qf =~ s[.*/][]; - print {$param{output}} qq{Content-Disposition: inline; filename="$qf"\n}; + print {$output} qq{Content-Disposition: inline; filename="$qf"\n}; } - print {$param{output}} "\n"; + print {$output} "\n"; my $decoder = MIME::Decoder->new($head->mime_encoding); - $decoder->decode(IO::Scalar->new(\$body), $param{output}); - return; + $decoder->decode(IO::Scalar->new(\$body), $output); + # 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); push @dlargs, (filename=>$filename) if $filename ne ''; my $printname = $filename; $printname = 'Message part ' . ($#$attachments + 1) if $filename eq ''; - print {$param{output}} '
[[ $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) {
 	# We must be dealing with a nested message.
 	 if (not exists $param{att}) {
-	      print {$param{output}} "
\n";
+	      print {$output} "
\n";
 	 }
 	my @parts = $entity->parts;
 	foreach my $part (@parts) {
@@ -216,46 +246,71 @@ sub display_entity {
 			   bug_num => $ref,
 			   outer => 1,
 			   msg_num => $xmessage,
-			   output => $param{output},
+			   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}):(),
 			  );
-	    # print {$param{output}} "\n";
+	    # print {$output} "\n";
 	}
 	 if (not exists $param{att}) {
-	      print {$param{output}} "
\n";
+	      print {$output} "
\n";
 	 }
     } elsif (not $param{terse}) {
 	 my $content_type = $entity->head->get('Content-Type:') || "text/html";
 	 my ($charset) = $content_type =~ m/charset\s*=\s*\"?([\w-]+)\"?/i;
 	 my $body = $entity->bodyhandle->as_string;
-	 $body = convert_to_utf8($body,$charset) if defined $charset;
+	 $body = convert_to_utf8($body,$charset//'utf8');
 	 $body = html_escape($body);
+	 my $css_class = "message";
 	 # Attempt to deal with format=flowed
 	 if ($content_type =~ m/format\s*=\s*\"?flowed\"?/i) {
 	      $body =~ s{^\ }{}mgo;
 	      # we ignore the other things that you can do with
 	      # flowed e-mails cause they don't really matter.
+	      $css_class .= " flowed";
+	 }
+
+	 # if the message is composed entirely of lines which are separated by
+	 # newlines, wrap it. [Allow the signature to have special formatting.]
+	 if ($body =~ /^([^\n]+\n\n)*[^\n]*\n?(-- \n.+)*$/s or
+	     # if the first 20 lines in the message which have any non-space
+	     # characters are larger than 100 characters more often than they
+	     # are not, then use CSS to try to impose sensible wrapping
+	     sum(0,map {length ($_) > 100?1:-1} grep {/\S/} split /\n/,$body,20) > 0
+	    ) {
+	     $css_class .= " wrapping";
 	 }
 	 # Add links to URLs
 	 # We don't html escape here because we escape above;
 	 # wierd terminators are because of that
 	 $body =~ s{((?:ftp|http|https|svn|ftps|rsync)://[\S~-]+?/?) # Url
-		    ((?:\>\;)?[)]?(?:'|\&\#39\;)?[:.\,]?(?:\s|$)) # terminators
+		    ((?:\>\;)?[)]?(?:'|\&\#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;
 		    $temp;]gxie;
-
+	 if (defined $config{cve_tracker} and
+	     length $config{cve_tracker}
+	    ) {
+	     # Add links to CVE vulnerabilities (closes #568464)
+	     $body =~ s{(^|\s|[\(\[])(CVE-\d{4}-\d{4,})(\s|[,.-\[\]\)]|$)}
+		       {$1$2$3}gxm;
+	 }
 	 if (not exists $param{att}) {
-	      print {$param{output}} qq(
$body
\n);
+	      print {$output} qq(
$body
\n);
 	 }
     }
+    return 0;
 }
 
 
@@ -273,29 +328,42 @@ appropriate.
 =cut
 
 sub handle_email_message{
-     my ($email,%param) = @_;
-
-     my $output = '';
-     my $parser = MIME::Parser->new();
-     # Because we are using memory, not tempfiles, there's no need to
-     # clean up here like in Debbugs::MIME
-     $parser->tmp_to_core(1);
-     $parser->output_to_core(1);
-     my $entity = $parser->parse_data( $email);
+     my ($record,%param) = @_;
+
+     my $output;
+     my $output_fh = globify_scalar(\$output);
+     my $entity;
+     my $tempdir;
+     if (not blessed $record) {
+         my $parser = MIME::Parser->new();
+         # this will be cleaned up once it goes out of scope
+         $tempdir = File::Temp->newdir();
+         $parser->output_under($tempdir->dirname());
+         if ($record->{inner_file}) {
+             $entity = $parser->parse($record->{fh}) or
+                 die "Unable to parse entity";
+         } else {
+             $entity = $parser->parse_data($record->{text}) or
+                 die "Unable to parse entity";
+         }
+     } else {
+         $entity = $record;
+     }
      my @attachments = ();
-     display_entity(entity  => $entity,
-		    bug_num => $param{ref},
-		    outer   => 1,
-		    msg_num => $param{msg_num},
-		    output => \$output,
-		    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}):(),
-		   );
-     return $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
@@ -309,21 +377,26 @@ should be output to the browser.
 =cut
 
 sub handle_record{
-     my ($record,$bug_number,$msg_number,$seen_msg_ids) = @_;
+     my ($record,$bug_number,$msg_number,$seen_msg_ids,%param) = @_;
 
-     my $output = '';
+     # output needs to have the is_utf8 flag on to avoid double
+     # encoding
+     my $output = decode_utf8('');
      local $_ = $record->{type};
      if (/html/) {
-	  my ($time) = $record->{text} =~ //;
-	  my $class = $record->{text} =~ /^(?:Acknowledgement|Reply|Information|Report|Notification)/m ? 'infmessage':'msgreceived';
-	  $output .= decode_rfc1522($record->{text});
+	 # $record->{text} is not in perl's internal encoding; convert it
+	 my $text = decode_rfc1522(decode_utf8(record_text($record)));
+	  my ($time) = $text =~ //;
+	  my $class = $text =~ /^(?:Acknowledgement|Information|Report|Notification)/m ? 'infmessage':'msgreceived';
+	  $output .= $text;
 	  # Link to forwarded http:// urls in the midst of the report
 	  # (even though these links already exist at the top)
-	  $output =~ s,((?:ftp|http|https)://[\S~-]+?/?)((?:[\)\'\:\.\,]|\&\#39;)?(?:\s|\.<|$)),$1$2,go;
+	  $output =~ s,((?:ftp|http|https)://[\S~-]+?/?)((?:[\)\'\:\.\,]|\&\#39;|\"\;)?
+                           (?:\s|\.<|$)),$1$2,gxo;
 	  # Add links to the cloned bugs
 	  $output =~ s{(Bug )(\d+)( cloned as bugs? )(\d+)(?:\-(\d+)|)}{$1.bug_links(bug=>$2).$3.bug_links(bug=>(defined $5)?[$4..$5]:$4)}eo;
 	  # Add links to merged bugs
-	  $output =~ s{(?<=Merged )([\d\s]+)(?=\.)}{join(' ',map {bug_links(bug=>$_)} (split /\s+/, $1))}eo;
+	  $output =~ s{(?<=Merged )([\d\s]+)(?=[\.<])}{join(' ',map {bug_links(bug=>$_)} (split /\s+/, $1))}eo;
 	  # Add links to blocked bugs
 	  $output =~ s{(?<=Blocking bugs)(?:( of )(\d+))?( (?:added|set to|removed):\s+)([\d\s\,]+)}
 		      {(defined $2?$1.bug_links(bug=>$2):'').$3.
@@ -332,54 +405,63 @@ sub handle_record{
 		       (\d+(?:,\s+\d+)*(?:\,?\s+and\s+\d+)?)}
 		      {$1.(defined $3?$2.bug_links(bug=>$3):'').$4.
 			   english_join([map {bug_links(bug=>$_)} (split /\,?\s+(?:and\s+)?/, $5)])}xeo;
+	  $output =~ s{([Aa]dded|[Rr]emoved)( indication that bug )(\d+)( blocks ?)([\d\s\,]+)}
+		      {$1.$2.(bug_links(bug=>$3)).$4.
+			   english_join([map {bug_links(bug=>$_)} (split /\,?\s+(?:and\s+)?/, $5)])}eo;
 	  # Add links to reassigned packages
-	  $output =~ s{(Bug reassigned from package \`)([^']+?)((?:'|\&\#39;) to \`)([^']+?)((?:'|\&\#39;))}
-	  {$1.q($2).$3.q($4).$5}eo;
+	  $output =~ s{($config{bug}\sreassigned\sfrom\spackage\s(?:[\`']|\&\#39;))([^']+?)((?:'|\&\#39;|\"\;)
+                               \sto\s(?:[\`']|\&\#39;|\"\;))([^']+?)((?:'|\&\#39;|\"\;))}
+	  {$1.package_links(package=>$2).$3.
+               package_links(package=>$4).$5}exo;
 	  if (defined $time) {
 	       $output .= ' ('.strftime('%a, %d %b %Y %T GMT',gmtime($time)).') ';
 	  }
-	  $output .= ' $bug_number,
 				     options => {msg => ($msg_number+1)},
 				     links_only => 1,
 				    )
-			  ) . '">Full text and full text, rfc822 format available.';
+					  ) . '">mbox, '.
+					      qq{link).
};
 
-	  $output = qq(
\n\n) . $output . "
\n";
+	  $output = qq(
\n\n) . $output . "
\n";
      }
      elsif (/recips/) {
-	  my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im;
-	  if (defined $msg_id and exists $$seen_msg_ids{$msg_id}) {
+         my ($msg_id) = record_regex($record,qr/^Message-Id:\s+<(.+)>/i);
+         if (defined $msg_id and exists $$seen_msg_ids{$msg_id}) {
 	       return ();
 	  }
 	  elsif (defined $msg_id) {
 	       $$seen_msg_ids{$msg_id} = 1;
 	  }
-	  $output .= qq(
\n);
+	  return () if defined $param{spam} and $param{spam}->is_spam($msg_id);
+	  $output .= qq(
🔗\n);
 	  $output .= 'View this message in rfc822 format
';
-	  $output .= handle_email_message($record->{text},
+	  $output .= handle_email_message($record,
 					  ref     => $bug_number,
 					  msg_num => $msg_number,
+                                          %param,
 					 );
      }
      elsif (/autocheck/) {
 	  # Do nothing
      }
      elsif (/incoming-recv/) {
-	  my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im;
+         my ($msg_id) = record_regex($record,qr/^Message-Id:\s+<(.+)>/i);
 	  if (defined $msg_id and exists $$seen_msg_ids{$msg_id}) {
 	       return ();
 	  }
 	  elsif (defined $msg_id) {
 	       $$seen_msg_ids{$msg_id} = 1;
 	  }
+	  return () if defined $param{spam} and $param{spam}->is_spam($msg_id);
 	  # Incomming Mail Message
-	  my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/;
+	  my ($received,$hostname) = record_regex($record,qr/Received: \(at (\S+)\) by (\S+)\;/o);
 	  $output .= qq|
Message #$msg_number received at |.
 	       html_escape("$received\@$hostname") .
 		    q| (full text'.
@@ -388,10 +470,30 @@ sub handle_record{
 								options => {msg=>$msg_number,
 									    mbox=>'yes'}
 							       )
-						     ) .'">mbox)'.":
\n";
-	  $output .= handle_email_message($record->{text},
+						     ) .'">mbox, ';
+          my $parser = MIME::Parser->new();
+
+          # this will be cleaned up once it goes out of scope
+          my $tempdir = File::Temp->newdir();
+          $parser->output_under($tempdir->dirname());
+         $parser->filer->ignore_filename(1);
+         my $entity;
+         if ($record->{inner_file}) {
+             $entity = $parser->parse($record->{fh});
+         } else {
+             $entity = $parser->parse_data($record->{text});
+         }
+          my $r_l = reply_headers($entity);
+          $output .= q(reply);
+
+          $output .= ')'.":
\n";
+	  $output .= handle_email_message($entity,
 					  ref     => $bug_number,
 					  msg_num => $msg_number,
+                                          %param,
 					 );
      }
      else {
@@ -401,6 +503,15 @@ sub handle_record{
 }
 
 
+sub __libravatar_url {
+    my ($email) = @_;
+    if (not defined $config{libravatar_uri} or not length $config{libravatar_uri}) {
+        return undef;
+    }
+    ($email) = grep {/\@/} get_addresses($email);
+    return $config{libravatar_uri}.uri_escape_utf8($email.($config{libravatar_uri_options}//''));
+}
+
 
 1;