upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 15:53:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
59025 commits 867 branches 1197 tags 8.3 GiB
Commit graph

59025 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sanpi
2ed3574ea0
Fixes recursion count incrementation 
Signed-off-by: Sanpi <sanpi@homecomputing.fr>
 2021-07-07 12:59:22 +02:00
John Molakvoæ
c67e1420c8
Merge pull request #27813 from nextcloud/version/22/final 
22.0.0
 2021-07-05 22:20:57 +02:00
Lukas Reschke
3f212b8857
Merge pull request #27814 from nextcloud/backport/27758/stable22 
[stable22] Fix DnsPinMiddleware resolve pinning bug
 2021-07-05 18:38:55 +02:00
Aaron Ball
f8db7ce8f5 Fix DnsPinMiddleware resolve pinning bug 
Libcurl expects the value of the CURLOPT_RESOLVE configurations to be an
array of strings, those strings containing a comma delimited list of
resolved IPs for each host:port combination.

The original code here does create that array with the host:port:ip
combination, but multiple ips for a single host:port result in
additional array entries, rather than adding them to the end of the
string with a comma. Per the libcurl docs, the `CURLOPT_RESOLVE` array
entries should match the syntax `host:port:address[,address]`.

This creates a function-scoped associative array which uses `host:port`
as the key (which are supposed to be unique and this ensures that), and
the value is an array containing IP strings (ipv4 or ipv6). Once the
associative array is populated, it is then set to the CURLOPT_RESOLVE
array, imploding the ip arrays using a comma delimiter so the array
syntax matches the expected by libcurl.

Note that this reorders the "foreach ip" and "foreach port" loops.
Rather than looping over ips then ports, we now loop over ports then
ips, since ports are part of the unique host:port map, and multiple ips
can exist therein.

Signed-off-by: Aaron Ball <nullspoon@oper.io>
 2021-07-05 15:40:06 +00:00
John Molakvoæ
c73070c19d
Merge pull request #27752 from nextcloud/backport/27586/stable22 
[stable22] Reset checksum when writing files to object store
 2021-07-05 17:27:07 +02:00
Lukas Reschke
fb8e681161
Merge pull request #27812 from nextcloud/backport/27810/stable22 
[stable22] Add a text string to l10n
 2021-07-05 17:21:20 +02:00
Arthur Schiwon
0ab8f2f15a
22.0.0 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-07-05 17:09:36 +02:00
Valdnet
f6f85478a0 Add a text string to l10n 2021-07-05 14:38:12 +00:00
Valdnet
5e93d571e0 Add a text string to l10n 2021-07-05 14:38:12 +00:00
Lukas Reschke
afb7126022
Merge pull request #27802 from nextcloud/backport/27198/stable22 
[stable22] Run s3 tests again
 2021-07-05 15:05:04 +02:00
Julius Härtl
6a4a5d888e Use minio for s3 tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-05 09:56:23 +00:00
Julius Härtl
cb57285870 Run s3 tests again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-05 09:56:23 +00:00
John Molakvoæ
268e6af00e
Merge pull request #27775 from nextcloud/backport/27750/stable22 2021-07-05 08:45:24 +02:00
Robin Appelman
cb0e76105e dont include folder being search in in the results 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-07-02 15:52:17 +00:00
blizzz
6c24e13d4b
Merge pull request #27749 from nextcloud/backport/27737/stable22 
[stable22] make contactsmenu icon bigger
 2021-07-01 18:44:29 +02:00
Julius Härtl
226e0c4107 Reset checksum when writing files to object store 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-01 15:33:47 +00:00
szaimen
b5b58faec0 make contactsmenu icon bigger 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-01 13:26:26 +00:00
John Molakvoæ
863686c283
Merge pull request #27706 from nextcloud/version/22.0.0/rc2 
22.0.0 RC2
 2021-07-01 11:30:42 +02:00
John Molakvoæ
e2c96aebd1
Merge pull request #27743 from nextcloud/backport/27739/stable22 2021-07-01 11:30:25 +02:00
szaimen
b25e8e7030 design fixes to app-settings button 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-01 08:46:48 +00:00
John Molakvoæ
858da2ed1d
Merge pull request #27719 from nextcloud/backport/27474/stable22 2021-07-01 08:31:25 +02:00
blizzz
9882ae8986
Merge pull request #27736 from nextcloud/backport/27732/stable22 
[stable22] Fix LDAPProviderFactory not found
 2021-06-30 20:41:23 +02:00
Arthur Schiwon
87d8e8f6d3 unset ldap provider when disabling user_ldap 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 16:52:09 +00:00
Arthur Schiwon
1220e48301 ensure that factoryClass exisits before instantiation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 16:52:09 +00:00
Vincent Petry
28a21048ac
Merge pull request #27726 from nextcloud/backport/27638/stable22 
[stable22] Downstream encryption:fix-encrypted-version for repairing "bad signature" errors
 2021-06-30 16:56:26 +02:00
Vincent Petry
3ca664dda1 Prevent running FixEncryptedVersion without master key 
Return an error when running occ encryption:fix-encrypted-version
when master key encryption is not enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Vincent Petry
48be209e92 Fix FixEncryptedVersionTest test 
Fixed setup to use EncryptionTrait like other existing tests.
Fix expectations to not rely on side effects from previous test cases.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Vincent Petry
bf279980ac Fix warnings in FixEncryptedVersion command 
Fixed code warnings

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Vincent Petry
5bde3d1836 Detect disabled signature check when reparing 
When running occ encryption:fix-encrypted-version, detect whether the
setting 'encryption_skip_signature_check' is set and abort if it is,
because the repair cannot detect version mismatch errors with it
enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Vincent Petry
6b83de79c6 Downstream FixEncryptedVersionTest 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Vincent Petry
727d2300b6 Downstream encryption:fix-encrypted-version 
For fixing "Bad signature" errors.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Arthur Schiwon
1f6f863d86
fix incredible off-by-one-typo-error 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 11:04:46 +02:00
Arthur Schiwon
1754c3d979 cleanup 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
29b36c56f3 fix small issues in UsersController handling 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
cc1d24a008 adjust access permissions of new controller method 
- fixes wrong veriable usage also

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
3550b12e3e fix regex 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
4565f5d3b4 fix provisioning test check 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
9d6c11f7da adjust internal data handling logic to fix store and load 
- format as stored previously in oc_accounts table is kept

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
87efcd06ca create a property on editUser when it was not set before 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
b30ce04e15 adjust email verification checker 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
bcedd4031d fix code style 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
63d2aad5d3 adjust verification state updater method 
- also fixes scope of internal methods

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
19d2367340 make AccountManager actually write multi value properties 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
51cae9ba98 accounts event handler to use eventdispatcher, DI and Accounts API 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
148a62939f prov api to be able to edit multivalue properties 
- adding as usual
- deleting and scope setting via additional endpoint

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
eb5e445af4 prov api reports multiple mail as editable field 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
4398cf85c1 prov api reports additional emails on getUser 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:48 +00:00
Julius Härtl
e74f5aeec2
Merge pull request #27716 from nextcloud/backport/27715/stable22 
[stable22] Revert "First attempt to check against core routes before loading all app routes"
 2021-06-29 21:47:03 +02:00
Vincent Petry
98005fc331 Revert "First attempt to check against core routes before loading all app routes" 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 18:52:21 +00:00
Julius Härtl
7e506bab4c
Merge pull request #27682 from nextcloud/backport/27668/stable22 
[stable22] Harden bootstrap context registrations when apps are missing
 2021-06-29 18:05:29 +02:00