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

Fix LDAP auth configuration paths.

Browse Source 
This commit fixes parameters broken in the latest version of `adldap2`.

Specifically:

* `adldap` auth parameters have changed in the latest version.
  * "usernames" has become `identities` and `discover` has changed to
    `discover_users_by`, `auth` has changed to `bind_users_by`
* Add the missing objectguid field to the users table for adldap2.
  * This is added as a nullable (optional) field at the moment to support
    tracking LDAP users as adldap2 wants to.
This commit is contained in:
Will Rouesnel 2019-03-11 21:43:02 +11:00
parent a13ad5b417
commit cb4ff35adb
No known key found for this signature in database
GPG Key ID: 72DC65802A1091C5
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/ldap_auth.php
View File

@ -143,7 +143,7 @@ return [
'scopes' => $scopes,
'usernames' => [
'identifiers' => [
/*
|--------------------------------------------------------------------------
@ -173,8 +173,8 @@ return [
'ldap' => [
'discover' => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'),
'authenticate' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'),
'locate_users_by' => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'),
'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'),
],

43
database/migrations/2019_03_11_223700_fixldap.php Normal file
View File

@ -0,0 +1,43 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
/**
* Class ChangesForV4713
*/
class ChangesForV4713 extends Migration
{
/**
* Reverse the migrations.
*
* @return void
*/
public function down(): void
{
Schema::table(
'users', function (Blueprint $table) {
$table->dropColumn(['objectguid']);
}
);
}
/**
* Run the migrations.
*
* @return void
*/
public function up(): void
{
/**
* ADLdap2 appears to require the ability to store an objectguid for LDAP users
* now. To support this, we add the column.
*/
Schema::table(
'users', function (Blueprint $table) {
$table->uuid('objectguid')->nullable()->after('id');
}
);
}
}