Append conf test (#1783)

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

@@ -18,42 +18,41 @@ sub defaultValues {
         'authChoiceParam' => 'lmAuth',
         'authentication'  => 'Demo',
         'available2F'     => 'UTOTP,TOTP,U2F,REST,Mail2F,Ext2F,Yubikey',
-        'available2FSelfRegistration'      => 'TOTP,U2F,Yubikey',
-        'bruteForceProtectionMaxAge'       => 300,
-        'bruteForceProtectionMaxFailed'    => 3,
-        'bruteForceProtectionTempo'        => 30,
-        'captcha_mail_enabled'             => 1,
-        'captcha_register_enabled'         => 1,
-        'captcha_size'                     => 6,
-        'casAccessControlPolicy'           => 'none',
-        'casAuthnLevel'                    => 1,
-        'checkTime'                        => 600,
-        'checkUserHiddenAttributes'        => '_loginHistory hGroups',
-        'checkUserIdRule'                  => 1,
-        'checkXSS'                         => 1,
-        'confirmFormMethod'                => 'post',
-        'contextSwitchingHiddenAttributes' => '',
-        'contextSwitchingIdRule'           => 1,
-        'contextSwitchingRule'             => 0,
-        'contextSwitchingStopWithLogout'   => 1,
-        'cookieName'                       => 'lemonldap',
-        'corsAllow_Credentials'            => 'true',
-        'corsAllow_Headers'                => '*',
-        'corsAllow_Methods'                => 'POST,GET',
-        'corsAllow_Origin'                 => '*',
-        'corsEnabled'                      => 1,
-        'corsExpose_Headers'               => '*',
-        'corsMax_Age'                      => '86400',
-        'cspConnect'                       => '\'self\'',
-        'cspDefault'                       => '\'self\'',
-        'cspFont'                          => '\'self\'',
-        'cspFormAction'                    => '\'self\'',
-        'cspImg'                           => '\'self\' data:',
-        'cspScript'                        => '\'self\'',
-        'cspStyle'                         => '\'self\'',
-        'dbiAuthnLevel'                    => 2,
-        'dbiExportedVars'                  => {},
-        'demoExportedVars'                 => {
+        'available2FSelfRegistration'    => 'TOTP,U2F,Yubikey',
+        'bruteForceProtectionMaxAge'     => 300,
+        'bruteForceProtectionMaxFailed'  => 3,
+        'bruteForceProtectionTempo'      => 30,
+        'captcha_mail_enabled'           => 1,
+        'captcha_register_enabled'       => 1,
+        'captcha_size'                   => 6,
+        'casAccessControlPolicy'         => 'none',
+        'casAuthnLevel'                  => 1,
+        'checkTime'                      => 600,
+        'checkUserHiddenAttributes'      => '_loginHistory hGroups',
+        'checkUserIdRule'                => 1,
+        'checkXSS'                       => 1,
+        'confirmFormMethod'              => 'post',
+        'contextSwitchingIdRule'         => 1,
+        'contextSwitchingRule'           => 0,
+        'contextSwitchingStopWithLogout' => 1,
+        'cookieName'                     => 'lemonldap',
+        'corsAllow_Credentials'          => 'true',
+        'corsAllow_Headers'              => '*',
+        'corsAllow_Methods'              => 'POST,GET',
+        'corsAllow_Origin'               => '*',
+        'corsEnabled'                    => 1,
+        'corsExpose_Headers'             => '*',
+        'corsMax_Age'                    => '86400',
+        'cspConnect'                     => '\'self\'',
+        'cspDefault'                     => '\'self\'',
+        'cspFont'                        => '\'self\'',
+        'cspFormAction'                  => '\'self\'',
+        'cspImg'                         => '\'self\' data:',
+        'cspScript'                      => '\'self\'',
+        'cspStyle'                       => '\'self\'',
+        'dbiAuthnLevel'                  => 2,
+        'dbiExportedVars'                => {},
+        'demoExportedVars'               => {
             'cn'   => 'cn',
             'mail' => 'mail',
             'uid'  => 'uid'

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

@@ -923,10 +923,6 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             ],
             'type' => 'select'
         },
-        'contextSwitchingHiddenAttributes' => {
-            'default' => '',
-            'type'    => 'text'
-        },
         'contextSwitchingIdRule' => {
             'default' => 1,
             'test'    => sub {

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

@@ -502,12 +502,12 @@ sub attributes {
             default       => 1,
             documentation => 'Stop context switching by logout',
         },
-        contextSwitchingHiddenAttributes => {
-            type          => 'text',
-            default       => '',
-            documentation => 'Attributes to skip',
-            flags         => 'p',
-        },
+        # contextSwitchingHiddenAttributes => {
+        #     type          => 'text',
+        #     default       => '',
+        #     documentation => 'Attributes to skip',
+        #     flags         => 'p',
+        # },
         skipRenewConfirmation => {
             type    => 'bool',
             default => 0,

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm

@@ -670,7 +670,7 @@ sub tree {
                                 'contextSwitchingRule',
                                 'contextSwitchingIdRule',
                                 'contextSwitchingStopWithLogout',
-                                'contextSwitchingHiddenAttributes',
+                                #'contextSwitchingHiddenAttributes',
                             ]
                         },
                     ]

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm

@@ -643,12 +643,11 @@ sub tests {
             return 1;
         },
 
-        # Warn if Impersonation is enabled without prefix
-        impersonationPrefix => sub {
-            return 1 unless ( $conf->{impersonationRule} );
+        # Warn if Impersonation and ContextSwitching are simultaneously enabled
+        impersonation => sub {
             return ( 1,
-                "Impersonation is enabled without real attributes prefix" )
-              unless ( $conf->{impersonationPrefix} );
+                "Impersonation and ContextSwitching are simultaneously enabled" )
+              if ( $conf->{impersonationRule} && $conf->{contextSwitchingRule} );
 
             # Return
             return 1;