upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-26 00:27:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
59583 commits 874 branches 1197 tags 8.4 GiB
Commit graph

19519 commits

Author SHA1 Message Date
MichaIng
629225c30a
Merge pull request #29391 from nextcloud/backport/29220/stable22 
[stable22] s3 external storage fixes
 2021-10-23 20:20:25 +02:00
MichaIng
daeeae4ae0
Merge pull request #29398 from nextcloud/backport/29378/stable22 
[stable22] Make the route name error more helpful
 2021-10-23 20:12:28 +02:00
Nextcloud bot
6853c89114
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-23 02:22:43 +00:00
Christoph Wurst
bc17c790ad Make the route name error more helpful 
As a developer I have no clue what "Invalid route name" means. If the
exception gives me a hint I might find it easier to figure out why my
route triggers this error.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-10-22 20:36:42 +00:00
Robin Appelman
5f438375a9 more reliable return value for Watcher::checkUpdate 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
a4a4097068 s3 external storage listing rework 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Christoph Wurst
4e41638101 Prevent duplicate auth token activity updates 
The auth token activity logic works as follows
* Read auth token
* Compare last activity time stamp to current time
* Update auth token activity if it's older than x seconds

This works fine in isolation but with concurrency that means that
occasionally the same token is read simultaneously by two processes and
both of these processes will trigger an update of the same row.
Affectively the second update doesn't add much value. It might set the
time stamp to the exact same time stamp or one a few seconds later. But
the last activity is no precise science, we don't need this accuracy.

This patch changes the UPDATE query to include the expected value in a
comparison with the current data. This results in an affected row when
the data in the DB still has an old time stamp, but won't affect a row
if the time stamp is (nearly) up to date.

This is a micro optimization and will possibly not show any significant
performance improvement. Yet in setups with a DB cluster it means that
the write node has to send fewer changes to the read nodes due to the
lower number of actual changes.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-10-22 09:16:05 +00:00
Vincent Petry
e67a330fd1
Merge pull request #29365 from nextcloud/backport/29362/stable22 
[stable22] Fix security issues when copying groupfolder with advanced ACL
 2021-10-22 09:56:02 +02:00
Nextcloud bot
01c1a5945b
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-22 02:22:11 +00:00
Carl Schwan
887f4ba2fb Fix security issues when copying groupfolder with advanced ACL 
Using advanced ACL, it is possible that an user has access to a
directory but not to a subdirectory, so the copying use
Common::copyFromStorage instead of Local::copyFromStorage.

Fix https://github.com/nextcloud/groupfolders/issues/1692

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-21 16:34:20 +00:00
John Molakvoæ
cad44d69dd
Merge pull request #29288 from nextcloud/backport/28768/stable22 2021-10-21 09:31:46 +02:00
Nextcloud bot
0a1ee2da89
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-21 02:24:27 +00:00
Nextcloud bot
74c26288db
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-20 02:43:11 +00:00
Joas Schilling
cbb2ffd1d2
Merge pull request #29301 from nextcloud/backport/29259/stable22 
[stable22] Fix app upgrade
 2021-10-19 13:36:57 +02:00
John Molakvoæ
27c23b6f13
Merge pull request #29183 from nextcloud/backport/29028/stable22 2021-10-19 11:11:26 +02:00
Joas Schilling
6a7b6ea0e8 Fix app upgrade 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-18 19:22:48 +00:00
acsfer
50791c61d3 Simplify :) 2021-10-18 07:59:00 +00:00
acsfer
269d9b5e0b Replace file_exists() method by is_file() 2021-10-18 07:58:59 +00:00
acsfer
698527d197 Get filesize() if file_exists() 
Should make sense.
 2021-10-18 07:58:59 +00:00
John Molakvoæ (skjnldsv)
1cf4e4999e Default message for ShareNotFound exception 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-10-13 22:48:09 +00:00
John Molakvoæ (skjnldsv)
f70c17cbcf Add proper message to created share not found 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-10-13 22:48:08 +00:00
blizzz
ef56aa7c33
Merge pull request #29196 from nextcloud/backport/29020/stable22 
[stable22] Keep group restrictions when reenabling apps after an update
 2021-10-13 19:30:39 +02:00
