kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Updated LDAP code #2085

Browse Source
This commit is contained in:
James Cole
2019-02-15 07:22:51 +01:00
parent 22bc6d507e
commit 0782354160
9 changed files with 95 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.docker
View File

@@ -112,7 +112,7 @@ ANALYTICS_ID=${ANALYTICS_ID}
USE_ENCRYPTION=true USE_ENCRYPTION=true
# Firefly III has two options for user authentication. "eloquent" is the default, # Firefly III has two options for user authentication. "eloquent" is the default,
# and "adldap" for LDAP servers. # and "ldap" for LDAP servers.
# For full instructions on these settings please visit: # For full instructions on these settings please visit:
# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html # https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
LOGIN_PROVIDER=${LOGIN_PROVIDER} LOGIN_PROVIDER=${LOGIN_PROVIDER}
@@ -135,8 +135,6 @@ ADLDAP_ADMIN_PASSWORD="${ADLDAP_ADMIN_PASSWORD}"
ADLDAP_ACCOUNT_PREFIX="${ADLDAP_ACCOUNT_PREFIX}" ADLDAP_ACCOUNT_PREFIX="${ADLDAP_ACCOUNT_PREFIX}"
ADLDAP_ACCOUNT_SUFFIX="${ADLDAP_ACCOUNT_SUFFIX}" ADLDAP_ACCOUNT_SUFFIX="${ADLDAP_ACCOUNT_SUFFIX}"
ADLDAP_ADMIN_ACCOUNT_PREFIX="${ADLDAP_ADMIN_ACCOUNT_PREFIX}"
ADLDAP_ADMIN_ACCOUNT_SUFFIX="${ADLDAP_ADMIN_ACCOUNT_SUFFIX}"
# LDAP authentication settings. # LDAP authentication settings.
ADLDAP_PASSWORD_SYNC=${ADLDAP_PASSWORD_SYNC} ADLDAP_PASSWORD_SYNC=${ADLDAP_PASSWORD_SYNC}

4
.env.example
View File

@@ -112,7 +112,7 @@ ANALYTICS_ID=
USE_ENCRYPTION=true USE_ENCRYPTION=true
# Firefly III has two options for user authentication. "eloquent" is the default, # Firefly III has two options for user authentication. "eloquent" is the default,
# and "adldap" for LDAP servers. # and "ldap" for LDAP servers.
# For full instructions on these settings please visit: # For full instructions on these settings please visit:
# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html # https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
LOGIN_PROVIDER=eloquent LOGIN_PROVIDER=eloquent
@@ -136,8 +136,6 @@ ADLDAP_ADMIN_PASSWORD=
ADLDAP_ACCOUNT_PREFIX= ADLDAP_ACCOUNT_PREFIX=
ADLDAP_ACCOUNT_SUFFIX= ADLDAP_ACCOUNT_SUFFIX=
ADLDAP_ADMIN_ACCOUNT_PREFIX=
ADLDAP_ADMIN_ACCOUNT_SUFFIX=
# LDAP authentication settings. # LDAP authentication settings.
ADLDAP_PASSWORD_SYNC=false ADLDAP_PASSWORD_SYNC=false

4
.env.heroku
View File

@@ -112,7 +112,7 @@ ANALYTICS_ID=
USE_ENCRYPTION=true USE_ENCRYPTION=true
# Firefly III has two options for user authentication. "eloquent" is the default, # Firefly III has two options for user authentication. "eloquent" is the default,
# and "adldap" for LDAP servers. # and "ldap" for LDAP servers.
# For full instructions on these settings please visit: # For full instructions on these settings please visit:
# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html # https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
LOGIN_PROVIDER=eloquent LOGIN_PROVIDER=eloquent
@@ -136,8 +136,6 @@ ADLDAP_ADMIN_PASSWORD=
ADLDAP_ACCOUNT_PREFIX= ADLDAP_ACCOUNT_PREFIX=
ADLDAP_ACCOUNT_SUFFIX= ADLDAP_ACCOUNT_SUFFIX=
ADLDAP_ADMIN_ACCOUNT_PREFIX=
ADLDAP_ADMIN_ACCOUNT_SUFFIX=
# LDAP authentication settings. # LDAP authentication settings.
ADLDAP_PASSWORD_SYNC=false ADLDAP_PASSWORD_SYNC=false

