From 9a8f705eddd18ccc9a24fe0e7efe6b5a87b2be09 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 25 Feb 2021 01:41:59 +0100
Subject: lacme: pass a temporary JSON file with the client configuration to
 the internal client.

So it doesn't have to parse the INI file again.  Also, while lacme.conf
is world-readable by default, one might restrict permissions and add
private information in there, not realizing that everything, including
comments, will be readable by the client.
---
 client | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'client')

diff --git a/client b/client
index 33189d3..8439ddb 100755
--- a/client
+++ b/client
@@ -56,8 +56,6 @@ use Date::Parse ();
 use LWP::UserAgent ();
 use JSON ();
 
-use Config::Tiny ();
-
 # Clean up PATH
 $ENV{PATH} = join ':', qw{/usr/bin /bin};
 delete @ENV{qw/IFS CDPATH ENV BASH_ENV/};
@@ -107,11 +105,7 @@ do {
 
 my $CONFIG = do {
     my $conf = do { local $/ = undef; <$CONFFILE> };
-    close $CONFFILE or die "close: $!";
-    my $h = Config::Tiny::->read_string($conf) or die Config::Tiny::->errstr()."\n";
-    $h->{_} //= {};
-    $h->{client}->{$_} //= $h->{_}->{$_} foreach keys %{$h->{_}}; # add defaults
-    $h->{client};
+    JSON::->new->decode($conf);
 };
 my $UA = do {
     my %args = %$CONFIG;
-- 
cgit v1.2.3