Joas Schilling
f417c2e642
Keep group restrictions when reenabling apps after an update 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-13 14:03:39 +02:00
Joas Schilling
982f956342 Fix translated app details 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-13 09:59:48 +00:00
Bjoern Schiessle
ff48e1953d add 'supported'-label to all supported apps, also if they are not downloaded yet 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2021-10-12 11:47:43 +00:00
Julius Härtl
96abf31c3b
Merge pull request #29160 from nextcloud/backport/24185/stable22 2021-10-12 09:12:11 +02:00
MichaIng
a388b2fe72
Merge pull request #29129 from nextcloud/backport/27886/stable22 
[stable22] Keep pw based auth tokens valid when pw-less login happens
 2021-10-12 02:20:07 +02:00
Julius Härtl
9163894634
Merge pull request #29133 from nextcloud/backport/28907/stable22 2021-10-11 22:22:59 +02:00
Julius Härtl
311988673c Tokens without password should not trigger changed password invalidation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-10-11 09:34:04 +00:00
Julius Härtl
3246eea0b6 Make sure that a empty directory can still be deleted when copied from another storage 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-10-11 08:01:10 +00:00
John Molakvoæ
c5e9e74a56
Merge pull request #29124 from nextcloud/backport/29123/stable22 2021-10-08 11:40:08 +02:00
Daniel Kesselberg
15417f3824 explicitly close source stream on encryption storage 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-10-08 08:04:34 +00:00
Daniel Kesselberg
8ce2a320a1 explicitly close source stream on local storage 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-10-08 08:04:34 +00:00
Tobias Assmann
caae37e9e7
add spaces around operators 
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
 2021-10-08 08:06:06 +02:00
Tobias Assmann
ce834cbb55
draft to prevent the invalidation of pw based authn tokens on a pw less login 
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
 2021-10-08 08:06:03 +02:00
Daniel Kesselberg
d94d4acad6 Set associative = true for cleanup job 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-10-07 19:34:10 +00:00
Robin Appelman
d4fb676dd7 generate a better optimized query for path prefix search filters 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-07 15:19:58 +00:00
Nextcloud bot
c7ce81fa01
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-07 02:25:42 +00:00
MichaIng
3ff8e940d1
Merge pull request #29086 from nextcloud/backport/29082/stable22 
[stable22] Add a few sensitive config keys
 2021-10-06 13:28:50 +02:00
Julius Härtl
59c5304159
Merge pull request #29062 from nextcloud/backport/28939/stable22 2021-10-06 09:59:30 +02:00
Julien Veyssier
c681ed2e9b consider some config keys under 'objectstore_multibucket' as sensitive 
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
 2021-10-06 07:52:38 +00:00
Nextcloud bot
5d299f2834
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-06 02:21:09 +00:00
acsfer
99c053e5d9 Avoid usage of Nextcloud API, use PHP function 2021-10-04 17:27:53 +00:00
acsfer
0506288882 Fix path of file_get_contents 
Try to fix #28370  and #27441 

Avoid pre-pends the `$path` to the user's own storage.
 2021-10-04 17:27:53 +00:00
Joas Schilling
7eface3bfd Don't further setup disabled users when logging in with apache 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-04 11:03:04 +00:00
Nextcloud bot
15de74d82e
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-04 02:26:30 +00:00
Nextcloud bot
8b7ea9f62d
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-03 02:26:31 +00:00
Nextcloud bot
c47046bcf4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-02 02:26:25 +00:00
Karel Hink
5b36f44efb Fix Lots of Error: file_exists(): open_basedir restriction in effect. in Log 
Signed-off-by: Karel Hink <info@karelhink.cz>
 2021-10-01 12:48:38 +00:00
Nextcloud bot
5128ebdf38
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-01 02:26:17 +00:00