4
.env.sandstorm
View File

@@ -112,7 +112,7 @@ ANALYTICS_ID=
USE_ENCRYPTION=true USE_ENCRYPTION=true
# Firefly III has two options for user authentication. "eloquent" is the default, # Firefly III has two options for user authentication. "eloquent" is the default,
# and "adldap" for LDAP servers. # and "ldap" for LDAP servers.
# For full instructions on these settings please visit: # For full instructions on these settings please visit:
# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html # https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
LOGIN_PROVIDER=eloquent LOGIN_PROVIDER=eloquent
@@ -136,8 +136,6 @@ ADLDAP_ADMIN_PASSWORD=
ADLDAP_ACCOUNT_PREFIX= ADLDAP_ACCOUNT_PREFIX=
ADLDAP_ACCOUNT_SUFFIX= ADLDAP_ACCOUNT_SUFFIX=
ADLDAP_ADMIN_ACCOUNT_PREFIX=
ADLDAP_ADMIN_ACCOUNT_SUFFIX=
# LDAP authentication settings. # LDAP authentication settings.
ADLDAP_PASSWORD_SYNC=false ADLDAP_PASSWORD_SYNC=false

4
.env.testing
View File

@@ -112,7 +112,7 @@ ANALYTICS_ID=
USE_ENCRYPTION=false USE_ENCRYPTION=false
# Firefly III has two options for user authentication. "eloquent" is the default, # Firefly III has two options for user authentication. "eloquent" is the default,
# and "adldap" for LDAP servers. # and "ldap" for LDAP servers.
# For full instructions on these settings please visit: # For full instructions on these settings please visit:
# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html # https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
LOGIN_PROVIDER=eloquent LOGIN_PROVIDER=eloquent
@@ -136,8 +136,6 @@ ADLDAP_ADMIN_PASSWORD=
ADLDAP_ACCOUNT_PREFIX= ADLDAP_ACCOUNT_PREFIX=
ADLDAP_ACCOUNT_SUFFIX= ADLDAP_ACCOUNT_SUFFIX=
ADLDAP_ADMIN_ACCOUNT_PREFIX=
ADLDAP_ADMIN_ACCOUNT_SUFFIX=
# LDAP authentication settings. # LDAP authentication settings.
ADLDAP_PASSWORD_SYNC=false ADLDAP_PASSWORD_SYNC=false

2
composer.json
View File

@@ -68,7 +68,7 @@
"ext-fileinfo": "*", "ext-fileinfo": "*",
"ext-openssl": "*", "ext-openssl": "*",
"ext-simplexml": "*", "ext-simplexml": "*",
"adldap2/adldap2-laravel": "^4.0", "adldap2/adldap2-laravel": "^5.0",
"bacon/bacon-qr-code": "1.*", "bacon/bacon-qr-code": "1.*",
"bunq/sdk_php": "dev-master", "bunq/sdk_php": "dev-master",
"danhunsaker/laravel-flysystem-others": "^1.3", "danhunsaker/laravel-flysystem-others": "^1.3",

125
composer.lock generated
View File

