Merge pull request #11960 from snipe/fixes/better_validation_for_ldap_filter

Sets nullable attribute on validation
This commit is contained in:
snipe 2022-10-12 10:53:08 -07:00 committed by GitHub
commit cd43fc50fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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