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: grpc request overflows #5812

Merged
merged 2 commits into from
Sep 29, 2023
Merged

fix: grpc request overflows #5812

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09a6fac
fix grpc overflows
SWvheerden Sep 26, 2023
2711b68
Merge branch 'development' into sw_fix_overflow
SWvheerden Sep 29, 2023
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
25 changes: 15 additions & 10 deletions applications/minotari_node/src/grpc/base_node_grpc_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,9 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
);
let mut handler = self.node_service.clone();
let (start_height, end_height) = get_heights(&request, handler.clone()).await?;
// Overflow safety: checked in get_heights
let num_requested = end_height - start_height;
let num_requested = end_height
.checked_sub(start_height)
.ok_or(Status::invalid_argument("Start height is more than end height"))?;
if num_requested > GET_DIFFICULTY_MAX_HEIGHTS {
return Err(Status::invalid_argument(format!(
"Number of headers requested exceeds maximum. Expected less than {} but got {}",
Expand All @@ -181,8 +182,9 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
let mut randomx_hash_rate_moving_average =
HashRateMovingAverage::new(PowAlgorithm::RandomX, self.consensus_rules.clone());

let page_iter = NonOverlappingIntegerPairIter::new(start_height, end_height + 1, GET_DIFFICULTY_PAGE_SIZE)
.map_err(Status::invalid_argument)?;
let page_iter =
NonOverlappingIntegerPairIter::new(start_height, end_height.saturating_add(1), GET_DIFFICULTY_PAGE_SIZE)
.map_err(Status::invalid_argument)?;
task::spawn(async move {
for (start, end) in page_iter {
// headers are returned by height
Expand Down Expand Up @@ -223,7 +225,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {

let sha3x_estimated_hash_rate = sha3x_hash_rate_moving_average.average();
let randomx_estimated_hash_rate = randomx_hash_rate_moving_average.average();
let estimated_hash_rate = sha3x_estimated_hash_rate + randomx_estimated_hash_rate;
let estimated_hash_rate = sha3x_estimated_hash_rate.saturating_add(randomx_estimated_hash_rate);

let difficulty = tari_rpc::NetworkDifficultyResponse {
difficulty: current_difficulty.as_u64(),
Expand Down Expand Up @@ -374,9 +376,12 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
}
};
let consensus_rules = self.consensus_rules.clone();
let page_iter =
NonOverlappingIntegerPairIter::new(*header_range.start(), *header_range.end() + 1, LIST_HEADERS_PAGE_SIZE)
.map_err(Status::invalid_argument)?;
let page_iter = NonOverlappingIntegerPairIter::new(
*header_range.start(),
header_range.end().saturating_add(1),
LIST_HEADERS_PAGE_SIZE,
)
.map_err(Status::invalid_argument)?;
task::spawn(async move {
debug!(
target: LOG_TARGET,
Expand Down Expand Up @@ -875,7 +880,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {

let mut handler = self.node_service.clone();
let (mut tx, rx) = mpsc::channel(GET_BLOCKS_PAGE_SIZE);
let page_iter = NonOverlappingIntegerPairIter::new(start, end + 1, GET_BLOCKS_PAGE_SIZE)
let page_iter = NonOverlappingIntegerPairIter::new(start, end.saturating_add(1), GET_BLOCKS_PAGE_SIZE)
.map_err(Status::invalid_argument)?;
task::spawn(async move {
for (start, end) in page_iter {
Expand Down Expand Up @@ -1679,7 +1684,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
},
};

let next_header = match node_service.get_header(height + 1).await {
let next_header = match node_service.get_header(height.saturating_add(1)).await {
Ok(h) => h,
Err(e) => {
let _ignore = tx.send(Err(obscure_error_if_true(
Expand Down