upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-25 16:19:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33
65273 commits 874 branches 1197 tags 8.4 GiB
Commit graph

1059 commits

Author SHA1 Message Date
blizzz
b16c9838c6
Merge pull request #35355 from nextcloud/artonge/feat/ldap_connection_timeout 
Allow to set a custom timeout for ldap connections
 2022-11-30 14:44:15 +01:00
Côme Chilliet
e00740ea38
Merge pull request #35230 from nextcloud/fix/user_ldap-log-backup-switch 
Log switching to LDAP backup host because main one is not available
 2022-11-24 18:20:36 +01:00
Louis Chemineau
a781ae3afb Allow to set a custom timeout for ldap connections 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2022-11-23 11:37:49 +01:00
Côme Chilliet
90165309e1
Improve a bit codestyle 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-22 16:57:24 +01:00
Côme Chilliet
4893501abe
Log as warning instead of info when main LDAP server is unreachable 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-21 10:31:24 +01:00
Côme Chilliet
3e15ea6cd0
Log switching to LDAP backup host because main one is not available 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-17 14:58:44 +01:00
Côme Chilliet
1d00290621
Cache display name even if it was not filled 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-11-17 14:47:00 +01:00
Arthur Schiwon
e6e18b4008
[LDAP] always create instance of own user manager 
- it is config specific and cannot be shared
- because the Access instance is bound later, it is not obvious from the
  constructor

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-11-10 10:32:01 +01:00
Vincent Petry
a736a2b03b
Merge pull request #34702 from nextcloud/fix/clean-ldap-wizard-typing 
Clean up LDAP Wizard typing
 2022-11-04 17:29:30 +01:00
Carl Schwan
4344a54a1d
Merge pull request #34691 from nextcloud/profiler/ldap-backtrace 
Add backtrace to ldap profiler collector
 2022-10-25 17:00:23 +02:00
Côme Chilliet
5242a78994
Fix $host var handling to avoid passing null to ldap_connect 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-25 09:59:56 +02:00
Côme Chilliet
142f9913a6
Expose mapped user count from LDAP and use that for user limit check 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-24 16:54:41 +02:00
Simon L
47da08fe85
Merge pull request #33945 from nextcloud/fix/noid/fair-use-ldap 
LDAP to not register new users when outside of fair use or over limits
 2022-10-21 18:53:16 +02:00
Carl Schwan
25519b7089 Add backtrace to ldap profiler collector 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 16:55:44 +02:00
Côme Chilliet
3dedfd34b9
Clean up LDAP Wizard typing 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 16:51:39 +02:00
Côme Chilliet
00c4c3d723
Merge pull request #30223 from nextcloud/nested_ldap_groups 
Nested ldap groups
 2022-10-20 15:03:37 +02:00
Carl Schwan
99a752922f Fix psalm 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 13:14:39 +02:00
Carl Schwan
60ec5e655c Check if cache is present with isset 
Otherwise we get false for empty array

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 13:14:39 +02:00
Côme Chilliet
1a6a6c985a Bring back small fixes by Carl 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 13:14:39 +02:00
Côme Chilliet
746a5fb7e0 Fix LDAP recursive nested group support 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 13:14:39 +02:00
Carl Schwan
be5338e572 Revert Carl changes on apps/user_ldap/lib/Group_LDAP.php 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 13:14:31 +02:00
Côme Chilliet
8d07bc9b20
Cleanup typing and improve logging 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:17 +02:00
Côme Chilliet
81064b3d22
Fix ldap_parse_result call 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:17 +02:00
Côme Chilliet
e872f461f2
Adapt interface to new search signature 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:16 +02:00
Côme Chilliet
50a52ac2a5
Pass paging information directly to search and get rid of adapter 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:16 +02:00
Côme Chilliet
14804d9677
Renamed ambiguous $limit parameter to pageSize 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:16 +02:00
Côme Chilliet
d10dfa84db
Unfold call to ldap_parse_result. Handle cookie outside of adapter. 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:15 +02:00
Côme Chilliet
3c9b1c5296
Do not init a paged search for read operations 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:15 +02:00
Côme Chilliet
d6e49cd2de
Remove useless getReadArgs/setReadArgs methods from PagedResults 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:15 +02:00
Côme Chilliet
d790d45567
Remove dead code in paged result handling 
There is only one paged result API now that PHP 7.2 is long dead.
Starting by removing empty function calls.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:14 +02:00
Carl Schwan
1b12a08ec2 Fix user_ldap tests 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Carl Schwan
e0fbd39840 Add back runtime cache for intermediate ldap read results 
This is a small optimization that save a few LDAP queries

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Carl Schwan
33be3f754a Only cache base inGroup search 
And not intermediate search for nested groups, this is causing issues
othewise with nested groups

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
604b5ace12 Add missing copyright author in Group_LDAP 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
69f9e9f387 Removed unused use declaration 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
150e6adbc5 Fix types in docblocks 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
6ed0d0b8b1 Refactor group membership listing for nested groups 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
8b19cfcd88 Small optimisation of _groupMembers 
This will not change the result as users are check to be existing
 afterwards but avoids this check when we know it’s a group.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
d07f43dc12 Refactor _groupMembers to correctly use cache on intermediate results 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Carl Schwan
6522f8a6d9 Fix merging list with null 
This fixes some cases observed with the debugger where we end up merging
a non empty list with null. The result is then null and the looping over
the items would then end.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Carl Schwan
49aa352069 Unify a bit the types of the fetcher 
Now it will only accept a string as parameter instead of either a string
(DN) or a array (complete record).

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Carl Schwan
0fd7a51e3c Add more type hinting 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Arthur Schiwon
5647093319 Cache intermediates 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Co-authored-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:08:34 +02:00
Arthur Schiwon
ad2fdbe377 Refactor code to split common loop 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-10-20 12:08:24 +02:00
Arthur Schiwon
1e4ac22c94 Make it possible to return nested records whem walking over groups 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-10-20 12:08:09 +02:00
Arthur Schiwon
50d4963772
[LDAP] throw exception only against prov api 
- unbreaks functionality for end users when on demand mapping takes
  place

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-10-18 23:26:16 +02:00
Arthur Schiwon
8e8acf2d90
LDAP to no register new users when outside of fair use or over limits 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-10-18 12:57:43 +02:00
Côme Chilliet
1d2d6e864d
Avoid double ldap_unbind in Wizard.php 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-11 09:54:04 +02:00
Côme Chilliet
0a9a749174
Fix code style with codesniffer 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-11 09:53:27 +02:00
luz paz
9d26671f05 Fix typos in apps/ subdirectory 
Found via `codespell -q 3 -S l10n,./apps/files_external/3rdparty -L adn,ba,boxs,keypair,jus,optionel,ressource,tabel ./apps/`

Signed-off-by: luz paz <luzpaz@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-09-05 12:59:54 +00:00