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

[Merged by Bors] - Validators endpoint status code #2040

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Validators endpoint status code #2040

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c1afbf
update status codes for path param parsing errors
realbigsean Dec 2, 2020
3128555
dont use blocking tasks for rejections
realbigsean Dec 3, 2020
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
56 changes: 49 additions & 7 deletions beacon_node/http_api/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,13 @@ pub fn serve<T: BeaconChainTypes>(
let get_beacon_state_validators_id = beacon_states_path
.clone()
.and(warp::path("validators"))
.and(warp::path::param::<ValidatorId>())
.and(warp::path::param::<ValidatorId>().or_else(|_| {
blocking_task(|| {
Err(warp_utils::reject::custom_bad_request(
"Invalid validator ID".to_string(),
))
})
}))
.and(warp::path::end())
.and_then(
|state_id: StateId, chain: Arc<BeaconChain<T>>, validator_id: ValidatorId| {
Expand Down Expand Up @@ -760,7 +766,13 @@ pub fn serve<T: BeaconChainTypes>(
let get_beacon_headers_block_id = eth1_v1
.and(warp::path("beacon"))
.and(warp::path("headers"))
.and(warp::path::param::<BlockId>())
.and(warp::path::param::<BlockId>().or_else(|_| {
blocking_task(|| {
Err(warp_utils::reject::custom_bad_request(
"Invalid block ID".to_string(),
))
})
}))
.and(warp::path::end())
.and(chain_filter.clone())
.and_then(|block_id: BlockId, chain: Arc<BeaconChain<T>>| {
Expand Down Expand Up @@ -845,7 +857,13 @@ pub fn serve<T: BeaconChainTypes>(
let beacon_blocks_path = eth1_v1
.and(warp::path("beacon"))
.and(warp::path("blocks"))
.and(warp::path::param::<BlockId>())
.and(warp::path::param::<BlockId>().or_else(|_| {
blocking_task(|| {
Err(warp_utils::reject::custom_bad_request(
"Invalid block ID".to_string(),
))
})
}))
.and(chain_filter.clone());

// GET beacon/blocks/{block_id}
Expand Down Expand Up @@ -1222,7 +1240,13 @@ pub fn serve<T: BeaconChainTypes>(
.and(warp::path("debug"))
.and(warp::path("beacon"))
.and(warp::path("states"))
.and(warp::path::param::<StateId>())
.and(warp::path::param::<StateId>().or_else(|_| {
blocking_task(|| {
Err(warp_utils::reject::custom_bad_request(
"Invalid state ID".to_string(),
))
})
}))
.and(warp::path::end())
.and(chain_filter.clone())
.and_then(|state_id: StateId, chain: Arc<BeaconChain<T>>| {
Expand Down Expand Up @@ -1531,7 +1555,13 @@ pub fn serve<T: BeaconChainTypes>(
.and(warp::path("validator"))
.and(warp::path("duties"))
.and(warp::path("proposer"))
.and(warp::path::param::<Epoch>())
.and(warp::path::param::<Epoch>().or_else(|_| {
blocking_task(|| {
Err(warp_utils::reject::custom_bad_request(
"Invalid epoch".to_string(),
))
})
}))
.and(warp::path::end())
.and(not_while_syncing_filter.clone())
.and(chain_filter.clone())
Expand Down Expand Up @@ -1596,7 +1626,13 @@ pub fn serve<T: BeaconChainTypes>(
let get_validator_blocks = eth1_v1
.and(warp::path("validator"))
.and(warp::path("blocks"))
.and(warp::path::param::<Slot>())
.and(warp::path::param::<Slot>().or_else(|_| {
blocking_task(|| {
Err(warp_utils::reject::custom_bad_request(
"Invalid slot".to_string(),
))
})
}))
.and(warp::path::end())
.and(not_while_syncing_filter.clone())
.and(warp::query::<api_types::ValidatorBlocksQuery>())
Expand Down Expand Up @@ -1683,7 +1719,13 @@ pub fn serve<T: BeaconChainTypes>(
.and(warp::path("validator"))
.and(warp::path("duties"))
.and(warp::path("attester"))
.and(warp::path::param::<Epoch>())
.and(warp::path::param::<Epoch>().or_else(|_| {
blocking_task(|| {
Err(warp_utils::reject::custom_bad_request(
"Invalid epoch".to_string(),
))
})
}))
.and(warp::path::end())
.and(not_while_syncing_filter.clone())
.and(warp::body::json())
Expand Down