From e60444cf652853941c2f0a750b545bfe7068b536 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 3 Oct 2021 15:31:36 +0200 Subject: [PATCH] Add log for #5133 --- app/Ldap/Rules/UserDefinedRule.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Ldap/Rules/UserDefinedRule.php b/app/Ldap/Rules/UserDefinedRule.php index 4bc4520b6c1..ac5563863d7 100644 --- a/app/Ldap/Rules/UserDefinedRule.php +++ b/app/Ldap/Rules/UserDefinedRule.php @@ -5,6 +5,7 @@ use LdapRecord\Laravel\Auth\Rule; use LdapRecord\Models\ActiveDirectory\Group; +use Log; /** * Class UserDefinedRule @@ -20,11 +21,16 @@ public function isValid() { // LDAP_GROUP_FILTER $groupFilter = config('ldap.group_filter'); + Log::debug(sprintf('UserDefinedRule with group filter "%s"', $groupFilter)); if (null !== $groupFilter && '' !== (string)$groupFilter) { - $administrators = Group::find('cn=Administrators,dc=local,dc=com'); + Log::debug('Group filter is not empty, will now apply it.'); + $administrators = Group::find($groupFilter); + $result = $this->user->groups()->recursive()->exists($administrators); + Log::debug(sprintf('Search result is %s.', var_export($result, true))); - return $this->user->groups()->recursive()->exists($administrators); + return $result; } + Log::debug('Group filter is empty or NULL, so will return true.'); return true; }