Skip to content

Conversation

@kesselb
Copy link
Contributor

@kesselb kesselb commented Aug 30, 2023

Backport of #40108

joshtrichards and others added 6 commits August 5, 2023 22:04
OC\Files\Cache\Cache::get can return string|false|null, not just string|false.

- #26270 added handling of false, but null is needed too.
- Well, or we change the default $resullt to false, but I'm not sure if that has other ramifications and the real need here is to simply catch situations where the cache source storage path is not valid for whatever reason

Related: #19009

Signed-off-by: Josh Richards <[email protected]>
Co-authored-by: Git'Fellow <[email protected]>
Signed-off-by: John Molakvoæ <[email protected]>
@kesselb kesselb self-assigned this Aug 30, 2023
@kesselb kesselb added bug 3. to review Waiting for reviews labels Aug 30, 2023
@kesselb kesselb added this to the Nextcloud 26.0.6 milestone Aug 30, 2023
tcitworld and others added 12 commits August 31, 2023 21:33
If 'verify_bucket_exists' is set to false in the config.php s3 configuration, it's supposed to avoid
verifying that the bucket exists. However empty(falsy) will  always return true, so this condition
would not work.

Signed-off-by: Thomas Citharel <[email protected]>
this way we only have to determine the share permissions once

Signed-off-by: Robin Appelman <[email protected]>
@blizzz blizzz mentioned this pull request Sep 5, 2023
[stable26] Catch more invalid cache source storage paths
[stable26] fix: close cursor after reading the invitation
[stable26] fix(s3): fix handling verify_bucket_exists parameter
[26] move share permission logic to storage wrapper
…logging

[stable26] Do not log passwords in debug mode
[stable26] fix(cache): Remove displayname cache entry on delete
[stable26] feat: add switch to disable dns pinning
@blizzz
Copy link
Member

blizzz commented Sep 6, 2023

@kesselb could you rebase, please, cannot merge due to conflicts.

@blizzz blizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 6, 2023
@kesselb kesselb closed this Sep 6, 2023
@kesselb kesselb deleted the backport/40108/stable26 branch September 6, 2023 10:22
@blizzz
Copy link
Member

blizzz commented Sep 6, 2023

For the record, Github is wrong, this was merged:

Screenshot_20230906_130252

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.