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

Return 404 when AJAX tries to list dir content but file given #30858

Merged
merged 1 commit into from
Jan 27, 2022

Conversation

MichaIng
Copy link
Member

@MichaIng MichaIng commented Jan 26, 2022

Due to a code mistake, the expected 404 return when AJAX tries to list a directory content with a non-directory file path given, does not happen. It instead fails with another exception.

This commit restores the original intention to return 404 in the first place when passing a non-directory path with the "dir" parameter.

This solves related Psalm errors.

I'm not so good at writing tests, but probably it makes sense to add one for this case?

@MichaIng MichaIng added this to the Nextcloud 24 milestone Jan 26, 2022
Due to a code mistake, the expected 404 return when AJAX tries to list a directory content with a non-directory file path given, does not happen. It instead fails with another exception.

This commit restores the original intention to return 404 in the first place when passing a non-directory path with the "dir" parameter.

Signed-off-by: MichaIng <micha@dietpi.com>
@MichaIng MichaIng force-pushed the fix/ajax-list-dir-content-on-file branch from 59dd145 to ba1338e Compare January 26, 2022 15:11
@MichaIng
Copy link
Member Author

Drone Samba error is unrelated, fails on base branch at time of writing.

@MichaIng MichaIng requested a review from artonge January 26, 2022 17:24
Copy link
Contributor

@artonge artonge left a comment

Choose a reason for hiding this comment

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

Makes sense :)

@MichaIng
Copy link
Member Author

/backport to stable23

@MichaIng
Copy link
Member Author

/backport to stable22

@MichaIng
Copy link
Member Author

/backport to stable21

@artonge artonge merged commit 34f425c into master Jan 27, 2022
@artonge artonge deleted the fix/ajax-list-dir-content-on-file branch January 27, 2022 10:08
@artonge
Copy link
Contributor

artonge commented Jan 27, 2022

CI failure unrelated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants