summaryrefslogtreecommitdiff
path: root/dgit-repos-server
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-03-05 18:06:53 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-03-05 18:29:08 +0000
commitd2ec3ce54547bb810ca19e17049e6148dbbf0801 (patch)
tree7ba279d5b92b49f83bb398eaa86d2dea2805373e /dgit-repos-server
parentc499f617a23518d7eead81e580b313ba1bbede02 (diff)
dgit-repos-server: fix dm parsing, more tests
Diffstat (limited to 'dgit-repos-server')
-rwxr-xr-xdgit-repos-server12
1 files changed, 7 insertions, 5 deletions
diff --git a/dgit-repos-server b/dgit-repos-server
index 897e414..33c18f1 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -391,12 +391,14 @@ sub dm_txt_check ($$) {
while (<DT>) {
m/^fingerprint:\s+$keyid$/oi
..0 or next;
- m/^./
- 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/\([^()]+\)//;