Merge pull request #11960 from snipe/fixes/better_validation_for_ldap_filter

Sets nullable attribute on validation
2022-10-12 10:53:08 -07:00
parent 06803092c5 0312ecf09d
commit cd43fc50fb
1 changed files with 2 additions and 2 deletions
@@ -923,8 +923,8 @@ class SettingsController extends Controller

        $validator = Validator::make($setting->toArray(), [
            'ldap_username_field' => 'not_in:sAMAccountName',
-            'ldap_auth_filter_query' => 'not_in:uid=samaccountname',
-            'ldap_filter' => 'regex:"^[^(]"',
+            'ldap_auth_filter_query' => 'not_in:uid=samaccountname|required_if:ldap_enabled,1',
+            'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1',
        ],  $messages);