continuwuation/continuwuity
continuwuation/continuwuity
14
80
Fork 88
Code Issues 120 Pull requests 30 Releases 27 Packages 3 Activity Actions

Added proper 404 for not found media #1326

Merged
ginger merged 7 commits from benbot/continuwuity:benbot/first-issue into main 2026-02-23 15:22:18 +00:00
Conversation 9 Commits 7 Files changed 1 +25 -3
benbot commented 2026-01-31 03:07:05 +00:00
Contributor
Copy link

This pull request should resolve #1318 by adding proper 404 responses for missing files.

I also noticed that cargo test wasn't working in the default devshell, so i also fixed that by adding the library paths to the LD_LIBRARY_PATH env variable.

Pull request checklist:

  • This pull request targets the main branch, and the branch is named something other than
    main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
<!-- In order to help reviewers know what your pull request does at a glance, you should ensure that 1. Your PR title is a short, single sentence describing what you changed 2. You have described in more detail what you have changed, why you have changed it, what the intended effect is, and why you think this will be beneficial to the project. If you have made any potentially strange/questionable design choices, but didn't feel they'd benefit from code comments, please don't mention them here - after opening your pull request, go to "files changed", and click on the "+" symbol in the line number gutter, and attach comments to the lines that you think would benefit from some clarification. --> This pull request should resolve #1318 by adding proper 404 responses for missing files. I also noticed that `cargo test` wasn't working in the default devshell, so i also fixed that by adding the library paths to the `LD_LIBRARY_PATH` env variable. <!-- Example: This pull request allows us to warp through time and space ten times faster than before by double-inverting the warp drive with hyperheated jump fluid, both making the drive faster and more efficient. This resolves the common issue where we have to wait more than 10 milliseconds to engage, use, and disengage the warp drive when travelling between galaxies. --> <!-- Closes: #... --> <!-- Fixes: #... --> <!-- Uncomment the above line(s) if your pull request fixes an issue or closes another pull request by superseding it. Replace `#...` with the issue/pr number, such as `#123`. --> **Pull request checklist:** <!-- You need to complete these before your PR can be considered. If you aren't sure about some, feel free to ask for clarification in #dev:continuwuity.org. --> - [x] This pull request targets the `main` branch, and the branch is named something other than `main`. - [x] I have written an appropriate pull request title and my description is clear. - [x] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [x] My contribution follows the [code style][c2], if applicable. - [ ] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [ ] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [ ] My commit messages follow the [commit message format][c1cm] and are descriptive. - [x] I have written a [news fragment][n1] for this PR, if applicable<!--(can be done after hitting open!)-->. <!-- Notes on these requirements: - While not required, we encourage you to sign your commits with GPG or SSH to attest the authenticity of your changes. - While we allow LLM-assisted contributions, we do not appreciate contributions that are low quality, which is typical of machine-generated contributions that have not had a lot of love and care from a human. Please do not open a PR if all you have done is asked ChatGPT to tidy up the codebase with a +-100,000 diff. - In the case of code style violations, reviewers may leave review comments/change requests indicating what the ideal change would look like. For example, a reviewer may suggest you lower a log level, or use `match` instead of `if/else` etc. - In the case of code style violations, pre-commit check failures, minor things like typos/spelling errors, and in some cases commit format violations, reviewers may modify your branch directly, typically by making changes and adding a commit. Particularly in the latter case, a reviewer may rebase your commits to squash "spammy" ones (like "fix", "fix", "actually fix"), and reword commit messages that don't satisfy the format. - Pull requests MUST pass the `Checks` CI workflows to be capable of being merged. This can only be bypassed in exceptional circumstances. If your CI flakes, let us know in matrix:r/dev:continuwuity.org. - Pull requests have to be based on the latest `main` commit before being merged. If the main branch changes while you're making your changes, you should make sure you rebase on main before opening a PR. Your branch will be rebased on main before it is merged if it has fallen behind. - We typically only do fast-forward merges, so your entire commit log will be included. Once in main, it's difficult to get out cleanly, so put on your best dress, smile for the cameras! --> [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages [n1]: https://towncrier.readthedocs.io/en/stable/tutorial.html#creating-news-fragments
Added proper 404 for not found media and fixed devshell for running tests
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 2m2s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 3m49s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 18m52s
Details
829b1a927b
Jade reviewed 2026-02-04 00:46:03 +00:00
src/api/client/media.rs Outdated
@ -150,3 +150,3 @@
content_type,
content_disposition,
} = fetch_file(&services, &mxc, user, body.timeout_ms, None).await?;
}) = fetch_file(&services, &mxc, user, body.timeout_ms, None).await else {
Jade commented 2026-02-04 00:46:03 +00:00
Owner
Copy link

This handles any error as a 404, are we sure that's what we want here? I imagine more can happen in the course of fetch_file

This handles any error as a 404, are we sure that's what we want here? I imagine more can happen in the course of fetch_file
benbot commented 2026-02-04 16:50:53 +00:00
Author
Contributor
Copy link

From a little digging, it looks like there could be a permission issue fetching the file (in which case we should return 404 anyway to not leak that a file exists) and issues around running out of memory for the BufReader that the file loads into, which should throw a 500 (and probably crash soon after 😅)

i'll get that change in later.

From a little digging, it looks like there could be a permission issue fetching the file (in which case we should return 404 anyway to not leak that a file exists) and issues around running out of memory for the BufReader that the file loads into, which should throw a 500 (and probably crash soon after 😅) i'll get that change in later.
benbot commented 2026-02-15 16:32:33 +00:00
Author
Contributor
Copy link

Looking through fetch_file, the only other errors i can see us running into are from the std::Io package.

I handled the errors that the open function says it will through and that we would care to report to a client.

Looking through fetch_file, the only other errors i can see us running into are from the std::Io package. I handled the errors that the `open` function says it will through and that we would care to report to a client.
nex marked this conversation as resolved
nex added this to the 0.5.5 milestone 2026-02-12 22:03:00 +00:00
nex modified the milestone from 0.5.5 to next 2026-02-14 19:46:34 +00:00
nex commented 2026-02-14 19:46:59 +00:00
Owner
Copy link

Hey @benbot, is this waiting on anything? Happy to fix this up and get it merged for you assuming it's mostly done.

Hey @benbot, is this waiting on anything? Happy to fix this up and get it merged for you assuming it's mostly done.
benbot commented 2026-02-15 01:13:25 +00:00
Author
Contributor
Copy link

@nex wrote in #1326 (comment):

Hey @benbot, is this waiting on anything? Happy to fix this up and get it merged for you assuming it's mostly done.

Sorry, I just didn’t get a chance this week 😅

Was planning on fixing it up tomorrow.

@nex wrote in https://forgejo.ellis.link/continuwuation/continuwuity/pulls/1326#issuecomment-24092: > Hey @benbot, is this waiting on anything? Happy to fix this up and get it merged for you assuming it's mostly done. Sorry, I just didn’t get a chance this week 😅 Was planning on fixing it up tomorrow.
benbot reviewed 2026-02-15 16:31:25 +00:00
src/api/client/media.rs Outdated
@ -189,0 +191,4 @@
} = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await {
| Ok(meta) => meta,
| Err(e) => {
match e {
benbot commented 2026-02-15 16:31:25 +00:00
Author
Contributor
Copy link

I'm pretty unfamiliar with how error handling is done in this project, so please let me know if this isn't the preferred way to handle different ErrorKinds here. :)

I'm pretty unfamiliar with how error handling is done in this project, so please let me know if this isn't the preferred way to handle different ErrorKinds here. :)
nex marked this conversation as resolved
nex requested changes 2026-02-15 16:36:09 +00:00
Dismissed
nex left a comment
Owner
Copy link

This looks fine to me, just thinking the match case can be more consise

This looks fine to me, just thinking the match case can be more consise
src/api/client/media.rs Outdated
@ -153,0 +154,4 @@
| Err(e) => {
match e {
| conduwuit::Error::Io(e) => {
match e.kind() {
nex commented 2026-02-15 16:35:31 +00:00
Owner
Copy link

This could probably be

if matches!(e.kind(), std::io::ErrorKind::PermissionDenied | std::io::ErrorKind::NotFound) {
    return Err!(Request(NotFound("Media not found.")));
} else {
    return Err!(Request(Unknown("Unknown error when fetching file.")));
}
This could probably be ```rs if matches!(e.kind(), std::io::ErrorKind::PermissionDenied | std::io::ErrorKind::NotFound) { return Err!(Request(NotFound("Media not found."))); } else { return Err!(Request(Unknown("Unknown error when fetching file."))); } ```
nex marked this conversation as resolved
src/api/client/media.rs Outdated
@ -189,0 +212,4 @@
| Err(e) => {
match e {
| conduwuit::Error::Io(e) => {
match e.kind() {
nex commented 2026-02-15 16:35:49 +00:00
Owner
Copy link

Same feedback as previous comment in get_content_route

Same feedback as previous comment in `get_content_route`
nex marked this conversation as resolved
benbot changed title from WIP: Added proper 404 for not found media to Added proper 404 for not found media 2026-02-16 20:35:13 +00:00
Jade reviewed 2026-02-16 22:03:47 +00:00
nix/shells/default.nix Outdated
@ -16,14 +16,19 @@
in
Jade commented 2026-02-16 22:03:47 +00:00
Owner
Copy link

unrelated change should really go into a different PR

unrelated change should really go into a different PR
benbot commented 2026-02-16 22:20:22 +00:00
Author
Contributor
Copy link

I could extract those changes to a different PR, sure.

I could extract those changes to a different PR, sure.
benbot marked this conversation as resolved
Jade reviewed 2026-02-16 22:06:45 +00:00
src/api/client/media.rs Outdated
@ -189,0 +198,4 @@
} = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await {
| Ok(meta) => meta,
| Err(conduwuit::Error::Io(e)) => {
if matches!(e.kind(), std::io::ErrorKind::PermissionDenied | std::io::ErrorKind::NotFound) {
Jade commented 2026-02-16 22:06:45 +00:00
Owner
Copy link

OK so I'm probably dumb for not thinking of this earlier but an io permission issue should only happen if the home server is misconfigured - we don't actually use file system permissions for anything ourselves. Hiding it as a 404 would make that a bit harder to debug

OK so I'm probably dumb for not thinking of this earlier but an io permission issue should only happen if the home server is misconfigured - we don't actually use file system permissions for anything ourselves. Hiding it as a 404 would make that a bit harder to debug
benbot commented 2026-02-16 22:21:12 +00:00
Author
Contributor
Copy link

Oh true.
I'm also dumb for mixing system file permissions for api permissions 😅

Oh true. I'm also dumb for mixing system file permissions for api permissions 😅
nex commented 2026-02-16 22:21:22 +00:00
Owner
Copy link

probably best not to report misconfigurations to the end user and instead keep it in logs that only the people who can fix said misconfiguration can see, no?

probably best not to report misconfigurations to the end user and instead keep it in logs that only the people who can fix said misconfiguration can see, no?
benbot commented 2026-02-16 22:22:16 +00:00
Author
Contributor
Copy link

absolutely.

i was just going to log it.

absolutely. i was just going to log it.
👍 1
nex marked this conversation as resolved
benbot force-pushed benbot/first-issue from 9cd789db51
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m17s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 2m45s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m42s
Details
to eaaa41d28a
Some checks failed
Update flake hashes / update-flake-hashes (pull_request) Waiting to run
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 2m38s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-02-16 22:35:40 +00:00 Compare
benbot force-pushed benbot/first-issue from eaaa41d28a
Some checks failed
Update flake hashes / update-flake-hashes (pull_request) Waiting to run
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 2m38s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to 3a40825d6e
Some checks failed
Update flake hashes / update-flake-hashes (pull_request) Waiting to run
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-02-16 22:43:12 +00:00 Compare
benbot force-pushed benbot/first-issue from 3a40825d6e
Some checks failed
Update flake hashes / update-flake-hashes (pull_request) Waiting to run
Details
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to 62c4b38cc8
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 1m48s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m14s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-02-16 22:45:59 +00:00 Compare
benbot force-pushed benbot/first-issue from 62c4b38cc8
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Failing after 1m48s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m14s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to 7bad4862f5
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m54s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m42s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m34s
Details
2026-02-16 22:50:00 +00:00 Compare
benbot requested review from nex 2026-02-17 04:13:57 +00:00
benbot force-pushed benbot/first-issue from 7bad4862f5
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m54s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m42s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m34s
Details
to 10afc13297
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 4m14s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m54s
Details
2026-02-18 14:15:49 +00:00 Compare
Jade approved these changes 2026-02-18 14:57:14 +00:00
benbot force-pushed benbot/first-issue from 10afc13297
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 4m14s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m54s
Details
to ee7acb8f0c
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 7m15s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 12m9s
Details
2026-02-22 02:33:46 +00:00 Compare
nex approved these changes 2026-02-22 02:35:41 +00:00
nex scheduled this pull request to auto merge when all checks succeed 2026-02-22 02:36:11 +00:00
ginger merged commit fbeb5bf186 into main 2026-02-23 15:22:18 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Jade
nex
Labels
Clear labels   
Blocked

This pull request or issue is currently blocked from being merged/closed

  
Bug

Something isn't working as intended

  
Cherry-picking

Commits picked from other conduit projects

  
Database

This requires or includes changes to the database

  
Dependencies

Something dependency related

  
Dependencies/Renovate

Automatic dependency upgrades by Renovate

  
Difficulty
Easy
Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation

Improvements or additions to documentation

  
Enhancement

New feature or request

  
Good first issue

Good for newcomers

  
Help wanted

Additional eyes and keyboards are required for this one

  
Inherited

Issues that have been inhereted from the project pre-fork

  
Matrix/Administration

Features pertaining to homeserver administration

  
Matrix/Appservices

Features pertaining to the appservice API

  
Matrix/Auth

Features pertaining to authentication

  
Matrix/Client

Features pertaining to client-to-server interactions

  
Matrix/Core

Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/E2EE

   
Matrix/Federation

Features pertaining to server-to-server interactions

  
Matrix/Hydra

Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC

Features pertaining to unstable matrix features

  
Matrix/Media

Features pertaining to media interactions

  
Matrix/T&S

Changes or issues related to trust & safety tooling

  
Meta

Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI

Issues related to CI changes

  
Meta/Packaging

Packaging

  
Priority
Blocking
This issue is blocking the next release

  
Priority
High
This issue is very important

  
Priority
Low
This issue is of a rather low priority

  
Security

This item is related to general security

  
Status
Confirmed
This issue has enough information and is confirmed

  
Status
Duplicate
This issue or pull request already exists

  
Status
Invalid
This issue doesn't seem right

  
Status
Needs Investigation
This issue needs further investigation

  
Support

Questions or support requests

  
To-Merge

   
Wont fix

This will not be worked on

  
old/ci/cd

Ci/CD

Archived

  
old/rust

Pull requests that update Rust code

Archived

No labels
Blocked
Bug
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
To-Merge
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
next
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
continuwuation/continuwuity!1326
No description provided.