Skip to content

fix(node): reject non-http transaction relay URLs #336

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kewe63 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(node): reject non-http transaction relay URLs #336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 27 additions & 5 deletions crates/node/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,14 @@ fn build_tx_relays(ext: &ArcExtraCli) -> eyre::Result<Vec<String>> {
.map(|s| s.trim())
.filter(|s| !s.is_empty())
.map(|s| {
url::Url::parse(s)
.map(|_| s.to_string())
.map_err(|e| eyre::eyre!("invalid --arc.tx.relays entry {s:?}: {e}"))
let url = url::Url::parse(s)
.map_err(|e| eyre::eyre!("invalid --arc.tx.relays entry {s:?}: {e}"))?;
if !matches!(url.scheme(), "http" | "https") {
return Err(eyre::eyre!(
"invalid --arc.tx.relays entry {s:?}: transaction relay upstreams must use HTTP or HTTPS"
));
}
Ok(s.to_string())
})
.collect()
}
Expand Down Expand Up @@ -1028,10 +1033,10 @@ mod tests {
#[test]
fn test_build_tx_relays_parses_csv_in_order() {
let relays =
tx_relays_from_args(&["--arc.tx.relays", "http://a:8545,http://b:8545"]).unwrap();
tx_relays_from_args(&["--arc.tx.relays", "http://a:8545,https://b.example"]).unwrap();
assert_eq!(
relays,
vec!["http://a:8545".to_string(), "http://b:8545".to_string()]
vec!["http://a:8545".to_string(), "https://b.example".to_string()]
);
}

Expand All @@ -1047,6 +1052,23 @@ mod tests {
assert!(err.to_string().contains("invalid --arc.tx.relays entry"));
}

#[test]
fn test_build_tx_relays_rejects_non_http_urls() {
for relay in [
"file:///tmp/upstream",
"ftp://relay.example",
"ws://relay.example",
"wss://relay.example",
] {
let err = tx_relays_from_args(&["--arc.tx.relays", relay])
.expect_err("transaction relay upstreams must use HTTP or HTTPS");
assert!(
err.to_string().contains("must use HTTP or HTTPS"),
"unexpected error for {relay}: {err}"
);
}
}

#[test]
fn test_tx_relays_conflicts_with_forwarder() {
let result = ArcCli::try_parse_from([
Expand Down