X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=ef0341c25facad894c8c7ed0294c6467fcfbc66e;hb=05f158937d8e18b9bec70594f465fc078ed3bc59;hp=db4619d85d7fb3047978e153a41fa1bce131f51d;hpb=98422d682786dac1dd2191b60cb82584b92b73f3;p=debbugs.git

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index db4619d..ef0341c 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -15,11 +15,11 @@ use MIME::Decoder;
 use IO::Scalar;
 use IO::File;
 
-use Debbugs::Config qw(:globals :text);
+use Debbugs::Config qw(:globals :text :config);
 
 # for read_log_records
 use Debbugs::Log qw(:read);
-use Debbugs::CGI qw(:url :html :util);
+use Debbugs::CGI qw(:url :html :util :cache);
 use Debbugs::CGI::Bugreport qw(:all);
 use Debbugs::Common qw(buglog getmaintainers make_list bug_status);
 use Debbugs::Packages qw(getpkgsrc);
@@ -73,6 +73,17 @@ 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 %seen_users;
@@ -80,28 +91,73 @@ my %seen_users;
 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 $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));
+## calculate etag for this bugreport.cgi call
+my $etag;
+## identify the files that we need to look at; if someone just wants the mbox,
+## they don't need to see anything but the buglog; otherwise, track what is
+## necessary for the usertags and things to calculate status.
+
+my @dependent_files = ($buglog);
+my $need_status = 0;
+if (not (($mbox and not $mbox_status_message) or
+	 (defined $att and defined $msg))) {
+    $need_status = 1;
+    push @dependent_files,
+	$bug_status,
+	defined $config{version_index} ? $config{version_index}:(),
+	defined $config{binary_source_map} ? $config{binary_source_map}:();
+}
 
+## Identify the users required
+for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) {
+    next unless length($user);
+    push @dependent_files,Debbugs::User::usertag_flie_from_email($user);
+}
+if (defined $param{usertag}) {
+    for my $usertag (make_list($param{usertag})) {
+	my ($user, $tag) = split /:/, $usertag, 2;
+	push @dependent_files,Debbugs::User::usertag_flie_from_email($user);
+    }
+}
+$etag =
+    etag_does_not_match(cgi => $q,
+			additional_data => [grep {defined $_ ? $_ :()}
+					    values %param
+					   ],
+			files => [@dependent_files,
+				 ],
+		       );
+if (not $etag) {
+    print $q->header(-status => 304);
+    print "304: Not modified\n";
+    exit 0;
+}
+
+## if they're just asking for the head, stop here.
 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):(),
-		     );
+    print $q->header(-status => 200,
+		     -cache_control => 'public, max-age=600',
+		     -etag => $etag,
+		     -content_type => 'text/html',
+		    );
      exit 0;
 }
 
@@ -124,20 +180,6 @@ if (defined $param{usertag}) {
 }
 
 
-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'};
@@ -149,10 +191,12 @@ if ($buglog =~ m/\.gz$/) {
 }
 
 
-my %status =
-    %{split_status_fields(get_bug_status(bug=>$ref,
-					 bugusertags => \%bugusertags,
-					))};
+my %status;
+if ($need_status) {
+    %status = %{split_status_fields(get_bug_status(bug=>$ref,
+						   bugusertags => \%bugusertags,
+						  ))}
+}
 
 my @records;
 eval{
@@ -177,15 +221,17 @@ if ( $mbox ) {
      my $date = strftime "%a %b %d %T %Y", localtime;
      if (@records > 1) {
 	 print $q->header(-type => "text/plain",
+			  -cache_control => 'public, max-age=600',
+			  -etag => $etag,
 			  content_disposition => qq(attachment; filename="bug_${ref}.mbox"),
-			  (length $mtime)?(-last_modified => $mtime):(),
 			 );
      }
      else {
 	  $msg_num++;
 	  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"),
-			   (length $mtime)?(-last_modified => $mtime):(),
 			  );
      }
      if ($mbox_status_message and @records > 1) {
@@ -259,7 +305,11 @@ END
 else {
      if (defined $att and defined $msg and @records) {
 	 binmode(STDOUT,":raw");
-	  $msg_num++;
+	 $msg_num++;
+	 ## allow this to be cached for a week
+	 print "Status: 200 OK\n";
+	 print "Cache-Control: public, max-age=604800\n";
+	 print "Etag: $etag\n";
 	  print handle_email_message($records[0],
 				     ref => $ref,
 				     msg_num => $msg_num,
@@ -303,16 +353,7 @@ my $tmain;
 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;
@@ -398,7 +439,8 @@ my $descriptivehead = $indexentry;
 
 print $q->header(-type => "text/html",
 		 -charset => 'utf-8',
-		 (length $mtime)?(-last_modified => $mtime):(),
+		 -cache_control => 'public, max-age=300',
+		 -etag => $etag,
 		);
 
 print fill_in_template(template => 'cgi/bugreport',