-
-
Notifications
You must be signed in to change notification settings - Fork 4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
explicitly close source stream on local / encryption storage #28907
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nickvergessen
approved these changes
Sep 20, 2021
kesselb
force-pushed
the
bug/noid/close-stream-local
branch
from
September 20, 2021 19:31
a513df6
to
d0383dd
Compare
It is not closed in server/lib/private/Files/Storage/Wrapper/Encryption.php Lines 1032 to 1037 in d0383dd
|
solracsf
reviewed
Sep 21, 2021
kesselb
added
2. developing
Work in progress
and removed
3. to review
Waiting for reviews
labels
Sep 21, 2021
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb
force-pushed
the
bug/noid/close-stream-local
branch
from
September 21, 2021 15:42
d0383dd
to
be3f4ed
Compare
kesselb
added
3. to review
Waiting for reviews
and removed
2. developing
Work in progress
labels
Sep 21, 2021
kesselb
changed the title
explicitly close source stream on local storage
explicitly close source stream on local / encryption storage
Sep 21, 2021
blizzz
approved these changes
Sep 22, 2021
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 22, 2021
/backport to stable22 |
/backport to stable21 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
e60a829 local
I run into the above error when scanning a chunked upload after assembly. files_antivirus is using a callback for stream_close to fetch the status (infected yes/no) from clamav. When the stream is not closed explicitly it's happening so late that not even the autoloader is registered anymore.
Fallback implementation for storage already closes the stream on close:
server/lib/private/Files/Storage/Common.php
Line 873 in dbf7905
ObjectStoreStorage is also closing the streams explicitly:
server/lib/private/Files/ObjectStore/ObjectStoreStorage.php
Line 491 in dbf7905
server/lib/private/Files/ObjectStore/ObjectStoreStorage.php
Line 497 in dbf7905
be3f4ed encryption
fclose($stream)
to fix Can't upload empty file when encryption app is enabled #13276.I'm able to upload empty files with and without encryption (via web and nautilus) to local storage and object store.