Close request for --dget:-u as we no longer use dget at all.

[dgit.git] / dgit-repos-server

diff --git a/dgit-repos-server b/dgit-repos-server
index 6acd6894f0eae552b82dbb542761c712612a2f05..3e74217a822159be9a602b2dd6549dd8af10eee4 100755 (executable)
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -153,6 +153,7 @@ sub recorderror ($) {
     my ($why) = @_;
     my $w = $ENV{'DGIT_DRS_WORK'}; # we are in stunthook
     if (defined $w) {
+       chomp $why;
        open ERR, ">", "$w/drs-error" or die $!;
        print ERR $why, "\n" or die $!;
        close ERR or die $!;
@@ -281,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.";
 }
 
@@ -329,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 (;;) {
@@ -390,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/\([^()]+\)//;
@@ -450,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/~:/_%/;
@@ -484,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();
@@ -544,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;
     }