Skip to content

Conversation

@GideonBature
Copy link
Contributor

@GideonBature GideonBature commented Jun 25, 2025

This PR follows up on #770 and addresses the remaining improvements in comment. It implements stricter content-length validation and removes MAX_CONTENT_LENGTH from the sender side, moving it to payjoin-cli.

Summary of changes

  1. Sender-side validation

    • Mirrors the receiver-side logic by removing MAX_CONTENT_LENGTH and validating that the actual body length matches the Content-Length header.
  2. payjoin-cli receiver

    • Adds a size limit when collecting the body using .collect(), to avoid unbounded memory allocations from a potentially malicious counterparty.
  3. payjoin-cli sender

    • Enforces a similar limit when handling response bodies using response.bytes() from reqwest.

Ref: #770
Closes: #756

@coveralls
Copy link
Collaborator

coveralls commented Jun 25, 2025

Pull Request Test Coverage Report for Build 17460319220

Details

  • 72 of 81 (88.89%) changed or added relevant lines in 5 files are covered.
  • 2 unchanged lines in 2 files lost coverage.
  • Overall coverage increased (+0.09%) to 86.033%

Changes Missing Coverage Covered Lines Changed/Added Lines %
payjoin-cli/src/app/mod.rs 13 14 92.86%
payjoin-cli/src/app/v1.rs 12 20 60.0%
Files with Coverage Reduction New Missed Lines %
payjoin/src/core/send/error.rs 1 33.14%
payjoin/src/core/send/v1.rs 1 92.31%
Totals Coverage Status
Change from base Build 17446213698: 0.09%
Covered Lines: 8248
Relevant Lines: 9587

💛 - Coveralls

@GideonBature GideonBature marked this pull request as draft June 25, 2025 16:44
@GideonBature GideonBature force-pushed the request-body branch 3 times, most recently from 144a8c3 to 6f409bb Compare June 25, 2025 17:42
@GideonBature GideonBature marked this pull request as ready for review June 25, 2025 18:05
@GideonBature GideonBature force-pushed the request-body branch 6 times, most recently from d36cc26 to 95cb178 Compare July 1, 2025 18:28
@GideonBature
Copy link
Contributor Author

I have implemented the changes suggested. However, I had to introduce about two dependencies, which are:

  • futures
  • bytes

as a result of that I attempted to update the lock files using the update-lock-files.sh script. However, I kept getting can't find crate for serde`` for bitcoin-0.32.5 and for `rustls-0.22.4`.

I want you to review what I have thus far, let me know if I am going in the right direction, as I find a solution to the error I am having.

@GideonBature GideonBature requested a review from nothingmuch July 1, 2025 18:35
Copy link
Collaborator

@nothingmuch nothingmuch left a comment

Choose a reason for hiding this comment

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

This is looking great. Thank you!

The new dependencies are fine IMO, because they are already in our dependency chain if I'm not mistaken, and also because payjoin-cli can be more flexible about new dependencies than the payjoin crate.

The buffering code is very clear. I think a Vec<u8> can replace Bytes, since they are more or less the same on the inside, the main difference is Bytes support cheap clone(), which we don't need, for the cost of slightly more indirection.

Instead of duplicating it in the sender and receiver, a utility function can be added to payjoin-cli's app module.

Finally, as a nitpick, I find additional whitespace to be helpful when reading, but please try to commit such trivial changes in their own commits, that makes it easier to review commit by commit, github's files view uses lexicographical order for files and combines all the changes of all commits, both of which make it harder to spot important changes in between trivial ones.

@GideonBature GideonBature force-pushed the request-body branch 5 times, most recently from 20f8c0e to 0744af7 Compare July 7, 2025 17:03
@GideonBature GideonBature marked this pull request as draft July 7, 2025 17:04
@GideonBature GideonBature force-pushed the request-body branch 2 times, most recently from 9c9313d to c9fc215 Compare July 7, 2025 17:49
@GideonBature
Copy link
Contributor Author

I implemented the suggestions you gave, however, for the utility function, putting it in mod.rs of app, I am encountering a challenge where I am unable to access the hyper dependencies, I really don't know why. And I will be needing it, since I will need to make use of Bytes from it for the utility function.

@GideonBature GideonBature requested a review from nothingmuch July 7, 2025 17:54
@GideonBature GideonBature marked this pull request as ready for review July 7, 2025 17:54
Copy link
Collaborator

@nothingmuch nothingmuch left a comment

Choose a reason for hiding this comment

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

I didn't quite understand your last comment about hyper & bytes, but i think the read_limited_body function is in the right place?

similar limiting for app/v2.rs can be added in a separate PR, with a fixed response size, and reusing this function, but moving it to the top level mod.rs should be straightforward (just making it pub(crate) and bringing in the necessary imports, namely hyper::body::Bytes)

anyway this is getting close, i only have some fairly small cleanup suggestions

@DanGould
Copy link
Contributor

Whenever this gets merged I suggest it get squashed rather than have all $n$ commits used.

@GideonBature GideonBature marked this pull request as draft September 2, 2025 12:22
@GideonBature GideonBature force-pushed the request-body branch 12 times, most recently from 08b6aa8 to 0467b86 Compare September 2, 2025 16:50
@GideonBature GideonBature marked this pull request as ready for review September 2, 2025 16:50
@GideonBature
Copy link
Contributor Author

Lint is failing with this:

error[E0599]: no variant or associated item named `Parse` found for enum `core::send::error::InternalValidationError` in the current scope
   --> payjoin/src/core/send/mod.rs:699:90
    |
699 |         let res_str = std::str::from_utf8(response).map_err(|_| InternalValidationError::Parse)?;
    |                                                                                          ^^^^^ variant or associated item not found in `core::send::error::InternalValidationError`
    |
   ::: payjoin/src/core/send/error.rs:94:1
    |
 94 | pub(crate) enum InternalValidationError {
    | --------------------------------------- variant or associated item `Parse` not found for this enum

error[E0599]: no variant or associated item named `parse` found for enum `core::send::error::ResponseError` in the current scope
   --> payjoin/src/core/send/mod.rs:700:75
    |
700 |         let proposal = Psbt::from_str(res_str).map_err(|_| ResponseError::parse(res_str))?;
    |                                                                           ^^^^^ variant or associated item not found in `core::send::error::ResponseError`
    |
   ::: payjoin/src/core/send/error.rs:250:1
    |
250 | pub enum ResponseError {
    | ---------------------- variant or associated item `parse` not found for this enum

I don't really know, I observed that the Parse is actually present, but it was feature gated to v1, I don't know if that is what is causing the lint to fail here? Same thing with the parse too in the ResponseError.

@GideonBature GideonBature force-pushed the request-body branch 4 times, most recently from bdf0004 to f4e816f Compare September 4, 2025 09:42
@GideonBature
Copy link
Contributor Author

Resolved merge conflict.

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.

Consider dropping MAX_CONTENT_LENGTH checks

5 participants