@@ -4,30 +4,31 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2043226e54decca4c541253fd5f395cc", "content-hash": "7b83ef088607791ea36397caebfa6ad7",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
"version": "v8.1.5", "version": "v9.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Adldap2/Adldap2.git", "url": "https://github.com/Adldap2/Adldap2.git",
"reference": "54722408c68f12942fcbf4a1b666d90a178ddc5c" "reference": "e74bf7e3762b35e828179b11eb100da4a12ff701"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Adldap2/Adldap2/zipball/54722408c68f12942fcbf4a1b666d90a178ddc5c", "url": "https://api.github.com/repos/Adldap2/Adldap2/zipball/e74bf7e3762b35e828179b11eb100da4a12ff701",
"reference": "54722408c68f12942fcbf4a1b666d90a178ddc5c", "reference": "e74bf7e3762b35e828179b11eb100da4a12ff701",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-ldap": "*", "ext-ldap": "*",
"illuminate/support": "~5.0", "illuminate/contracts": "~5.0",
"php": ">=5.5.9" "php": ">=7.0",
"tightenco/collect": "~5.0"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "~0.9|~1.0", "mockery/mockery": "~1.0",
"phpunit/phpunit": "~4.8|~5.6" "phpunit/phpunit": "~6.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -56,30 +57,30 @@
"ldap", "ldap",
"windows" "windows"
], ],
"time": "2018-04-19T15:06:54+00:00" "time": "2018-12-06T15:03:32+00:00"
}, },
{ {
"name": "adldap2/adldap2-laravel", "name": "adldap2/adldap2-laravel",
"version": "v4.0.10", "version": "v5.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Adldap2/Adldap2-Laravel.git", "url": "https://github.com/Adldap2/Adldap2-Laravel.git",
"reference": "a5196cce3b5394d7b5e84eb68b38260cb9f0fd3c" "reference": "293721cd55b9410e274985ec6f869ea0cc499275"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Adldap2/Adldap2-Laravel/zipball/a5196cce3b5394d7b5e84eb68b38260cb9f0fd3c", "url": "https://api.github.com/repos/Adldap2/Adldap2-Laravel/zipball/293721cd55b9410e274985ec6f869ea0cc499275",
"reference": "a5196cce3b5394d7b5e84eb68b38260cb9f0fd3c", "reference": "293721cd55b9410e274985ec6f869ea0cc499275",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"adldap2/adldap2": "^8.0", "adldap2/adldap2": "^9.0",
"php": ">=7.0" "php": ">=7.1"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "~1.0", "mockery/mockery": "~1.0",
"orchestra/testbench": "~3.2", "orchestra/testbench": "~3.7",
"phpunit/phpunit": "~6.0" "phpunit/phpunit": "~7.0"
}, },
"type": "project", "type": "project",
"extra": { "extra": {
@@ -109,7 +110,7 @@
"laravel", "laravel",
"ldap" "ldap"
], ],
"time": "2018-09-18T14:27:05+00:00" "time": "2019-01-08T15:37:47+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@@ -1506,30 +1507,30 @@
}, },
{ {
"name": "laravel/passport", "name": "laravel/passport",
"version": "v7.1.0", "version": "v7.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/passport.git", "url": "https://github.com/laravel/passport.git",
"reference": "b0c0dcbb8d7d61ba814b1e2cb404dbb4e1d8a852" "reference": "56330509283d465acaaff842637e539d03bcf9ca"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/passport/zipball/b0c0dcbb8d7d61ba814b1e2cb404dbb4e1d8a852", "url": "https://api.github.com/repos/laravel/passport/zipball/56330509283d465acaaff842637e539d03bcf9ca",
"reference": "b0c0dcbb8d7d61ba814b1e2cb404dbb4e1d8a852", "reference": "56330509283d465acaaff842637e539d03bcf9ca",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"firebase/php-jwt": "~3.0|~4.0|~5.0", "firebase/php-jwt": "~3.0|~4.0|~5.0",
"guzzlehttp/guzzle": "~6.0", "guzzlehttp/guzzle": "~6.0",
"illuminate/auth": "~5.6", "illuminate/auth": "~5.6.0|~5.7.0|~5.8.0",
"illuminate/console": "~5.6", "illuminate/console": "~5.6.0|~5.7.0|~5.8.0",
"illuminate/container": "~5.6", "illuminate/container": "~5.6.0|~5.7.0|~5.8.0",
"illuminate/contracts": "~5.6", "illuminate/contracts": "~5.6.0|~5.7.0|~5.8.0",
"illuminate/database": "~5.6", "illuminate/database": "~5.6.0|~5.7.0|~5.8.0",
"illuminate/encryption": "~5.6", "illuminate/encryption": "~5.6.0|~5.7.0|~5.8.0",
"illuminate/http": "~5.6", "illuminate/http": "~5.6.0|~5.7.0|~5.8.0",
"illuminate/support": "~5.6", "illuminate/support": "~5.6.0|~5.7.0|~5.8.0",
"league/oauth2-server": "^7.0", "league/oauth2-server": "^7.0",
"php": ">=7.1", "php": ">=7.1",
"phpseclib/phpseclib": "^2.0", "phpseclib/phpseclib": "^2.0",
@@ -1572,7 +1573,7 @@
"oauth", "oauth",
"passport" "passport"
], ],
"time": "2019-01-22T14:41:41+00:00" "time": "2019-02-14T16:29:26+00:00"
}, },
{ {
"name": "laravel/slack-notification-channel", "name": "laravel/slack-notification-channel",
@@ -4642,6 +4643,56 @@
], ],
"time": "2019-01-30T11:44:30+00:00" "time": "2019-01-30T11:44:30+00:00"
}, },
{
"name": "tightenco/collect",
"version": "v5.7.26",
"source": {
"type": "git",
"url": "https://github.com/tightenco/collect.git",
"reference": "c1a36a2a8a0aa731c1acdcd83f57724ffe630d00"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tightenco/collect/zipball/c1a36a2a8a0aa731c1acdcd83f57724ffe630d00",
"reference": "c1a36a2a8a0aa731c1acdcd83f57724ffe630d00",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"symfony/var-dumper": ">=3.4 <5"
},
"require-dev": {
"mockery/mockery": "^1.0",
"nesbot/carbon": "^1.26.3",
"phpunit/phpunit": "^7.0"
},
"type": "library",
"autoload": {
"files": [
"src/Collect/Support/helpers.php",
"src/Collect/Support/alias.php"
],
"psr-4": {
"Tightenco\\Collect\\": "src/Collect"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylorotwell@gmail.com"
}
],
"description": "Collect - Illuminate Collections as a separate package.",
"keywords": [
"collection",
"laravel"
],
"time": "2019-02-13T19:40:13+00:00"
},
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.1", "version": "2.2.1",
@@ -6480,12 +6531,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "344bf4ed1263c75e7f96b87b80c52e8373561e19" "reference": "54ee79a17e8cdc4ff8a1570198d5bc669a5803b8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/344bf4ed1263c75e7f96b87b80c52e8373561e19", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/54ee79a17e8cdc4ff8a1570198d5bc669a5803b8",
"reference": "344bf4ed1263c75e7f96b87b80c52e8373561e19", "reference": "54ee79a17e8cdc4ff8a1570198d5bc669a5803b8",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@@ -6618,7 +6669,7 @@
"symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
"tecnickcom/tcpdf": "<6.2.22", "tecnickcom/tcpdf": "<6.2.22",
"thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/backoffice-default-template": ">=2.1,<2.1.2",
"thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3", "thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2",
"theonedemon/phpwhois": "<=4.2.5", "theonedemon/phpwhois": "<=4.2.5",
"titon/framework": ">=0,<9.9.99", "titon/framework": ">=0,<9.9.99",
"truckersmp/phpwhois": "<=4.3.1", "truckersmp/phpwhois": "<=4.3.1",
@@ -6676,7 +6727,7 @@
} }
], ],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2019-02-05T19:58:17+00:00" "time": "2019-02-14T08:06:11+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",

19
config/adldap.php → config/ldap.php
View File

@@ -52,7 +52,6 @@ return [
| an array of configuration settings. | an array of configuration settings.
| |
*/ */
'connections' => [ 'connections' => [
'default' => [ 'default' => [
@@ -123,7 +122,7 @@ return [
| |
*/ */
'connection_settings' => [ 'settings' => [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@@ -207,22 +206,6 @@ return [
'base_dn' => env('ADLDAP_BASEDN', 'dc=temp'), 'base_dn' => env('ADLDAP_BASEDN', 'dc=temp'),
/*
|--------------------------------------------------------------------------
| Administrator Account Suffix / Prefix
|--------------------------------------------------------------------------
|
| This option allows you to set a different account prefix and suffix
| for your configured administrator account upon binding.
|
| If left empty or set to `null`, your `account_prefix` and
| `account_suffix` options above will be used.
|
*/
'admin_account_prefix' => env('ADLDAP_ADMIN_ACCOUNT_PREFIX', ''),
'admin_account_suffix' => env('ADLDAP_ADMIN_ACCOUNT_SUFFIX', ''),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Administrator Username & Password | Administrator Username & Password

0
config/adldap_auth.php → config/ldap_auth.php
View File