Commit Graph

54083 Commits

Author SHA1 Message Date
Joas Schilling 3fe6b5b5f8 Fix numeric folders throwing on markDirty
TypeError: strpos() expects parameter 1 to be string, int given

The problem is that in cacheNode() we strip of any slashes, so
a folder "0/" will be trimmed to "0" and be used as an array key.
Since PHP automatically casts numeric array keys to integers,
you afterwards get $nodePath as int(0). Since it's now a number,
the strpos() function does not accept it anymore. Simply casting
$nodePath to a string again in the foreach solves the issue

Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-25 13:14:58 +00:00
Nextcloud bot 066eafb172
[tx-robot] updated from transifex 2020-09-25 02:18:59 +00:00
Nextcloud bot 2c7b88454d
[tx-robot] updated from transifex 2020-09-24 02:17:59 +00:00
Nextcloud bot 617174b519
[tx-robot] updated from transifex 2020-09-23 02:18:00 +00:00
Arthur Schiwon 83beefc3eb
do not hide "matches" and "does not match" checkers
- they show up previously with / typed – end user needs to know about it
- inconsistent with some other fields, that show it directly

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-09-22 12:42:56 +02:00
Nextcloud bot dcceb1360f
[tx-robot] updated from transifex 2020-09-22 02:17:57 +00:00
Nextcloud bot c2977c5c0f
[tx-robot] updated from transifex 2020-09-21 02:17:33 +00:00
Nextcloud bot 1681e74d2d
[tx-robot] updated from transifex 2020-09-20 02:17:17 +00:00
Nextcloud bot c8f9fa1830
[tx-robot] updated from transifex 2020-09-18 19:05:38 +00:00
Daniel Calviño Sánchez 083d1dab1c Add integration tests to check that only the given path is transferred
Until recently (it was fixed in ac2999a26a) when a path was transferred
other shares with the target user were removed, so a test was added to
ensure that it does not happen again.

