Commit Graph

64741 Commits

Author SHA1 Message Date
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
blizzz
294a00d8e0
Merge pull request #34136 from nextcloud/fix/default-channel
on installation save channel to config.php if not stable
2022-10-21 17:14:56 +02:00
Vincent Petry
4aa8e80511
Merge pull request #34579 from nextcloud/unencrypted-size-null
fix null error in getUnencryptedSize
2022-10-21 16:53:43 +02:00
Simon L
9f2ecc7322
Merge pull request #34662 from nextcloud/enh/error-pages
Use proper error pages instead of always redirecting
2022-10-21 16:38:19 +02:00
Vincent Petry
56fe33ffca
Merge pull request #34508 from starypatyk/dav_displayname
WebDAV - use file/folder name for dav:displayname
2022-10-21 15:42:27 +02:00
Arthur Schiwon
2ef9826c3b
silence psalm
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2022-10-21 15:35:35 +02:00
Julius Härtl
11bedf1c3b
Use proper error pages instead of always redirecting
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2022-10-21 15:12:21 +02:00
Arthur Schiwon
403923d72c on installation save channel to config.php if not stable
- the default channel to the NC server is what is provided in /version.php
  unless it is overridden in config.php
- the default channel to the NC Updater however is 'stable'
- this resultant in inconsistent results and confusing admin experience
- therefore "stable" is considered default and other channels are being
  written to config.php now upon installation

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2022-10-21 12:01:26 +00:00
blizzz
7848d1cab6
Merge pull request #34717 from nextcloud/automated/noid/master-update-psalm-baseline
[master] Update psalm-baseline.xml
2022-10-21 13:59:08 +02:00
blizzz
bff23762d1
extended hint message
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: blizzz <blizzz@arthur-schiwon.de>
2022-10-21 13:46:44 +02:00
Simon L
ac7e3efe46
Merge pull request #34714 from nextcloud/fix/invert-more-icon
Fix more icon color
2022-10-21 09:13:50 +02:00
nextcloud-command
3004d92b0b Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2022-10-21 04:34:24 +00:00
Nextcloud bot
67ce025d61
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-21 02:14:44 +00:00
Christopher Ng
c6f3eb954c Fix more icon color
Signed-off-by: Christopher Ng <chrng8@gmail.com>
2022-10-21 01:13:11 +00:00
Simon L
9aaa370e07
Merge pull request #34688 from nextcloud/bugfix/34673/dont-crash-with-outdated-share-providers
Don't crash with outdated share provider on update with the web updater
2022-10-20 23:50:15 +02:00
Pytal
72744a71c9
Merge pull request #34703 from nextcloud/bugfix/noid/use-vue-lib-multiselect-tags-component 2022-10-20 10:14:14 -07:00
Simon L
d48a637e54
Merge pull request #34685 from nextcloud/fix-alt-login-class
Fix alternative logins custom css class
2022-10-20 17:15:02 +02:00
Joas Schilling
1b30ca0320
Recompile
Signed-off-by: Joas Schilling <coding@schilljs.com>
2022-10-20 17:05:41 +02:00
Joas Schilling
46bf96ee29
Use @nextcloud/vue MultiselectTags component
Signed-off-by: Joas Schilling <coding@schilljs.com>
2022-10-20 17:05:40 +02:00
Carl Schwan
0de71a73e5
Merge pull request #34502 from nextcloud/fix/correct-attribute-resharing
Propagate attributes when resharing
2022-10-20 17:03:02 +02:00
Carl Schwan
0f0f132959
Merge pull request #34624 from nextcloud/fix/files_external_psalm
Multiple fix for files external
2022-10-20 16:53:43 +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
Côme Chilliet
5193b94c21
Merge pull request #33703 from nextcloud/fix/ldap-simplify-paged-results
Clean up paged result handling.
2022-10-20 14:48:50 +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
8b5586b793
Fix autoload
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-10-20 12:56:54 +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
7437673add Add testing of nested group membership
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
02ccce17f7 Add tests 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