Use make json to rebuild Manager files (#1601)

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm

@@ -43,7 +43,7 @@ our $authParameters = {
   demoParams => [qw(demoExportedVars)],
   facebookParams => [qw(facebookAuthnLevel facebookExportedVars facebookAppId facebookAppSecret facebookUserField)],
   kerberosParams => [qw(krbKeytab krbByJs krbAuthnLevel krbRemoveDomain)],
-  ldapParams => [qw(ldapAuthnLevel ldapExportedVars ldapServer ldapPort ldapBase managerDn managerPassword ldapTimeout ldapVersion ldapRaw LDAPFilter AuthLDAPFilter mailLDAPFilter ldapSearchDeref ldapGroupBase ldapGroupObjectClass ldapGroupAttributeName ldapGroupAttributeNameUser ldapGroupAttributeNameSearch ldapGroupRecursive ldapGroupAttributeNameGroup ldapPpolicyControl ldapSetPassword ldapChangePasswordAsUser ldapPwdEnc ldapUsePasswordResetAttribute ldapPasswordResetAttribute ldapPasswordResetAttributeValue ldapAllowResetExpiredPassword)],
+  ldapParams => [qw(ldapAuthnLevel ldapExportedVars ldapServer ldapPort ldapBase managerDn managerPassword ldapTimeout ldapVersion ldapRaw LDAPFilter AuthLDAPFilter mailLDAPFilter ldapSearchDeref ldapGroupBase ldapGroupObjectClass ldapGroupAttributeName ldapGroupAttributeNameUser ldapGroupAttributeNameSearch ldapGroupDecodeSearchedValue ldapGroupRecursive ldapGroupAttributeNameGroup ldapPpolicyControl ldapSetPassword ldapChangePasswordAsUser ldapPwdEnc ldapUsePasswordResetAttribute ldapPasswordResetAttribute ldapPasswordResetAttributeValue ldapAllowResetExpiredPassword)],
   linkedinParams => [qw(linkedInAuthnLevel linkedInClientID linkedInClientSecret linkedInFields linkedInUserField linkedInScope)],
   nullParams => [qw(nullAuthnLevel)],
   oidcParams => [qw(oidcAuthnLevel oidcRPCallbackGetParam oidcRPStateTimeout)],

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -8,17 +8,17 @@ sub types {
         'array' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'authParamsText' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'blackWhiteList' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'bool' => {
             'msgFail' => '__notABoolean__',
@@ -36,17 +36,17 @@ sub types {
                         split( /\n/, $@, 0 ) )
                 );
                 return $err ? ( 1, "__badExpression__: $err" ) : 1;
-            }
+              }
         },
         'catAndAppList' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'file' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'hostname' => {
             'form'    => 'text',
@@ -80,48 +80,48 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
                       if $_ =~ /exportedvars$/i and defined $conf->{$_}{$val};
                 }
                 return 1, "__unknownAttrOrMacro__: $val";
-            }
+              }
         },
         'longtext' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'menuApp' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'menuCat' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'oidcmetadatajson' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'oidcmetadatajwks' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'oidcOPMetaDataNode' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'oidcRPMetaDataNode' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'password' => {
             'msgFail' => '__malformedValue__',
             'test'    => sub {
                 1;
-            }
+              }
         },
         'pcre' => {
             'form' => 'text',
@@ -132,7 +132,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
                       }
                 };
                 return $@ ? ( 0, "__badRegexp__: $@" ) : 1;
-            }
+              }
         },
         'PerlModule' => {
             'form'    => 'text',
@@ -142,17 +142,17 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
         'portalskin' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'portalskinbackground' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'post' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'RSAPrivateKey' => {
             'test' => sub {
@@ -160,7 +160,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
 m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?(?:Proc-Type:.*\r?\nDEK-Info:.*\r?\n[\r\n]*)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:RSA\s+)PRIVATE\s+KEY\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-            }
+              }
         },
         'RSAPublicKey' => {
             'test' => sub {
@@ -168,7 +168,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?(?:Proc-Type:.*\r?\n
 m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+PUBLIC\s+KEY\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-            }
+              }
         },
         'RSAPublicKeyOrCertificate' => {
             'test' => sub {
@@ -176,37 +176,37 @@ m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\
 m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-            }
+              }
         },
         'rule' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlAssertion' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlAttribute' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlIDPMetaDataNode' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlService' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlSPMetaDataNode' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'select' => {
             'test' => sub {
@@ -216,19 +216,19 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\
                 return $test
                   ? 1
                   : ( 1, "Invalid value '$_[0]' for this select" );
-            }
+              }
         },
         'subContainer' => {
             'keyTest' => qr/\w/,
             'test'    => sub {
                 1;
-            }
+              }
         },
         'text' => {
             'msgFail' => '__malformedValue__',
             'test'    => sub {
                 1;
-            }
+              }
         },
         'trool' => {
             'msgFail' => '__authorizedValues__: -1, 0, 1',
@@ -1058,7 +1058,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
                             split( /\n/, $@, 0 ) )
                     );
                     return $err ? ( 1, "__badExpression__: $err" ) : 1;
-                }
+                  }
             },
             'type' => 'keyTextContainer'
         },
@@ -1231,7 +1231,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
                           and defined $conf->{$_}{$val};
                     }
                     return 1, "__unknownAttrOrMacro__: $val";
-                }
+                  }
             },
             'type' => 'doubleHash'
         },
@@ -1353,6 +1353,10 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
         'ldapGroupBase' => {
             'type' => 'text'
         },
+        'ldapGroupDecodeSearchedValue' => {
+            'default' => 0,
+            'type'    => 'bool'
+        },
         'ldapGroupObjectClass' => {
             'default' => 'groupOfNames',
             'type'    => 'text'
@@ -1514,7 +1518,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
                             split( /\n/, $@, 0 ) )
                     );
                     return $err ? ( 1, "__badExpression__: $err" ) : 1;
-                }
+                  }
             },
             'type' => 'ruleContainer'
         },