lmConfigEditor with JSON

Changes.md

@@ -1,5 +1,6 @@
 # Changes
 
+* 2024-08-18: add --json option to lmConfigEditor
 * 2024-08-18: add message-broker
 * 2024-08-18(v2.19.1-3):
   * add `TLS_CERT_FILE` and `TLS_KEY_FILE` variables

full/Dockerfile

@@ -26,6 +26,7 @@ RUN \
     echo patch crowdsec.patch && patch -p1 < crowdsec.patch && \
     echo patch recaptcha.patch && patch -p1 < recaptcha.patch && \
     echo patch msg-broker.patch && patch -p1 < msg-broker.patch && \
+    echo patch lmConfigEditor.patch && patch -p1 < lmConfigEditor.patch && \
     rm -f *.patch && \
     LLNG_DEFAULTCONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
     perl -MLemonldap::NG::Manager::Build -e 'Lemonldap::NG::Manager::Build->run( \

full/lmConfigEditor.patch

@@ -0,0 +1,55 @@
+--- a/usr/share/lemonldap-ng/bin/lmConfigEditor
++++ b/usr/share/lemonldap-ng/bin/lmConfigEditor
+@@ -18,10 +18,12 @@ my $cli = Lemonldap::NG::Manager::Cli::Lib->new;
+
+ our $opt_user  = 'www-data';
+ our $opt_group = 'www-data';
++our $opt_json;
+
+ GetOptions(
+     "user=s"  => \$opt_user,
+-    "group=s" => \$opt_group
++    "group=s" => \$opt_group,
++    "json"    => \$opt_json,
+ ) or die("Error in command line arguments\n");
+
+ eval {
+@@ -45,10 +47,17 @@ delete $refConf->{cfgAuthorIP};
+ delete $refConf->{cfgDate};
+ $refConf->{cfgLog} = '';
+
+-# Sort keys
+-$Data::Dumper::Sortkeys = 1;
+-$Data::Dumper::Useperl  = 1;
+-my $tmp = Dumper($refConf);
++my $tmp;
++if ($opt_json) {
++    require JSON;
++    $tmp = JSON->new->pretty->canonical->encode($refConf);
++}
++else {
++    # Sort keys
++    $Data::Dumper::Sortkeys = 1;
++    $Data::Dumper::Useperl  = 1;
++    $tmp                    = Dumper($refConf);
++}
+
+ my $refFile  = File::Temp->new( UNLINK => 1 );
+ my $editFile = File::Temp->new( UNLINK => 1 );
+@@ -73,8 +82,14 @@ if ( $rc == 0 and compare( $refFile->filename, $editFile->filename ) == 1 ) {
+     my $buf = join( '', <$F1> );
+     close $F1;
+
+-    my $newConf = Safe->new->reval($buf);
+-    die $EVAL_ERROR if $EVAL_ERROR;
++    my $newConf;
++    if ($opt_json) {
++        $newConf = JSON::from_json($buf);
++    }
++    else {
++        $newConf = Safe->new->reval($buf);
++        die $EVAL_ERROR if $EVAL_ERROR;
++    }
+
+     # Update author and date
+     $newConf->{cfgAuthor} =

manager/Dockerfile

@@ -33,6 +33,7 @@ RUN \
     echo patch crowdsec.patch && patch -p1 < crowdsec.patch && \
     echo patch recaptcha.patch && patch -p1 < recaptcha.patch && \
     echo patch msg-broker.patch && patch -p1 < msg-broker.patch && \
+    echo patch lmConfigEditor.patch && patch -p1 < lmConfigEditor.patch && \
     rm -f *.patch && \
     LLNG_DEFAULTCONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
     perl -MLemonldap::NG::Manager::Build -e 'Lemonldap::NG::Manager::Build->run( \

manager/lmConfigEditor.patch

@@ -0,0 +1,55 @@
+--- a/usr/share/lemonldap-ng/bin/lmConfigEditor
++++ b/usr/share/lemonldap-ng/bin/lmConfigEditor
+@@ -18,10 +18,12 @@ my $cli = Lemonldap::NG::Manager::Cli::Lib->new;
+
+ our $opt_user  = 'www-data';
+ our $opt_group = 'www-data';
++our $opt_json;
+
+ GetOptions(
+     "user=s"  => \$opt_user,
+-    "group=s" => \$opt_group
++    "group=s" => \$opt_group,
++    "json"    => \$opt_json,
+ ) or die("Error in command line arguments\n");
+
+ eval {
+@@ -45,10 +47,17 @@ delete $refConf->{cfgAuthorIP};
+ delete $refConf->{cfgDate};
+ $refConf->{cfgLog} = '';
+
+-# Sort keys
+-$Data::Dumper::Sortkeys = 1;
+-$Data::Dumper::Useperl  = 1;
+-my $tmp = Dumper($refConf);
++my $tmp;
++if ($opt_json) {
++    require JSON;
++    $tmp = JSON->new->pretty->canonical->encode($refConf);
++}
++else {
++    # Sort keys
++    $Data::Dumper::Sortkeys = 1;
++    $Data::Dumper::Useperl  = 1;
++    $tmp                    = Dumper($refConf);
++}
+
+ my $refFile  = File::Temp->new( UNLINK => 1 );
+ my $editFile = File::Temp->new( UNLINK => 1 );
+@@ -73,8 +82,14 @@ if ( $rc == 0 and compare( $refFile->filename, $editFile->filename ) == 1 ) {
+     my $buf = join( '', <$F1> );
+     close $F1;
+
+-    my $newConf = Safe->new->reval($buf);
+-    die $EVAL_ERROR if $EVAL_ERROR;
++    my $newConf;
++    if ($opt_json) {
++        $newConf = JSON::from_json($buf);
++    }
++    else {
++        $newConf = Safe->new->reval($buf);
++        die $EVAL_ERROR if $EVAL_ERROR;
++    }
+
+     # Update author and date
+     $newConf->{cfgAuthor} =