[backend] fix request trashing on reopen. Also validating requests no…

…w in backend more correctly.

src/backend/BSVerify.pm

@@ -298,6 +298,8 @@ sub verify_request {
   verify_num($req->{'id'}) if exists $req->{'id'};
   die("request must contain a state\n") unless $req->{'state'};
   die("request must contain a state name\n") unless $req->{'state'}->{'name'};
+  die("request must contain a state who\n") unless $req->{'state'}->{'who'};
+  die("request must contain a state when\n") unless $req->{'state'}->{'when'};
   die("request contains unknown state '$req->{'state'}->{'name'}'\n") unless $req_states{$req->{'state'}->{'name'}};
   verify_num($req->{'state'}->{'superseded_by'}) if exists $req->{'state'}->{'superseded_by'};
 
@@ -314,6 +316,11 @@ sub verify_request {
   }
   die("request must contain an action\n") unless $actions && @$actions;
   my %pkgchange;
+  for my $h (@{$req->{'history'} ||[]}) {
+    die("history element has no 'who' attribute\n") unless $h->{'who'};
+    die("history element has no 'when' attribute\n") unless $h->{'when'};
+    die("history element has no 'name' attribute\n") unless $h->{'name'};
+  }
   for my $r (@$actions) {
     die("request action has no type\n") unless $r->{'type'};
     if ($r->{'type'} eq 'delete') {

src/backend/bs_srcserver

@@ -5742,13 +5742,13 @@ sub createrequest {
   $req->{'state'}->{'name'} = 'new';
   $req->{'state'}->{'name'} = 'review' if defined($req->{'review'});
 
-  BSVerify::verify_request($req);
   die("request must not contain an id\n") if $req->{'id'};
   die("request must not contain a history\n") if $req->{'history'};
   die("request must not be created by anonymous\n") unless defined $cgi->{'user'};
   $req->{'state'}->{'who'} = $cgi->{'user'};
   my @lt = localtime(time());
   $req->{'state'}->{'when'} = sprintf("%04d-%02d-%02dT%02d:%02d:%02d", $lt[5] + 1900, $lt[4] + 1, @lt[3,2,1,0]);
+  BSVerify::verify_request($req);
   $req->{'id'} = nextreqid();
   writereq(undef, $req);
 
@@ -5890,7 +5890,7 @@ sub postrequest {
           $r->{'when'} = $mytime;
           $r->{'who'} = $cgi->{'user'} if defined $cgi->{'user'};
           $r->{'comment'} = $cgi->{'comment'} if defined($cgi->{'comment'});
-          $req->{'state'} = {'name' => 'review'};
+          $req->{'state'}->{'name'} = 'review';
         }
       }
     }