Skip to content

Redact archive URL password in snapshot download output #2598

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

Open
fnando wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Redact archive URL password in snapshot download output #2598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce39041
Hide archive password in snapshot download output.
fnando Jun 1, 2026
9f3bc33
Merge branch 'main' into redact-snapshot-archive-url
fnando Jun 1, 2026
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
18 changes: 18 additions & 0 deletions cmd/crates/soroban-test/tests/it/integration/snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,24 @@ fn snapshot_merge() {
assert!(merged.ledger_entries.len() > snapshot_b.ledger_entries.len());
}

#[test]
fn snapshot_create_redacts_archive_url_password() {
let sandbox = &TestEnv::new();
sandbox
.new_assert_cmd("snapshot")
.arg("create")
.arg("--archive-url=https://archiveuser:supersecret@archive.invalid/")
.arg("--ledger=1")
.arg("--out=snapshot.json")
.assert()
.failure()
.stderr(
predicate::str::contains("supersecret")
.not()
.and(predicate::str::contains("redacted")),
Comment thread
fnando marked this conversation as resolved.
);
}

#[test]
fn snapshot_merge_conflict_resolution() {
let sandbox = &TestEnv::new();
Expand Down
23 changes: 18 additions & 5 deletions cmd/soroban-cli/src/commands/snapshot/create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ use crate::{
tx::builder,
utils::get_name_from_stellar_asset_contract_storage,
};
use crate::{config::address::UnresolvedMuxedAccount, utils::http};
use crate::{
config::address::UnresolvedMuxedAccount,
utils::{http, url::redact_url},
};

#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, ValueEnum, Default)]
pub enum Output {
Expand Down Expand Up @@ -559,7 +562,10 @@ async fn get_history(
};
let history_url = Url::from_str(&history_url).unwrap();

print.globeln(format!("Downloading history {history_url}"));
print.globeln(format!(
"Downloading history {}",
redact_url(history_url.as_str())
));

let response = http::client()
.get(history_url.as_str())
Expand Down Expand Up @@ -589,7 +595,10 @@ async fn get_history(
.map_err(Error::ReadHistoryHttpStream)?;

print.clear_previous_line();
print.globeln(format!("Downloaded history {}", &history_url));
print.globeln(format!(
"Downloaded history {}",
redact_url(history_url.as_str())
));

serde_json::from_slice::<History>(&body).map_err(Error::JsonDecodingHistory)
}
Expand All @@ -608,9 +617,13 @@ async fn get_ledger_metadata_from_archive(
"{archive_url}/ledger/{ledger_hex_0}/{ledger_hex_1}/{ledger_hex_2}/ledger-{ledger_hex}.xdr.gz"
);

print.globeln(format!("Downloading ledger headers {ledger_url}"));

let ledger_url = Url::from_str(&ledger_url).map_err(Error::ParsingBucketUrl)?;

print.globeln(format!(
"Downloading ledger headers {}",
redact_url(ledger_url.as_str())
));

let response = http::client()
.get(ledger_url.as_str())
.send()
Expand Down
Loading