3b16157d6b
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2022-10-21 17:43:53 -07:00
bc78d341a0
Caches manager lookups in LDAP for performance boost
2022-10-20 16:52:40 -07:00
12d86bd6e2
Erroneous line-break removal - re-add
2022-10-19 19:01:52 -07:00
c4f11de90d
Remove incorrect comment.
2022-10-19 18:49:19 -07:00
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
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
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
be3388d647
Add a new --filter option to Artisan ldap-sync command
2022-06-27 19:49:59 -07:00
f608e4586c
Only set manager ID when the lookup succeeds.
2022-05-15 09:25:28 -07:00
c1f8252388
adds manager field to LDAP sync
2022-03-24 11:24:39 -07:00
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
a063806bcc
Permit DONT_REQ_PREAUTH AD users to log in
2022-01-12 12:50:39 -08:00
c8fe929e09
Add new UserAccountControl to permitted UAC's for AD.
2022-01-12 12:07:51 -08:00
e8f5dc85a6
Downgraded a FIXME to a TODO
2021-11-19 16:38:46 -08:00
864cc4f8d5
Fix FIXME's by downgrading them to TODO's :)
2021-11-10 11:37:10 -08:00
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
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
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
34d5473553
Fixes 8472 (again) - LDAP sync was assigning a bad default location ( #8846 )
2020-12-01 21:26:52 -08:00
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
148b375ec2
Make 600 a string for ini_set
2020-11-09 19:11:00 -08:00
966179290b
Restore the LDAP_TIME_LIM env var for ldap sync of very large directories
2020-11-09 11:11:42 -08:00
cce0739bb7
Clean up AdLdap2 integration to better handle paged result-sets
2020-10-26 12:53:45 -07:00
18012279f9
Possible fix to #8563 - unset $ldapUsers to avoid OOM'ing
2020-10-22 21:51:23 -07:00
fad0ed6d5b
Add a dirtiness check to slim down JSON LDAP sync summaries
2020-10-21 15:13:36 -07:00
b015cff8bd
Modify Snipe-IT v5 AD handling to use the same ldap_host, and improve OU handling
2020-10-06 18:31:06 -07:00
b721a977c0
Fix PHP 7.4 deprecation warnings in ldap-sync script.
2020-08-24 21:35:00 -07:00
262a964760
[WIP] fix ldap-sync for v5 with AdLdap2
2020-08-14 14:45:05 -07:00
db59106c3e
Move ldap import ini settings to config ( #7679 )
2019-12-19 11:51:55 -08:00
04562e6d4a
Added 4260352 to ldapsync enabled account constraint
2019-10-18 17:48:50 -07:00
096393389c
Fixes #5054 : LDAP users deactivated for none-ad ( #7032 )
...
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
2019-05-16 09:31:55 -07:00
6728089106
Fixed #6883 - remove escaping of fields on LDAP import
2019-05-15 19:15:41 -07:00
486c708911
Leave the activated state for users alone in normal LDAP synchronisation. ( #6988 )
2019-05-06 09:40:53 -04:00
dae26e0378
Remove “Imported from LDAP” note override
2019-04-18 17:56:08 -04:00
858d382e26
Changed logging to info level for LDAP
2019-03-13 15:14:03 -07:00
75032def9e
Fixed #4151 - Undefined index: samaccountname on LDAP import
2018-09-27 16:11:09 -07:00
3a0f738fb0
Added some hepful comments
2018-09-26 19:20:50 -07:00
d60c9800c2
Check that the id key exists to prevent any weird edge cases for location
2018-03-05 22:44:05 -08:00
04d2542b81
Fixed #5078 - check for object or array as location in LDAP sync
2018-03-05 22:42:40 -08:00
5484b06df8
Fixed #4923 - invalid check for location object in Ldap Sync
2018-02-13 17:06:42 -08:00
5219fb63a1
Add --base_dn option to LdapSync command. ( #4888 )
2018-01-23 18:15:36 -08:00
9a40e5e651
return an error from ldap_search ( #4623 )
...
This will return the error from the ldap_search ran in Models/Ldap.php instead of throwing an exception. Users seem to commonly be getting an Exception because of invalid search filters. This will better inform them of that issue without requiring them to enable DEBUG.
2017-12-14 12:57:43 -08:00
1d5fb52bfc
Fix for LDAP where location ou is not null but blank
2017-10-17 16:59:50 -07:00
adca7cb0c5
Fix LDAP location sync issue in #3993 ( #4181 )
...
* Ensure locations with the most specific OUs take precedence during user assignment.
* Save 'ldap_ou' Location attribute during creation.
2017-10-09 13:06:47 -07:00
f2be409914
LDAP sync improvements and DB query fix. ( #4148 )
...
* Set 'ldap_ou' Location field to NULL when an empty string is submitted.
* Consolidate LDAP user import logic in LdapSync.php.
2017-10-06 16:15:14 -07:00
5cc84ca137
Use correct array when deleting users with location ( #3769 )
2017-07-24 23:15:15 -07:00
3e67cdc501
Allows a null location value for importing LDAP users ( #3598 )
...
* Allows a null location value for importing LDAP users
* Forgot you need to set the variable to null..
2017-06-01 21:20:40 -07:00
c506f30562
Add support for location-specific LDAP OUs. ( #3176 )
...
* Add support for location-specific LDAP OUs.
* Shortened variable names as suggested by Codacy review.
2017-01-11 23:37:14 -08:00
51ceaedfaf
Small phpcbf cleanup
2016-12-29 14:02:18 -08:00
a182d8c924
Fixes #1348 - LDAP sync in artisan command
...
TODO:
Make the LDAP sync page work using this command to avoid code duplication
2016-10-31 20:59:46 -07:00
