IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-20 11:48:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3733 from glmdev/glmdev-ldap-filter

Browse Source 
Add config option to specify custom LDAP filter
This commit is contained in:
James Cole 2020-08-26 14:53:11 +00:00 committed by GitHub
commit e2a3aa12a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Scopes/LdapFilterScope.php Normal file
View File

@ -0,0 +1,21 @@
<?php
namespace FireflyIII\Scopes;
use Adldap\Query\Builder;
use Adldap\Laravel\Scopes\ScopeInterface;
class LdapFilterScope implements ScopeInterface {
/**
* If the ADLDAP_AUTH_FILTER is provided, apply the filter to the LDAP query.
* @param Builder $query
* @return void
*/
public function apply(Builder $query)
{
$filter = (string) config('ldap_auth.custom_filter');
if ( '' !== $filter ) {
$query->rawFilter($filter);
}
}
}

20
config/ldap_auth.php
View File

@ -22,6 +22,8 @@
declare(strict_types=1);
use FireflyIII\Scopes\LdapFilterScope;
use Adldap\Laravel\Events\Authenticated;
use Adldap\Laravel\Events\AuthenticatedModelTrashed;
use Adldap\Laravel\Events\AuthenticatedWithWindows;
@ -49,13 +51,17 @@ use Adldap\Laravel\Scopes\UpnScope;
// default OpenLDAP scopes.
$scopes = [
LdapFilterScope::class,
UidScope::class,
];
if ('FreeIPA' === env('ADLDAP_CONNECTION_SCHEME')) {
$scopes = [];
$scopes = [
LdapFilterScope::class,
];
}
if ('ActiveDirectory' === env('ADLDAP_CONNECTION_SCHEME')) {
$scopes = [
LdapFilterScope::class,
UpnScope::class,
];
}
@ -374,4 +380,16 @@ return [
],
],
/*
|--------------------------------------------------------------------------
| Custom LDAP Filter
|--------------------------------------------------------------------------
|
| This value can be optionally provided to restrict LDAP queries to the
| given filter. It should be in LDAP filter format, and will be
| applied in the LdapFilterScope.
|
*/
'custom_filter' => env('ADLDAP_AUTH_FILTER', ''),
];