From d250c55b60097fb5e93e8ba3f42b48ce5741d9f0 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <ansgar@debian.org>
Date: Sat, 15 Dec 2012 11:16:54 +0100
Subject: [PATCH] debianqueued: make pgp_check stricter

---
 tools/debianqueued-0.9/debianqueued | 39 +++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index d5937abb..1c29eb68 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -1637,8 +1637,9 @@ sub pgp_check($) {
   my $output = "";
   my $signator;
   my $found = 0;
-  my $stat;
+  my $stat = 1;
   local (*PIPE);
+  local $_;
 
   if ($file =~ /$re_file_safe/) {
     $file = $1;
@@ -1647,7 +1648,41 @@ sub pgp_check($) {
     return "LOCAL ERROR";
   }
 
-  $stat = 1;
+  # check the file has only one clear-signed section
+  my $fh;
+  unless (open $fh, "<", $file) {
+	  msg("log,mail", "Could not open $file\n");
+	  return "";
+  }
+  unless (<$fh> eq "-----BEGIN PGP SIGNED MESSAGE-----\n") {
+	  msg("log,mail", "$file: does not start with a clearsigned message\n");
+	  return "";
+  }
+  my $pgplines = 1;
+  while (<$fh>) {
+	  if (/\A- /) {
+		  msg("log,mail", "$file: dash-escaped messages are not accepted\n");
+		  return "";
+	  }
+	  elsif ($_ eq "-----BEGIN PGP SIGNATURE-----\n"
+		     || $_ eq "-----END PGP SIGNATURE-----\n") {
+		  $pgplines++;
+	  }
+	  elsif (/\A--/) {
+		  msg("log,mail", "$file: unexpected OpenPGP armor\n");
+		  return "";
+	  }
+	  elsif ($pgplines > 3 && /\S/) {
+		  msg("log,mail", "$file: found text after end of signature\n");
+		  return "";
+	  }
+  }
+  if ($pgplines != 3) {
+	  msg("log,mail", "$file: doesn't seem to be a valid clearsigned OpenPGP message\n");
+	  return "";
+  }
+  close $fh;
+
   if ( -x $conf::gpg ) {
     my @command = ("$conf::gpg", "--no-options", "--batch", "--no-tty",
                    "--trust-model", "always", "--no-default-keyring",
-- 
2.39.2