Skip to content
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

fix(files): Don't try to hash invalid paths #46845

Closed
wants to merge 5 commits into from
Closed

Conversation

solracsf
Copy link
Member

Fix #44110

Summary

Another approach to #46218

This helps debug by adding logging statements to determine where null is being introduced, and force returning false in these cases.

Checklist

@solracsf solracsf added the 3. to review Waiting for reviews label Jul 29, 2024
@solracsf solracsf added this to the Nextcloud 30 milestone Jul 29, 2024
lib/private/Files/Storage/Local.php Fixed Show fixed Hide fixed
lib/private/Files/Storage/Local.php Fixed Show fixed Hide fixed
lib/private/Files/Storage/Local.php Fixed Show fixed Hide fixed
lib/private/Files/Storage/Local.php Fixed Show fixed Hide fixed
lib/private/Files/Storage/Local.php Fixed Show fixed Hide fixed
lib/private/Files/Storage/Local.php Fixed Show fixed Hide fixed
lib/private/Files/Storage/Local.php Fixed Show fixed Hide fixed
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

fix: don't use OCP

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

fix: Also check if null

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
@AndyScherzinger AndyScherzinger requested a review from sorbaugh July 30, 2024 07:55
@blizzz blizzz mentioned this pull request Jul 30, 2024
@solracsf solracsf changed the title fix(files): Catch null possibilities before hash fix(files): Don't try to hash invalid paths Jul 31, 2024
Copy link
Contributor

@come-nc come-nc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The null check on sourcePath is redundand since getSourcePath does not return null, and all the rest is already checked by hash_file function.
And getSourcePath is not supposed to return null, return type is string. Only in phpdoc though, we should make it strict.

This will not fix what you want it to fix in my opinion.

lib/private/Files/Storage/Local.php Outdated Show resolved Hide resolved
solracsf and others added 2 commits August 1, 2024 11:06
Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
@blizzz blizzz mentioned this pull request Aug 1, 2024
This was referenced Aug 5, 2024
@solracsf
Copy link
Member Author

solracsf commented Aug 7, 2024

In my case, the file on disk (from the issue linked) was returning read errors mapping ....: Input/output error (5) so the file was indeed not readable.

@come-nc
Copy link
Contributor

come-nc commented Aug 12, 2024

In my case, the file on disk (from the issue linked) was returning read errors mapping ....: Input/output error (5) so the file was indeed not readable.

Still, hash_file would return false and not null.

Copy link
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@skjnldsv
Copy link
Member

PHP CS fixer lint says no 🫠

@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Aug 14, 2024
@skjnldsv skjnldsv modified the milestones: Nextcloud 30, Nextcloud 31 Aug 14, 2024
solracsf and others added 2 commits August 15, 2024 00:05
Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
@solracsf
Copy link
Member Author

Closing as #46218 has been merged.

@solracsf solracsf closed this Sep 17, 2024
@skjnldsv skjnldsv deleted the catchNullHash branch September 17, 2024 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: \OC\Files\View::hash(): Return value must be of type string|bool, null returned
3 participants