76 commits

Author	SHA1	Message	Date
Godfrey Martinez	5569c2ba4a	Merge branch 'develop' into ldap_sync_bug	2023-11-16 10:02:56 -08:00
Godfrey M	2f12a9cfe2	add a conditional around location_id to fix bug	2023-11-16 09:52:44 -08:00
Godfrey M	3b6a0d6525	allows multi location sync for ldap	2023-11-02 16:50:19 -07:00
Godfrey M	13d3f85c62	fixes ldap location sync	2023-11-01 12:26:58 -07:00
snipe	23fa92f4ce	Check that the location is valid before debugging ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-16 23:13:38 +01:00
snipe	2166d6649d	Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled ... Fixed #13336 - Save unhashed password if no password provided	2023-09-14 14:15:53 +01:00
Godfrey M	d1efca2ae1	fixes conflicts	2023-08-15 09:28:42 -07:00
Brady Wetherington	0af205dade	Put guard around assigning location via LDAP	2023-08-02 15:01:14 +01:00
Godfrey M	8a24a47475	removed unnecessary code	2023-08-01 09:45:48 -07:00
Godfrey M	fb52038e7c	applies a check if a sync field is designated	2023-08-01 09:39:58 -07:00
snipe	b54e7dc3ee	Fixed #13336 - Save unhashed password if no password provided ... Signed-off-by: snipe <snipe@snipe.net>	2023-07-19 17:44:40 +01:00
Brady Wetherington	051830dff4	Fix to ldap_location attribute	2023-07-17 20:42:02 +01:00
Godfrey M	cb68f41d9c	added ldap_location to settings	2023-04-25 11:44:04 -07:00
snipe	219d92dcfb	The sea, Brady. ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-07 11:00:30 -08:00
snipe	1651dbb68d	Use null coalescing operator ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:43:00 -08:00
snipe	0cfeab8c50	Added an exit for the LDAP disabled sync short-circuit ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-01 16:46:58 -08:00
snipe	67e6089805	Short circuit the LDAP sync is LDAP is disabled ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-01 16:36:30 -08:00
Brady Wetherington	a4173e3881	Permit not-delegated+dont-expire-password+normal-accounts to login	2023-01-31 16:49:41 -08:00
Brady Wetherington	cbffd105a2	Fix LDAP default group feature	2023-01-09 15:23:19 -08:00
snipe	227fef76ee	Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group ... Adds a permission group selection for directory sync	2022-12-15 11:06:53 -08:00
snipe	3b16157d6b	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-21 17:43:53 -07:00
Brady Wetherington	bc78d341a0	Caches manager lookups in LDAP for performance boost	2022-10-20 16:52:40 -07:00
Brady Wetherington	12d86bd6e2	Erroneous line-break removal - re-add	2022-10-19 19:01:52 -07:00
Brady Wetherington	c4f11de90d	Remove incorrect comment.	2022-10-19 18:49:19 -07:00
Brady Wetherington	8fb61cf5f8	Try to better handle LDAP Manager settings that don't line up with what we expect	2022-10-19 18:36:16 -07:00
Godfrey M	f9ac447dd1	adds default group to LDAP	2022-10-18 15:18:09 -07:00
Godfrey M	9b448227f7	tinkering to no avail	2022-09-13 11:40:10 -07:00
Godfrey M	28bc97f29f	one line away from this being over with	2022-09-12 11:40:16 -07:00
Godfrey M	70ac8af9c4	.	2022-08-31 09:53:20 -07:00
Godfrey M	0c362e8b57	gets the groups selector to appear but options are blank	2022-08-29 12:09:56 -07:00
Godfrey M	fc6fefdb4e	adds migration, variables, checkbox,working on groups	2022-08-25 15:19:38 -07:00
Warren White	4b9a91f55b	Fixed #10565, #11086: correctly looks up Manager DN from AD Manager attribute and sets manager id	2022-08-19 09:09:03 -07:00
Brady Wetherington	b6adfa294c	Fixed the active flag to be as it was in later v5 releases ... Originally implemented here: https://github.com/snipe/snipe-it/pull/10610/files	2022-08-10 12:55:30 -07:00
Brady Wetherington	be3388d647	Add a new --filter option to Artisan ldap-sync command	2022-06-27 19:49:59 -07:00
Brady Wetherington	f608e4586c	Only set manager ID when the lookup succeeds.	2022-05-15 09:25:28 -07:00
Godfrey M	c1f8252388	adds manager field to LDAP sync	2022-03-24 11:24:39 -07:00
snipe	5fded57ec6	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/ProfileController.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Models/Asset.php # app/Models/License.php # app/Providers/AppServiceProvider.php # app/Services/LdapAd.php # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/lang/ar/button.php # resources/lang/de/admin/companies/general.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/groups/titles.php # resources/lang/de/admin/hardware/form.php # resources/lang/de/admin/hardware/general.php # resources/lang/de/admin/hardware/message.php # resources/lang/de/admin/hardware/table.php # resources/lang/de/admin/kits/general.php # resources/lang/de/admin/locations/table.php # resources/lang/de/admin/reports/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/de/admin/users/general.php # resources/lang/de/general.php # resources/lang/de/mail.php # resources/lang/en/admin/asset_maintenances/message.php # resources/lang/en/admin/asset_maintenances/table.php # resources/lang/en/admin/companies/general.php # resources/lang/en/admin/companies/message.php # resources/lang/en/admin/custom_fields/general.php # resources/lang/en/admin/depreciations/general.php # resources/lang/en/admin/groups/titles.php # resources/lang/en/admin/hardware/form.php # resources/lang/en/admin/hardware/general.php # resources/lang/en/admin/hardware/table.php # resources/lang/en/admin/kits/general.php # resources/lang/en/admin/locations/table.php # resources/lang/en/admin/reports/general.php # resources/lang/en/admin/settings/general.php # resources/lang/en/admin/settings/message.php # resources/lang/en/admin/users/general.php # resources/lang/en/button.php # resources/lang/en/general.php # resources/lang/en/help.php # resources/lang/en/mail.php # resources/lang/en/passwords.php # resources/lang/hu/admin/hardware/general.php # resources/lang/hu/admin/hardware/table.php # resources/lang/hu/admin/locations/table.php # resources/lang/is/admin/locations/table.php # resources/lang/ko/admin/custom_fields/general.php # resources/lang/ko/general.php # resources/lang/nl/admin/hardware/general.php # resources/lang/nl/admin/hardware/message.php # resources/lang/nl/admin/hardware/table.php # resources/lang/nl/admin/locations/table.php # resources/lang/nl/admin/statuslabels/message.php # resources/lang/nl/admin/users/general.php # resources/lang/no/admin/companies/general.php # resources/lang/no/admin/custom_fields/general.php # resources/lang/no/admin/depreciations/general.php # resources/lang/no/admin/depreciations/table.php # resources/lang/no/admin/groups/titles.php # resources/lang/no/admin/hardware/form.php # resources/lang/no/admin/hardware/general.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/locations/table.php # resources/lang/no/admin/reports/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/admin/settings/message.php # resources/lang/no/admin/statuslabels/message.php # resources/lang/no/admin/users/general.php # resources/lang/no/button.php # resources/lang/no/general.php # resources/lang/no/mail.php # resources/lang/no/validation.php # resources/lang/pl/admin/companies/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/pl/admin/depreciations/general.php # resources/lang/pl/admin/depreciations/table.php # resources/lang/pl/admin/groups/titles.php # resources/lang/pl/admin/hardware/form.php # resources/lang/pl/admin/hardware/general.php # resources/lang/pl/admin/hardware/table.php # resources/lang/pl/admin/kits/general.php # resources/lang/pl/admin/locations/table.php # resources/lang/pl/admin/reports/general.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/admin/settings/message.php # resources/lang/pl/admin/users/general.php # resources/lang/pl/button.php # resources/lang/pl/general.php # resources/lang/pt-PT/admin/companies/general.php # resources/lang/pt-PT/admin/custom_fields/general.php # resources/lang/pt-PT/admin/depreciations/general.php # resources/lang/pt-PT/admin/depreciations/table.php # resources/lang/pt-PT/admin/groups/titles.php # resources/lang/pt-PT/admin/hardware/form.php # resources/lang/pt-PT/admin/hardware/general.php # resources/lang/pt-PT/general.php # resources/lang/pt-PT/help.php # resources/lang/pt-PT/validation.php # resources/lang/ro/admin/companies/general.php # resources/lang/ro/admin/custom_fields/general.php # resources/lang/ro/admin/groups/titles.php # resources/lang/ro/admin/hardware/form.php # resources/lang/ro/admin/hardware/general.php # resources/lang/ro/admin/hardware/message.php # resources/lang/ro/admin/hardware/table.php # resources/lang/ro/admin/locations/table.php # resources/lang/ro/admin/settings/message.php # resources/lang/ru/admin/companies/general.php # resources/lang/ru/admin/custom_fields/general.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/general.php # resources/lang/ru/validation.php # resources/lang/sk/admin/settings/general.php # resources/lang/sk/button.php # resources/lang/sk/general.php # resources/lang/tr/admin/hardware/form.php # resources/lang/tr/admin/hardware/table.php # resources/lang/tr/admin/kits/general.php # resources/lang/tr/admin/locations/table.php # resources/lang/tr/admin/reports/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/admin/settings/message.php # resources/lang/tr/admin/statuslabels/message.php # resources/lang/tr/admin/users/general.php # resources/lang/tr/button.php # resources/lang/tr/general.php # resources/lang/zh-CN/admin/companies/general.php # resources/lang/zh-CN/admin/custom_fields/general.php # resources/lang/zh-CN/admin/depreciations/general.php # resources/lang/zh-CN/admin/depreciations/table.php # resources/lang/zh-CN/admin/groups/titles.php # resources/lang/zh-CN/admin/hardware/form.php # resources/lang/zh-CN/admin/hardware/general.php # resources/lang/zh-CN/admin/hardware/message.php # resources/lang/zh-CN/admin/hardware/table.php # resources/lang/zh-CN/admin/kits/general.php # resources/lang/zh-CN/admin/locations/table.php # resources/lang/zh-CN/admin/reports/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/admin/settings/message.php # resources/lang/zh-CN/admin/statuslabels/message.php # resources/lang/zh-CN/admin/users/general.php # resources/lang/zh-CN/button.php # resources/lang/zh-CN/general.php # resources/lang/zh-CN/mail.php # resources/views/depreciations/edit.blade.php	2022-02-01 18:53:05 -08:00
Brady Wetherington	a063806bcc	Permit DONT_REQ_PREAUTH AD users to log in	2022-01-12 12:50:39 -08:00
Brady Wetherington	c8fe929e09	Add new UserAccountControl to permitted UAC's for AD.	2022-01-12 12:07:51 -08:00
Brady Wetherington	e8f5dc85a6	Downgraded a FIXME to a TODO	2021-11-19 16:38:46 -08:00
Brady Wetherington	864cc4f8d5	Fix FIXME's by downgrading them to TODO's :)	2021-11-10 11:37:10 -08:00
Laravel Shift	934afa036f	Adopt Laravel coding style ... Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions. You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200	2021-06-10 20:15:52 +00:00
Godfrey Martinez	246cc0eaa8	Feature/ch16172/adding other fields to ldap sync settings (#9416) ... * new branch, added manager as an additional field. Currently having DB issues * WIP DB Issue with eloquent * added department to LDAP sync * removed unused variables	2021-04-14 10:17:57 -07:00
Godfrey Martinez	5ea759f615	Fixed #7211, #9197, #7864, [ch15504] - Added additional LDAP fields to sync (#9318) ... * LDAP and Active Directory has plenty of other [ch15504] * removed department id from ldap sync * removed department id from ldap sync * Update 2021_03_18_184102_adds_several_ldap_fields.php	2021-04-05 19:26:04 -07:00
Brady Wetherington	34d5473553	Fixes 8472 (again) - LDAP sync was assigning a bad default location (#8846)	2020-12-01 21:26:52 -08:00
Brady Wetherington	93cf8d4e0a	Forward-port of the old LDAP sync system (#8801) ... * Forward-port of the old LDAP sync system * Need to rename the class to avoid classname conflicts * Make 'classic' LDAP sync not add surrounding parens to filters that already have them * Re-work Test LDAP button to return 10 sample users * Remove useless debugging code	2020-11-30 17:11:44 -08:00
snipe	148b375ec2	Make 600 a string for ini_set	2020-11-09 19:11:00 -08:00
Brady Wetherington	966179290b	Restore the LDAP_TIME_LIM env var for ldap sync of very large directories	2020-11-09 11:11:42 -08:00
Brady Wetherington	cce0739bb7	Clean up AdLdap2 integration to better handle paged result-sets	2020-10-26 12:53:45 -07:00
Brady Wetherington	18012279f9	Possible fix to #8563 - unset $ldapUsers to avoid OOM'ing	2020-10-22 21:51:23 -07:00