X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-repos-server;h=3e74217a822159be9a602b2dd6549dd8af10eee4;hp=8d821861d1db6b02f76fccd16e81ef92a954d6a3;hb=4fd22956f74ec637545137e7fa25b5dbf03585c0;hpb=dba9ddbec6ba5283c73075347853e5f452396273

diff --git a/dgit-repos-server b/dgit-repos-server
index 8d821861..3e74217a 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -149,14 +149,22 @@ sub mkrepotmp () {
     die $!;
 }
 
-sub reject ($) {
+sub recorderror ($) {
     my ($why) = @_;
     my $w = $ENV{'DGIT_DRS_WORK'}; # we are in stunthook
     if (defined $w) {
-	open REJ, ">", "$w/drs-reject" or die $!;
-	print REJ $why, "\n" or die $!;
-	close REJ or die $!;
+	chomp $why;
+	open ERR, ">", "$w/drs-error" or die $!;
+	print ERR $why, "\n" or die $!;
+	close ERR or die $!;
+	return 1;
     }
+    return 0;
+}
+
+sub reject ($) {
+    my ($why) = @_;
+    recorderror "reject: $why";
     die "dgit-repos-server: reject: $why\n";
 }
 
@@ -213,10 +221,12 @@ END
 sub maybeinstallprospective () {
     return if $destrepo eq $realdestrepo;
 
-    if (open REJ, "<", "$workrepo/drs-reject") {
-	$!=0; my $why = <REJ>;
-	chomp $why or die $!;
-	reject $why;
+    if (open REJ, "<", "$workrepo/drs-error") {
+	local $/ = undef;
+	my $msg = <REJ>;
+	REJ->error and die $!;
+	print STDERR $msg;
+	exit 1;
     } else {
 	$!==&ENOENT or die $!;
     }
@@ -272,25 +282,25 @@ sub readupdates () {
 	m/^(\S+) (\S+) (\S+)$/ or die "$_ ?";
 	my ($old, $sha1, $refname) = ($1, $2, $3);
 	if ($refname =~ m{^refs/tags/(?=debian/)}) {
-	    die if defined $tagname;
+	    reject "pushing multiple tags!" if defined $tagname;
 	    $tagname = $'; #';
 	    $tagval = $sha1;
 	    reject "tag $tagname already exists -".
 		" not replacing previously-pushed version"
 		if $old =~ m/[^0]/;
 	} elsif ($refname =~ m{^refs/dgit/}) {
-	    die if defined $suite;
+	    reject "pushing multiple heads!" if defined $suite;
 	    $suite = $'; #';
 	    $oldcommit = $old;
 	    $commit = $sha1;
 	} else {
-	    die;
+	    reject "pushing unexpected ref!";
 	}
     }
     STDIN->error and die $!;
 
-    die unless defined $tagname;
-    die unless defined $suite;
+    reject "push is missing tag ref update" unless defined $tagname;
+    reject "push is missing head ref update" unless defined $suite;
     debug " updates ok.";
 }
 
@@ -320,7 +330,7 @@ sub parsetag () {
 
     for (;;) {
 	print PT or die $!;
-	$!=0; $_=<T>; defined or die $!;
+	$!=0; $_=<T>; defined or die "missing signature? $!";
 	last if m/^-----BEGIN PGP/;
     }
     for (;;) {
@@ -344,13 +354,16 @@ sub checksig_keyring ($) {
 
     debug " checksig keyring $keyringfile...";
 
-    open P, "-|", (qw(gpgv --status-fd=1 --keyring),
+    our @cmd = (qw(gpgv --status-fd=1 --keyring),
 		   $keyringfile,
-		   qw(dgit-tmp/plaintext.asc dgit-tmp/plaintext))
+		   qw(dgit-tmp/plaintext.asc dgit-tmp/plaintext));
+    debugcmd @cmd;
+
+    open P, "-|", @cmd
 	or die $!;
 
     while (<P>) {
-	next unless s/^\[GNUPG:\]: //;
+	next unless s/^\[GNUPG:\] //;
 	chomp or die;
 	debug " checksig| $_";
 	my @l = split / /, $_;
@@ -378,12 +391,14 @@ sub dm_txt_check ($$) {
     while (<DT>) {
 	m/^fingerprint:\s+$keyid$/oi
 	    ..0 or next;
-	m/^\S/
-	    or reject "key $keyid missing Allow section in permissions!";
+	if (s/^allow:/ /i..0) {
+	} else {
+	    m/^./
+		or reject "key $keyid missing Allow section in permissions!";
+	    next;
+	}
 	# in right stanza...
-	s/^allow:/ /i
-	    ..0 or next;
-	s/^\s+//
+	s/^[ \t]+//
 	    or reject "package $package not allowed for key $keyid";
 	# in allow field...
 	s/\([^()]+\)//;
@@ -425,7 +440,7 @@ sub verifytag () {
 }
 
 sub checksuite () {
-    debug "checksuite";
+    debug "checksuite ($suitesfile)";
     open SUITES, "<", $suitesfile or die $!;
     while (<SUITES>) {
 	chomp;
@@ -438,12 +453,20 @@ sub checksuite () {
     reject "unknown suite";
 }
 
+sub tagh1 ($) {
+    my ($tag) = @_;
+    my $vals = $tagh{$tag};
+    reject "missing header $tag in signed tag object" unless $vals;
+    reject "multiple headers $tag in signed tag object" unless @$vals == 1;
+    return $vals->[0];
+}
+
 sub checks () {
     debug "checks";
     checksuite();
-    tagh1('type') eq 'commit' or die;
-    tagh1('object') eq $commit or die;
-    tagh1('tag') eq $tagname or die;
+    tagh1('type') eq 'commit' or reject "tag refers to wrong kind of object";
+    tagh1('object') eq $commit or reject "tag refers to wrong commit";
+    tagh1('tag') eq $tagname or reject "tag name in tag is wrong";
 
     my $v = $version;
     $v =~ y/~:/_%/;
@@ -472,7 +495,6 @@ sub onwardpush () {
 
 sub stunthook () {
     debug "stunthook";
-    print Dumper(\$ENV{GIT_DIR});
     chdir $workrepo or die "chdir $workrepo: $!";
     mkdir "dgit-tmp" or $!==EEXIST or die $!;
     readupdates();
@@ -532,7 +554,13 @@ sub parseargsdispatch () {
 	defined($destrepo = $ENV{'DGIT_DRS_DEST'}) or die;
 	defined($keyrings = $ENV{'DGIT_DRS_KEYRINGS'}) or die $!;
 	open STDOUT, ">&STDERR" or die $!;
-	stunthook();
+	eval {
+	    stunthook();
+	};
+	if ($@) {
+	    recorderror "$@" or die;
+	    die $@;
+	}
 	exit 0;
     }