clone: Check for git earlier

[dgit.git] / dgit-repos-server

diff --git a/dgit-repos-server b/dgit-repos-server
index 57cb5be11d2d07d5a26e6c01ed299e9ed71e136a..c70bc27fd13b8a7d50ea3d25dba2bd9a7588f3ef 100755 (executable)
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -282,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.";
 }
 
@@ -330,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 (;;) {
@@ -391,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/\([^()]+\)//;
@@ -451,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/~:/_%/;
@@ -485,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();
@@ -567,9 +576,9 @@ sub parseargsdispatch () {
        (?: \S* / )?
        ( [-0-9a-z]+ )
        \s+
-       (?: \S* / )?
+       '? (?: \S* / )?
        ($package_re) \.git
-       $
+       '?$
     }ox 
     or reject "command string not understood";
     my $method = $1;