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.

Sign up for GitHub

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: preserve the URI query in ProxyGetRequest::call #1512

Merged
merged 3 commits into from
Jan 8, 2025
Merged

fix: preserve the URI query in ProxyGetRequest::call #1512

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d6f4dc
fix: keep the URI query after stripping it
dcfreire Jan 7, 2025
29ad7ab
Update proxy_get_request.rs
dcfreire Jan 7, 2025
0c0da5a
Update server/src/middleware/http/proxy_get_request.rs
niklasad1 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions server/src/middleware/http/proxy_get_request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use jsonrpsee_types::{Id, RequestSer};
use std::collections::HashMap;
use std::future::Future;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::Arc;
use std::task::{Context, Poll};
use tower::{Layer, Service};
Expand Down Expand Up @@ -149,8 +150,12 @@ where
(Some(method), &Method::GET) => {
// RPC methods are accessed with `POST`.
*req.method_mut() = Method::POST;
// Precautionary remove the URI.
*req.uri_mut() = Uri::from_static("/");
// Precautionary remove the URI path.
Copy link
Member

Choose a reason for hiding this comment

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

//cc @lexnv do you remember why we removed the URI in the first place?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't quite remember 🤔

*req.uri_mut() = if let Some(query) = req.uri().query() {
Uri::from_str(&format!("/?{}", query)).expect("The query comes from a valid URI; qed")
} else {
Uri::from_static("/")
};
// Requests must have the following headers:
req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
req.headers_mut().insert(ACCEPT, HeaderValue::from_static("application/json"));
Expand Down
Loading