Skip to content

Prepare sensitive_url for crates.io #8223

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
wants to merge 2 commits into
base: unstable
Choose a base branch
from
+223 −91
Open

Prepare sensitive_url for crates.io #8223

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
f9dee8e
Prepare sensitive_url for crates.io
macladson Oct 16, 2025
2b977ff
Enable serde feature for workspace
macladson Oct 16, 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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ rpds = "0.11"
rusqlite = { version = "0.28", features = ["bundled"] }
rust_eth_kzg = "0.9"
safe_arith = "0.1"
sensitive_url = { path = "common/sensitive_url" }
sensitive_url = { path = "common/sensitive_url", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_repr = "0.1"
Expand Down
14 changes: 7 additions & 7 deletions beacon_node/builder_client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ impl BuilderHttpClient {
&self,
validator: &[SignedValidatorRegistrationData],
) -> Result<(), Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -297,7 +297,7 @@ impl BuilderHttpClient {
&self,
blinded_block: &SignedBlindedBeaconBlock<E>,
) -> Result<FullPayloadContents<E>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

let body = blinded_block.as_ssz_bytes();

Expand Down Expand Up @@ -345,7 +345,7 @@ impl BuilderHttpClient {
&self,
blinded_block: &SignedBlindedBeaconBlock<E>,
) -> Result<(), Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

let body = blinded_block.as_ssz_bytes();

Expand Down Expand Up @@ -395,7 +395,7 @@ impl BuilderHttpClient {
&self,
blinded_block: &SignedBlindedBeaconBlock<E>,
) -> Result<ForkVersionedResponse<FullPayloadContents<E>>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand Down Expand Up @@ -438,7 +438,7 @@ impl BuilderHttpClient {
&self,
blinded_block: &SignedBlindedBeaconBlock<E>,
) -> Result<(), Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand Down Expand Up @@ -488,7 +488,7 @@ impl BuilderHttpClient {
parent_hash: ExecutionBlockHash,
pubkey: &PublicKeyBytes,
) -> Result<Option<ForkVersionedResponse<SignedBuilderBid<E>>>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand Down Expand Up @@ -529,7 +529,7 @@ impl BuilderHttpClient {

/// `GET /eth/v1/builder/status`
pub async fn get_builder_status<E: EthSpec>(&self) -> Result<(), Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand Down
2 changes: 1 addition & 1 deletion beacon_node/execution_layer/src/engine_api/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ impl HttpJsonRpc {

let mut request = self
.client
.post(self.url.full.clone())
.post(self.url.expose_full().clone())
.timeout(timeout)
.header(CONTENT_TYPE, "application/json")
.json(&body);
Expand Down
16 changes: 7 additions & 9 deletions common/eth2/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use reqwest::{
};
pub use reqwest::{StatusCode, Url};
use reqwest_eventsource::{Event, EventSource};
pub use sensitive_url::{SensitiveError, SensitiveUrl};
pub use sensitive_url::SensitiveUrl;
use serde::{Serialize, de::DeserializeOwned};
use ssz::Encode;
use std::fmt;
Expand Down Expand Up @@ -229,12 +229,6 @@ impl fmt::Display for BeaconNodeHttpClient {
}
}

impl AsRef<str> for BeaconNodeHttpClient {
fn as_ref(&self) -> &str {
self.server.as_ref()
}
}

impl BeaconNodeHttpClient {
pub fn new(server: SensitiveUrl, timeouts: Timeouts) -> Self {
Self {
Expand All @@ -255,10 +249,14 @@ impl BeaconNodeHttpClient {
timeouts,
}
}
// Returns a reference to the `SensitiveUrl` of the server.
pub fn server(&self) -> &SensitiveUrl {
&self.server
}

/// Return the path with the standard `/eth/vX` prefix applied.
fn eth_path(&self, version: EndpointVersion) -> Result<Url, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand Down Expand Up @@ -2681,7 +2679,7 @@ impl BeaconNodeHttpClient {
ids: &[u64],
epoch: Epoch,
) -> Result<GenericResponse<Vec<LivenessResponseData>>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand Down
22 changes: 11 additions & 11 deletions common/eth2/src/lighthouse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ pub struct DepositLog {
impl BeaconNodeHttpClient {
/// `GET lighthouse/health`
pub async fn get_lighthouse_health(&self) -> Result<GenericResponse<Health>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -183,7 +183,7 @@ impl BeaconNodeHttpClient {

/// `GET lighthouse/syncing`
pub async fn get_lighthouse_syncing(&self) -> Result<GenericResponse<SyncState>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -203,7 +203,7 @@ impl BeaconNodeHttpClient {

/// `GET lighthouse/proto_array`
pub async fn get_lighthouse_proto_array(&self) -> Result<GenericResponse<ProtoArray>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -218,7 +218,7 @@ impl BeaconNodeHttpClient {
&self,
epoch: Epoch,
) -> Result<GenericResponse<GlobalValidatorInclusionData>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -236,7 +236,7 @@ impl BeaconNodeHttpClient {
epoch: Epoch,
validator_id: ValidatorId,
) -> Result<GenericResponse<Option<ValidatorInclusionData>>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -250,7 +250,7 @@ impl BeaconNodeHttpClient {

/// `POST lighthouse/database/reconstruct`
pub async fn post_lighthouse_database_reconstruct(&self) -> Result<String, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -263,7 +263,7 @@ impl BeaconNodeHttpClient {

/// `POST lighthouse/add_peer`
pub async fn post_lighthouse_add_peer(&self, req: AdminPeer) -> Result<(), Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -275,7 +275,7 @@ impl BeaconNodeHttpClient {

/// `POST lighthouse/remove_peer`
pub async fn post_lighthouse_remove_peer(&self, req: AdminPeer) -> Result<(), Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -295,7 +295,7 @@ impl BeaconNodeHttpClient {
start_slot: Slot,
end_slot: Slot,
) -> Result<Vec<BlockReward>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -316,7 +316,7 @@ impl BeaconNodeHttpClient {
start_epoch: Epoch,
end_epoch: Epoch,
) -> Result<Vec<BlockPackingEfficiency>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -338,7 +338,7 @@ impl BeaconNodeHttpClient {
end_epoch: Epoch,
target: String,
) -> Result<Vec<AttestationPerformance>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand Down
36 changes: 18 additions & 18 deletions common/eth2/src/lighthouse_vc/http_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ impl ValidatorClientHttpClient {

/// `GET lighthouse/version`
pub async fn get_lighthouse_version(&self) -> Result<GenericResponse<VersionData>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -295,7 +295,7 @@ impl ValidatorClientHttpClient {

/// `GET lighthouse/health`
pub async fn get_lighthouse_health(&self) -> Result<GenericResponse<Health>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -309,7 +309,7 @@ impl ValidatorClientHttpClient {
pub async fn get_lighthouse_spec<T: Serialize + DeserializeOwned>(
&self,
) -> Result<GenericResponse<T>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -323,7 +323,7 @@ impl ValidatorClientHttpClient {
pub async fn get_lighthouse_validators(
&self,
) -> Result<GenericResponse<Vec<ValidatorData>>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -338,7 +338,7 @@ impl ValidatorClientHttpClient {
&self,
validator_pubkey: &PublicKeyBytes,
) -> Result<Option<GenericResponse<ValidatorData>>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -354,7 +354,7 @@ impl ValidatorClientHttpClient {
&self,
validators: Vec<ValidatorRequest>,
) -> Result<GenericResponse<PostValidatorsResponseData>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -369,7 +369,7 @@ impl ValidatorClientHttpClient {
&self,
request: &CreateValidatorsMnemonicRequest,
) -> Result<GenericResponse<Vec<CreatedValidator>>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -385,7 +385,7 @@ impl ValidatorClientHttpClient {
&self,
request: &KeystoreValidatorsPostRequest,
) -> Result<GenericResponse<ValidatorData>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -401,7 +401,7 @@ impl ValidatorClientHttpClient {
&self,
request: &[Web3SignerValidatorRequest],
) -> Result<(), Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -424,7 +424,7 @@ impl ValidatorClientHttpClient {
prefer_builder_proposals: Option<bool>,
graffiti: Option<GraffitiString>,
) -> Result<(), Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -451,7 +451,7 @@ impl ValidatorClientHttpClient {
&self,
req: &DeleteKeystoresRequest,
) -> Result<ExportKeystoresResponse, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand All @@ -462,7 +462,7 @@ impl ValidatorClientHttpClient {
}

fn make_keystores_url(&self) -> Result<Url, Error> {
let mut url = self.server.full.clone();
let mut url = self.server.expose_full().clone();
url.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
.push("eth")
Expand All @@ -472,7 +472,7 @@ impl ValidatorClientHttpClient {
}

fn make_remotekeys_url(&self) -> Result<Url, Error> {
let mut url = self.server.full.clone();
let mut url = self.server.expose_full().clone();
url.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
.push("eth")
Expand All @@ -482,7 +482,7 @@ impl ValidatorClientHttpClient {
}

fn make_fee_recipient_url(&self, pubkey: &PublicKeyBytes) -> Result<Url, Error> {
let mut url = self.server.full.clone();
let mut url = self.server.expose_full().clone();
url.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
.push("eth")
Expand All @@ -494,7 +494,7 @@ impl ValidatorClientHttpClient {
}

fn make_graffiti_url(&self, pubkey: &PublicKeyBytes) -> Result<Url, Error> {
let mut url = self.server.full.clone();
let mut url = self.server.expose_full().clone();
url.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
.push("eth")
Expand All @@ -506,7 +506,7 @@ impl ValidatorClientHttpClient {
}

fn make_gas_limit_url(&self, pubkey: &PublicKeyBytes) -> Result<Url, Error> {
let mut url = self.server.full.clone();
let mut url = self.server.expose_full().clone();
url.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
.push("eth")
Expand All @@ -519,7 +519,7 @@ impl ValidatorClientHttpClient {

/// `GET lighthouse/auth`
pub async fn get_auth(&self) -> Result<AuthResponse, Error> {
let mut url = self.server.full.clone();
let mut url = self.server.expose_full().clone();
url.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
.push("lighthouse")
Expand Down Expand Up @@ -635,7 +635,7 @@ impl ValidatorClientHttpClient {
pubkey: &PublicKeyBytes,
epoch: Option<Epoch>,
) -> Result<GenericResponse<SignedVoluntaryExit>, Error> {
let mut path = self.server.full.clone();
let mut path = self.server.expose_full().clone();

path.path_segments_mut()
.map_err(|()| Error::InvalidUrl(self.server.clone()))?
Expand Down
Loading
Loading