diff --git a/.env.example b/.env.example index 35d098523e..c6ea3b0215 100644 --- a/.env.example +++ b/.env.example @@ -170,6 +170,7 @@ MAP_DEFAULT_LAT=51.983333 MAP_DEFAULT_LONG=5.916667 MAP_DEFAULT_ZOOM=6 +# TODO update me. # Firefly III has two options for user authentication. "eloquent" is the default, # and "ldap" for LDAP servers. # For full instructions on these settings please visit: @@ -179,8 +180,6 @@ MAP_DEFAULT_ZOOM=6 # If you enable 'ldap' AND you run Docker, the Docker image will contact packagist.org # This is necessary to download the required packages. # -LOGIN_PROVIDER=eloquent - # It's also possible to change the way users are authenticated. You could use Authelia for example. # Authentication via the REMOTE_USER header is supported. Change the value below to "remote_user_guard". # @@ -265,6 +264,66 @@ ADLDAP_AUTH_FIELD=distinguishedname # You can set the following variable from a file by appending it with _FILE: ADLDAP_SYNC_FIELD=userprincipalname + +# Login provider is obsolete +#LOGIN_PROVIDER=eloquent +AUTHENTICATION_GUARD=ldap +#CUSTOM_LOGOUT_URI=https://nu.nl + +# start new LDAP settings +LDAP_LOGGING=true +LDAP_CONNECTION=default +LDAP_HOST=ldap.jumpcloud.com +LDAP_USERNAME="uid=authelia,ou=Users,o=5fdddb09ae7868233b9d26d6,dc=jumpcloud,dc=com" +LDAP_PASSWORD=FZWhDnXVb_.ciGFVwuQC@m9CVo@vdVMx +LDAP_PORT=389 +LDAP_BASE_DN="ou=Users,o=5fdddb09ae7868233b9d26d6,dc=jumpcloud,dc=com" +LDAP_TIMEOUT=5 +LDAP_SSL=true +LDAP_TLS=false +# end new LDAP settings + +# start custom LDAP settings +LDAP_AUTH_FIELD=uid +# end custom LDAP settings + + +# LDAP connection configuration +# OpenLDAP, FreeIPA or ActiveDirectory +#ADLDAP_CONNECTION_SCHEME=OpenLDAP +#ADLDAP_AUTO_CONNECT=true + +# LDAP connection settings +#ADLDAP_CONTROLLERS= +#ADLDAP_PORT=389 +#ADLDAP_TIMEOUT=5 +#ADLDAP_BASEDN="" +#ADLDAP_FOLLOW_REFFERALS=false +#ADLDAP_USE_SSL=false +#ADLDAP_USE_TLS=false +#ADLDAP_SSL_CACERTDIR= +#ADLDAP_SSL_CACERTFILE= +#ADLDAP_SSL_CERTFILE= +#ADLDAP_SSL_KEYFILE= +#ADLDAP_SSL_CIPHER_SUITE= +#ADLDAP_SSL_REQUIRE_CERT= +#ADLDAP_ADMIN_USERNAME= +#ADLDAP_ADMIN_PASSWORD= +#ADLDAP_ACCOUNT_PREFIX= +#ADLDAP_ACCOUNT_SUFFIX= +# LDAP authentication settings. +#ADLDAP_PASSWORD_SYNC=false +#ADLDAP_LOGIN_FALLBACK=false +#ADLDAP_DISCOVER_FIELD=distinguishedname +#ADLDAP_AUTH_FIELD=distinguishedname + +# Will allow SSO if your server provides an AUTH_USER field. +#WINDOWS_SSO_DISCOVER=samaccountname +#WINDOWS_SSO_KEY=AUTH_USER + +# field to sync as local username. +#ADLDAP_SYNC_FIELD=userprincipalname + # You can disable the X-Frame-Options header if it interferes with tools like # Organizr. This is at your own risk. Applications running in frames run the risk # of leaking information to their parent frame. diff --git a/composer.lock b/composer.lock index c08cc08a6b..08570aff06 100644 --- a/composer.lock +++ b/composer.lock @@ -377,16 +377,16 @@ }, { "name": "directorytree/ldaprecord", - "version": "v2.4.3", + "version": "v2.4.5", "source": { "type": "git", "url": "https://github.com/DirectoryTree/LdapRecord.git", - "reference": "d384f2fa8926ffbef01e00e67068afdffcc9a781" + "reference": "eefed3d8a3f3734f851a9d158452b8f711be6f23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/d384f2fa8926ffbef01e00e67068afdffcc9a781", - "reference": "d384f2fa8926ffbef01e00e67068afdffcc9a781", + "url": "https://api.github.com/repos/DirectoryTree/LdapRecord/zipball/eefed3d8a3f3734f851a9d158452b8f711be6f23", + "reference": "eefed3d8a3f3734f851a9d158452b8f711be6f23", "shasum": "" }, "require": { @@ -400,6 +400,7 @@ "tightenco/collect": "^5.6|^6.0|^7.0|^8.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.0", "mockery/mockery": "^1.0", "phpunit/phpunit": "^8.0" }, @@ -445,7 +446,7 @@ "type": "github" } ], - "time": "2021-04-25T02:35:23+00:00" + "time": "2021-05-08T20:00:49+00:00" }, { "name": "directorytree/ldaprecord-laravel",