From bb5efce091215432fd2b82fbf50aff1536d415f6 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 5 Dec 2016 14:54:28 +0100
Subject: "config-certs" now points to a list of files or directories.

---
 lacme | 65 ++++++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 25 deletions(-)

(limited to 'lacme')

diff --git a/lacme b/lacme
index 86071fd..3b7c174 100755
--- a/lacme
+++ b/lacme
@@ -60,7 +60,7 @@ sub usage(;$$) {
     }
     exit $rv;
 }
-usage(1) unless GetOptions(\%OPTS, qw/config=s config-certs=s socket=s agreement-uri=s quiet|q debug help|h/);
+usage(1) unless GetOptions(\%OPTS, qw/config=s config-certs=s@ socket=s agreement-uri=s quiet|q debug help|h/);
 usage(0) if $OPTS{help};
 
 $COMMAND = shift(@ARGV) // usage(1, "Missing command");
@@ -68,15 +68,15 @@ $COMMAND = $COMMAND =~ /\A(new-reg|reg=\p{Print}*|new-cert|revoke-cert)\z/ ? $1
          : usage(1, "Invalid command: $COMMAND"); # validate and untaint $COMMAND
 @ARGV = map { /\A(\p{Print}*)\z/ ? $1 : die } @ARGV; # untaint @ARGV
 
+my $CONFFILENAME = $OPTS{config} // first { -f $_ }
+   ( "./$NAME.conf"
+   , ($ENV{XDG_CONFIG_HOME} // "$ENV{HOME}/.config")."/lacme/$NAME.conf"
+   , "/etc/lacme/$NAME.conf"
+   );
 do {
-    my $conffile = $OPTS{config} // first { -f $_ }
-        ( "./$NAME.conf"
-        , ($ENV{XDG_CONFIG_HOME} // "$ENV{HOME}/.config")."/lacme/$NAME.conf"
-        , "/etc/lacme/$NAME.conf"
-        );
-    die "Error: Can't find configuration file\n" unless defined $conffile;
-    print STDERR "Using configuration file: $conffile\n" if $OPTS{debug};
-    open $CONFFILE, '<', $conffile or die "Can't open $conffile: $!\n";
+    die "Error: Can't find configuration file\n" unless defined $CONFFILENAME;
+    print STDERR "Using configuration file: $CONFFILENAME\n" if $OPTS{debug};
+    open $CONFFILE, '<', $CONFFILENAME or die "Can't open $CONFFILENAME: $!\n";
     my $conf = do { local $/ = undef, <$CONFFILE> };
     # don't close $CONFFILE so we can pass it to the client
 
@@ -559,24 +559,39 @@ if ($COMMAND eq 'new-reg' or $COMMAND =~ /^reg=/) {
 # new-cert [SECTION ..]
 #
 elsif ($COMMAND eq 'new-cert') {
+    my $conffiles = defined $OPTS{'config-certs'} ? $OPTS{'config-certs'}
+                  : defined $CONFIG->{_}->{'config-certs'} ? [ split(/\s+/, $CONFIG->{_}->{'config-certs'}) ]
+                  : [ "$NAME-certs.conf", "$NAME-certs.d/" ];
     my $conf;
-    do {
-        my $conffile = $OPTS{'config-certs'} // $CONFIG->{_}->{'config-certs'} // first { -f $_ }
-            ( "./$NAME-certs.conf"
-            , ($ENV{XDG_CONFIG_HOME} // "$ENV{HOME}/.config")."/lacme/$NAME-certs.conf"
-            , "/etc/lacme/$NAME-certs.conf"
-            );
-        die "Error: Can't find certificate configuration file\n" unless defined $conffile;
-        my $h = Config::Tiny::->read($conffile) or die Config::Tiny::->errstr()."\n";
-        my $defaults = delete $h->{_} // {};
-        my @valid = qw/certificate certificate-chain certificate-key min-days CAfile
-                       hash keyUsage subject subjectAltName chown chmod notify/;
-        foreach my $s (keys %$h) {
-            $conf->{$s} = { map { $_ => delete $h->{$s}->{$_} } @valid };
-            die "Unknown option(s) in [$s]: ".join(', ', keys %{$h->{$s}})."\n" if %{$h->{$s}};
-            $conf->{$s}->{$_} //= $defaults->{$_} foreach keys %$defaults;
+    foreach my $conffile (@$conffiles) {
+        $conffile = ($CONFFILENAME =~ s#[^/]+\z##r).$conffile unless $conffile =~ /\A\//;
+        my @filenames;
+        unless ($conffile =~ s#/\z## or -d $conffile) {
+            @filenames = ($conffile);
+        } else {
+            opendir my $dh, $conffile or die "Can't opendir $conffile: $!\n";
+            while (readdir $dh) {
+                if (/\.conf\z/) {
+                    push @filenames, "$conffile/$_";
+                } elsif ($_ ne '.' and $_ ne '..') {
+                    warn "$conffile/$_ has unknown suffix, skipping\n";
+                }
+            }
+            closedir $dh;
         }
-    };
+        foreach my $filename (sort @filenames) {
+            print STDERR "Reading $filename\n" if $OPTS{debug};
+            my $h = Config::Tiny::->read($filename) or die Config::Tiny::->errstr()."\n";
+            my $defaults = delete $h->{_} // {};
+            my @valid = qw/certificate certificate-chain certificate-key min-days CAfile
+                           hash keyUsage subject subjectAltName chown chmod notify/;
+            foreach my $s (keys %$h) {
+                $conf->{$s} = { map { $_ => delete $h->{$s}->{$_} } @valid };
+                die "Unknown option(s) in [$s]: ".join(', ', keys %{$h->{$s}})."\n" if %{$h->{$s}};
+                $conf->{$s}->{$_} //= $defaults->{$_} foreach keys %$defaults;
+            }
+        }
+    }
 
     my $challenge_dir;
     my $rv = 0;
-- 
cgit v1.2.3