Besides that a test to ensure that other files with the target user are
not transferred was added too (it did not fail before, but seemed
convenient to have that covered too :-) ).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-09-18 18:55:55 +02:00
Daniel Calviño Sánchez f400c44e8b Add integration tests for transferring files of a user with a risky name
The files:transfer-ownership performs a sanitization of users with
"risky" display names (including characters like "\" or "/").

In order to allow (escaped) double quotes in the display name the
regular expression used in the "user XXX with displayname YYY exists"
step had to be adjusted.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-09-18 18:54:55 +02:00
Daniel Calviño Sánchez 29fcaa1cec Add integration test for transferring the path of a single file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-09-18 18:52:55 +02:00
John Molakvoæ (skjnldsv) 9d15d718bb
Fix settings chunk loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-09-18 15:57:38 +02:00
Julius Härtl 7ea6ed6224
Merge pull request #22926 from nextcloud/backport/22915/stable19
[stable19] improve handling of out of space errors for smb
2020-09-18 13:13:36 +02:00
Nextcloud bot 34793138c7
[tx-robot] updated from transifex 2020-09-18 02:17:08 +00:00
Robin Appelman 67543d77a0 improve handling of out of space errors for smb
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-09-17 18:43:43 +00:00
Daniel Calviño Sánchez 1375a42a84
Add integration tests for transferring ownership of reshares
Currently only transferring ownership of a reshare with a group to a
user in the group is possible.

When transferring ownership of a reshare with another user or with a
group to a user not in the group restoring the share fails (but the
command succeeds, it only fails for the specific files that are
reshares).

When transferring ownership of a path that is a reshare the command
fails (as when a specific path is provided the path tries to move the
file, it does not take into account reshares).

The added integration tests reflect the above behaviours.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-09-17 19:03:08 +02:00
Daniel Calviño Sánchez 6d1374738f
Check share ownership after transferring file ownership
The integration tests did not verify that the shares were actually
transferred between the users (or that they were removed due to being
transferred to the sharee).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-09-17 19:03:08 +02:00
Daniel Calviño Sánchez bb8fe15a3b
Check whether file exists or not after transferring ownership
The integration tests did not verify that the files were actually
transferred between the users, only that the files were downloadable.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-09-17 19:03:07 +02:00
Julius Härtl 818b69ec54
Transfer shares if no path provided
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 19:03:07 +02:00
Julius Härtl 14c3f1ebd8
Transfer shares of the transferred root node
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 19:03:07 +02:00
Morris Jobke ca2573c99e
Merge pull request #22899 from nextcloud/backport/21894/stable19
[stable19] fix: file quota was not applied in all cases
2020-09-17 11:53:49 +02:00
Julius Härtl 9b33e3caee
Make sure that getConfig is still called for browsers that do not support CSPv3
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 10:18:30 +02:00
korelstar bd24021efc fix: file quota was not applied in all cases 2020-09-17 07:13:18 +00:00
Nextcloud bot 8c2c8fd831
[tx-robot] updated from transifex 2020-09-17 02:27:15 +00:00
Morris Jobke d6bb9f29b5
Merge pull request #22893 from nextcloud/backport/22880/stable19
[stable19] Revoke secsignid
2020-09-16 20:45:10 +02:00
Morris Jobke eff6e53125
Merge pull request #22892 from nextcloud/backport/22744/stable19
[stable19] only get the permissions from the share source if it's not already cached
2020-09-16 20:21:12 +02:00
Morris Jobke 8bd2cf5767 Revoke secsignid
See nextcloud/app-certificate-requests#343

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-16 17:35:04 +00:00
Robin Appelman f140e3a03a only get the permissions from the share source if it's not already cached
this prevents having to setup the share source when doing metadata stuff on the share root

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-09-16 17:29:02 +00:00
Nextcloud bot c1a7a026f6
[tx-robot] updated from transifex 2020-09-16 02:17:02 +00:00
Nextcloud bot 871d9a614e
[tx-robot] updated from transifex 2020-09-15 10:48:39 +00:00
Morris Jobke 380472d3e7
Merge pull request #22840 from nextcloud/backport/22770/stable19
[stable19] Mitigate encoding issue with user principal uri
2020-09-14 17:16:38 +02:00
Georg Ehrke ac87e46dff Mitigate encoding issue with user principal uri
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-09-14 06:20:32 +00:00
Roeland Jago Douma 9e88559e94
Merge pull request #22775 from nextcloud/fix/noid/stable19-ldap-group-update-events
[stable19] makes LDAP's group updater dispatch type events
2020-09-11 08:45:49 +02:00
Roeland Jago Douma d43eeab39d
Merge pull request #22778 from nextcloud/backport/22739/stable19
[stable19] Don't fail if copying a file of 0 byte size
2020-09-11 08:45:21 +02:00
Roeland Jago Douma b9ef2a543f
Merge pull request #22776 from nextcloud/backport/22747/stable19
[stable19] fix s3 doesDirectoryExist check for empty directories
2020-09-11 08:45:06 +02:00
Roeland Jago Douma cd29f22ee7
Merge pull request #22591 from nextcloud/backport/22577/stable19
[stable19] Better error message when blocked by access control
2020-09-11 08:43:52 +02:00
Julius Härtl 7a4a0dca22 Use user mount with matching shared storage only
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-10 14:20:59 +00:00
Arthur Schiwon 51fa743c7a
makes LDAP's group updater dispatch type events
* fixes group share updates on added users

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-09-10 15:18:47 +02:00
Julius Härtl 407fb28cb6 Annotate that writeStream can throw a GenericFileException
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-10 13:18:11 +00:00
Julius Härtl f5dec3702b Properly catch exception from writing to stream when copying a file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-10 13:18:11 +00:00
Julius Härtl b946d2c444 Set delimiter so that the CommonPrefixes response can properly be determined
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-10 13:14:28 +00:00
Robin Appelman 30ea77c673 fix s3 doesDirectoryExist check for empty directories
if a directory is empty, only the 'marker' object `/` exists.

since not all s3 implementations return just the prefix when listing objects by prefix,
when listing objects by the folder prefix, nothing will be returned if the directory is empty.
by not including the trailing slash in the prefix, the folder marked will always be returned if it exists

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-09-10 13:14:28 +00:00
Roeland Jago Douma c8381c5d17
Merge pull request #22769 from nextcloud/backport/22766/stable19
[stable19] Clarify PHP warning in admin settings
2020-09-10 14:31:46 +02:00
Morris Jobke a3b4e69ffe Clarify PHP warning in admin settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-10 10:12:00 +00:00
Morris Jobke cacaf4b4ee
Merge pull request #22752 from nextcloud/backport/22587/stable19
[stable19] Check if var debugMode exists
2020-09-10 09:33:38 +02:00
Roeland Jago Douma b5cb33ed36
Merge pull request #22753 from nextcloud/backport/22651/stable19
[stable19] Fix reading empty files from objectstorage
2020-09-10 08:45:01 +02:00
Julius Härtl 7dc51204d3
Merge pull request #22630 from nextcloud/backport/22583/stable19 2020-09-10 08:43:53 +02:00
Roeland Jago Douma 24b69b2402 Fix reading empty files from objectstorage
Since we try to do range requests this will fail hard.
However since empty files are not that interesting to read anyways we
just read from an emptry memory stream.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-09-09 19:47:23 +00:00
timm2k 7a52b026a1 Check if var debugMode exists
Closes #21150 a second time.
2nd appearance of debugMode may not seen in first fix.
2020-09-09 19:24:44 +00:00