dgit-repos-server: fix dm parsing (success case)

[dgit.git] / dgit-repos-server

diff --git a/dgit-repos-server b/dgit-repos-server
index 57cb5be11d2d07d5a26e6c01ed299e9ed71e136a..897e414d834942678d7a2236eb2490e7bd3e3711 100755 (executable)
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -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,7 +391,7 @@ sub dm_txt_check ($$) {
     while (<DT>) {
        m/^fingerprint:\s+$keyid$/oi
            ..0 or next;
-       m/^\S/
+       m/^./
            or reject "key $keyid missing Allow section in permissions!";
        # in right stanza...
        s/^allow:/ /i
@@ -451,6 +451,14 @@ sub checksuite () {
     reject "unknown suite";
 }
 
+sub tagh1 ($) {
+    my ($tag) = @_;
+    my $vals = $tagh{$tag};
+    reject "missing tag $tag in signed tag object" unless $vals;
+    reject "multiple tags $tag in signed tag object" unless @$vals == 1;
+    return $vals->[0];
+}
+
 sub checks () {
     debug "checks";
     checksuite();
@@ -485,7 +493,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();