mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 00:41:08 +00:00
rpc server: add rate limiting middleware (#3301)
Add RPC server rate limiting which can be utilized by the CLI `--rpc-rate-limit <calls/per minute>` Resolves first part of https://github.com/paritytech/polkadot-sdk/issues/3028 //cc @PierreBesson @kogeler you might be interested in this one --------- Co-authored-by: James Wilson <james@jsdw.me> Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
This commit is contained in:
Generated
+65
@@ -6187,6 +6187,24 @@ dependencies = [
|
||||
"testnet-parachains-constants",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "governor"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"dashmap",
|
||||
"futures",
|
||||
"futures-timer",
|
||||
"no-std-compat",
|
||||
"nonzero_ext",
|
||||
"parking_lot 0.12.1",
|
||||
"quanta",
|
||||
"rand",
|
||||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "group"
|
||||
version = "0.13.0"
|
||||
@@ -7865,6 +7883,15 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mach2"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "macro_magic"
|
||||
version = "0.5.0"
|
||||
@@ -8531,6 +8558,12 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "no-std-compat"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
|
||||
|
||||
[[package]]
|
||||
name = "no-std-net"
|
||||
version = "0.6.0"
|
||||
@@ -8781,6 +8814,12 @@ dependencies = [
|
||||
"minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nonzero_ext"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
|
||||
|
||||
[[package]]
|
||||
name = "normalize-line-endings"
|
||||
version = "0.3.0"
|
||||
@@ -14352,6 +14391,22 @@ dependencies = [
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quanta"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
"libc",
|
||||
"mach2",
|
||||
"once_cell",
|
||||
"raw-cpuid",
|
||||
"wasi 0.11.0+wasi-snapshot-preview1",
|
||||
"web-sys",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "1.2.3"
|
||||
@@ -14512,6 +14567,15 @@ dependencies = [
|
||||
"rand_core 0.6.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "raw-cpuid"
|
||||
version = "10.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rawpointer"
|
||||
version = "0.2.1"
|
||||
@@ -16496,6 +16560,7 @@ name = "sc-rpc-server"
|
||||
version = "11.0.0"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"governor",
|
||||
"http",
|
||||
"hyper",
|
||||
"jsonrpsee",
|
||||
|
||||
@@ -801,6 +801,7 @@ pub fn node_config(
|
||||
rpc_max_subs_per_conn: Default::default(),
|
||||
rpc_port: 9945,
|
||||
rpc_message_buffer_capacity: Default::default(),
|
||||
rpc_rate_limit: None,
|
||||
prometheus_config: None,
|
||||
telemetry_endpoints: None,
|
||||
default_heap_pages: None,
|
||||
|
||||
@@ -186,6 +186,7 @@ pub fn node_config(
|
||||
rpc_max_subs_per_conn: Default::default(),
|
||||
rpc_port: 9944,
|
||||
rpc_message_buffer_capacity: Default::default(),
|
||||
rpc_rate_limit: None,
|
||||
prometheus_config: None,
|
||||
telemetry_endpoints: None,
|
||||
default_heap_pages: None,
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
|
||||
# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
|
||||
|
||||
title: rpc server add rate limiting.
|
||||
|
||||
doc:
|
||||
- audience: Node Operator
|
||||
description: |
|
||||
Add rate limiting for RPC server which can be utilized by the CLI `--rpc-rate-limit <calls per minute>`
|
||||
The rate-limiting is disabled by default.
|
||||
crates: [ ]
|
||||
@@ -84,6 +84,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
|
||||
rpc_max_subs_per_conn: Default::default(),
|
||||
rpc_port: 9944,
|
||||
rpc_message_buffer_capacity: Default::default(),
|
||||
rpc_rate_limit: None,
|
||||
prometheus_config: None,
|
||||
telemetry_endpoints: None,
|
||||
default_heap_pages: None,
|
||||
|
||||
@@ -80,6 +80,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
|
||||
rpc_max_subs_per_conn: Default::default(),
|
||||
rpc_port: 9944,
|
||||
rpc_message_buffer_capacity: Default::default(),
|
||||
rpc_rate_limit: None,
|
||||
prometheus_config: None,
|
||||
telemetry_endpoints: None,
|
||||
default_heap_pages: None,
|
||||
|
||||
@@ -34,7 +34,10 @@ use sc_service::{
|
||||
ChainSpec, Role,
|
||||
};
|
||||
use sc_telemetry::TelemetryEndpoints;
|
||||
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
|
||||
use std::{
|
||||
net::{IpAddr, Ipv4Addr, SocketAddr},
|
||||
num::NonZeroU32,
|
||||
};
|
||||
|
||||
/// The `run` command used to run a node.
|
||||
#[derive(Debug, Clone, Parser)]
|
||||
@@ -82,6 +85,15 @@ pub struct RunCmd {
|
||||
)]
|
||||
pub rpc_methods: RpcMethods,
|
||||
|
||||
/// RPC rate limiting (calls/minute) for each connection.
|
||||
///
|
||||
/// This is disabled by default.
|
||||
///
|
||||
/// For example `--rpc-rate-limit 10` will maximum allow
|
||||
/// 10 calls per minute per connection.
|
||||
#[arg(long)]
|
||||
pub rpc_rate_limit: Option<NonZeroU32>,
|
||||
|
||||
/// Set the maximum RPC request payload size for both HTTP and WS in megabytes.
|
||||
#[arg(long, default_value_t = RPC_DEFAULT_MAX_REQUEST_SIZE_MB)]
|
||||
pub rpc_max_request_size: u32,
|
||||
@@ -399,6 +411,10 @@ impl CliConfiguration for RunCmd {
|
||||
Ok(self.rpc_max_subscriptions_per_connection)
|
||||
}
|
||||
|
||||
fn rpc_rate_limit(&self) -> Result<Option<NonZeroU32>> {
|
||||
Ok(self.rpc_rate_limit)
|
||||
}
|
||||
|
||||
fn transaction_pool(&self, is_dev: bool) -> Result<TransactionPoolOptions> {
|
||||
Ok(self.pool_config.transaction_pool(is_dev))
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ use sc_service::{
|
||||
BlocksPruning, ChainSpec, TracingReceiver,
|
||||
};
|
||||
use sc_tracing::logging::LoggerBuilder;
|
||||
use std::{net::SocketAddr, path::PathBuf};
|
||||
use std::{net::SocketAddr, num::NonZeroU32, path::PathBuf};
|
||||
|
||||
/// The maximum number of characters for a node name.
|
||||
pub(crate) const NODE_NAME_MAX_LENGTH: usize = 64;
|
||||
@@ -338,6 +338,11 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
|
||||
Ok(RPC_DEFAULT_MESSAGE_CAPACITY_PER_CONN)
|
||||
}
|
||||
|
||||
/// Rate limit calls per minute.
|
||||
fn rpc_rate_limit(&self) -> Result<Option<NonZeroU32>> {
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
/// Get the prometheus configuration (`None` if disabled)
|
||||
///
|
||||
/// By default this is `None`.
|
||||
@@ -510,6 +515,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
|
||||
rpc_max_subs_per_conn: self.rpc_max_subscriptions_per_connection()?,
|
||||
rpc_port: DCV::rpc_listen_port(),
|
||||
rpc_message_buffer_capacity: self.rpc_buffer_capacity_per_connection()?,
|
||||
rpc_rate_limit: self.rpc_rate_limit()?,
|
||||
prometheus_config: self
|
||||
.prometheus_config(DCV::prometheus_listen_port(), &chain_spec)?,
|
||||
telemetry_endpoints,
|
||||
|
||||
@@ -271,6 +271,7 @@ mod tests {
|
||||
rpc_max_subs_per_conn: Default::default(),
|
||||
rpc_message_buffer_capacity: Default::default(),
|
||||
rpc_port: 9944,
|
||||
rpc_rate_limit: None,
|
||||
prometheus_config: None,
|
||||
telemetry_endpoints: None,
|
||||
default_heap_pages: None,
|
||||
|
||||
@@ -27,3 +27,4 @@ http = "0.2.8"
|
||||
hyper = "0.14.27"
|
||||
futures = "0.3.29"
|
||||
pin-project = "1.1.3"
|
||||
governor = "0.6.0"
|
||||
|
||||
@@ -22,7 +22,9 @@
|
||||
|
||||
pub mod middleware;
|
||||
|
||||
use std::{convert::Infallible, error::Error as StdError, net::SocketAddr, time::Duration};
|
||||
use std::{
|
||||
convert::Infallible, error::Error as StdError, net::SocketAddr, num::NonZeroU32, time::Duration,
|
||||
};
|
||||
|
||||
use http::header::HeaderValue;
|
||||
use hyper::{
|
||||
@@ -31,10 +33,7 @@ use hyper::{
|
||||
};
|
||||
use jsonrpsee::{
|
||||
server::{
|
||||
middleware::{
|
||||
http::{HostFilterLayer, ProxyGetRequestLayer},
|
||||
rpc::RpcServiceBuilder,
|
||||
},
|
||||
middleware::http::{HostFilterLayer, ProxyGetRequestLayer},
|
||||
stop_channel, ws, PingConfig, StopHandle, TowerServiceBuilder,
|
||||
},
|
||||
Methods, RpcModule,
|
||||
@@ -43,11 +42,14 @@ use tokio::net::TcpListener;
|
||||
use tower::Service;
|
||||
use tower_http::cors::{AllowOrigin, CorsLayer};
|
||||
|
||||
pub use jsonrpsee::core::{
|
||||
id_providers::{RandomIntegerIdProvider, RandomStringIdProvider},
|
||||
traits::IdProvider,
|
||||
pub use jsonrpsee::{
|
||||
core::{
|
||||
id_providers::{RandomIntegerIdProvider, RandomStringIdProvider},
|
||||
traits::IdProvider,
|
||||
},
|
||||
server::middleware::rpc::RpcServiceBuilder,
|
||||
};
|
||||
pub use middleware::{MetricsLayer, RpcMetrics};
|
||||
pub use middleware::{MetricsLayer, RateLimitLayer, RpcMetrics};
|
||||
|
||||
const MEGABYTE: u32 = 1024 * 1024;
|
||||
|
||||
@@ -79,12 +81,26 @@ pub struct Config<'a, M: Send + Sync + 'static> {
|
||||
pub id_provider: Option<Box<dyn IdProvider>>,
|
||||
/// Tokio runtime handle.
|
||||
pub tokio_handle: tokio::runtime::Handle,
|
||||
/// Rate limit calls per minute.
|
||||
pub rate_limit: Option<NonZeroU32>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
struct PerConnection<RpcMiddleware, HttpMiddleware> {
|
||||
methods: Methods,
|
||||
stop_handle: StopHandle,
|
||||
metrics: Option<RpcMetrics>,
|
||||
tokio_handle: tokio::runtime::Handle,
|
||||
service_builder: TowerServiceBuilder<RpcMiddleware, HttpMiddleware>,
|
||||
}
|
||||
|
||||
/// Start RPC server listening on given address.
|
||||
pub async fn start_server<M: Send + Sync + 'static>(
|
||||
pub async fn start_server<M>(
|
||||
config: Config<'_, M>,
|
||||
) -> Result<Server, Box<dyn StdError + Send + Sync>> {
|
||||
) -> Result<Server, Box<dyn StdError + Send + Sync>>
|
||||
where
|
||||
M: Send + Sync,
|
||||
{
|
||||
let Config {
|
||||
addrs,
|
||||
cors,
|
||||
@@ -97,6 +113,7 @@ pub async fn start_server<M: Send + Sync + 'static>(
|
||||
id_provider,
|
||||
tokio_handle,
|
||||
rpc_api,
|
||||
rate_limit,
|
||||
} = config;
|
||||
|
||||
let std_listener = TcpListener::bind(addrs.as_slice()).await?.into_std()?;
|
||||
@@ -153,7 +170,13 @@ pub async fn start_server<M: Send + Sync + 'static>(
|
||||
let transport_label = if is_websocket { "ws" } else { "http" };
|
||||
|
||||
let metrics = metrics.map(|m| MetricsLayer::new(m, transport_label));
|
||||
let rpc_middleware = RpcServiceBuilder::new().option_layer(metrics.clone());
|
||||
let rate_limit = rate_limit.map(|r| RateLimitLayer::per_minute(r));
|
||||
|
||||
// NOTE: The metrics needs to run first to include rate-limited calls in the
|
||||
// metrics.
|
||||
let rpc_middleware =
|
||||
RpcServiceBuilder::new().option_layer(metrics.clone()).option_layer(rate_limit);
|
||||
|
||||
let mut svc =
|
||||
service_builder.set_rpc_middleware(rpc_middleware).build(methods, stop_handle);
|
||||
|
||||
@@ -245,12 +268,3 @@ fn format_cors(maybe_cors: Option<&Vec<String>>) -> String {
|
||||
format!("{:?}", ["*"])
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
struct PerConnection<RpcMiddleware, HttpMiddleware> {
|
||||
methods: Methods,
|
||||
stop_handle: StopHandle,
|
||||
metrics: Option<RpcMetrics>,
|
||||
tokio_handle: tokio::runtime::Handle,
|
||||
service_builder: TowerServiceBuilder<RpcMiddleware, HttpMiddleware>,
|
||||
}
|
||||
|
||||
@@ -18,6 +18,10 @@
|
||||
|
||||
//! JSON-RPC specific middleware.
|
||||
|
||||
/// Grafana metrics middleware.
|
||||
pub mod metrics;
|
||||
/// Rate limit middleware.
|
||||
pub mod rate_limit;
|
||||
|
||||
pub use metrics::*;
|
||||
pub use rate_limit::*;
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
// This file is part of Substrate.
|
||||
|
||||
// Copyright (C) Parity Technologies (UK) Ltd.
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
|
||||
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
//! RPC rate limiting middleware.
|
||||
|
||||
use std::{num::NonZeroU32, sync::Arc, time::Duration};
|
||||
|
||||
use futures::future::{BoxFuture, FutureExt};
|
||||
use governor::{
|
||||
clock::{Clock, DefaultClock, QuantaClock},
|
||||
middleware::NoOpMiddleware,
|
||||
state::{InMemoryState, NotKeyed},
|
||||
Jitter,
|
||||
};
|
||||
use jsonrpsee::{
|
||||
server::middleware::rpc::RpcServiceT,
|
||||
types::{ErrorObject, Id, Request},
|
||||
MethodResponse,
|
||||
};
|
||||
|
||||
type RateLimitInner = governor::RateLimiter<NotKeyed, InMemoryState, DefaultClock, NoOpMiddleware>;
|
||||
|
||||
const MAX_JITTER: Duration = Duration::from_millis(50);
|
||||
const MAX_RETRIES: usize = 10;
|
||||
|
||||
/// JSON-RPC rate limit middleware layer.
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct RateLimitLayer(governor::Quota);
|
||||
|
||||
impl RateLimitLayer {
|
||||
/// Create new rate limit enforced per minute.
|
||||
pub fn per_minute(n: NonZeroU32) -> Self {
|
||||
Self(governor::Quota::per_minute(n))
|
||||
}
|
||||
}
|
||||
|
||||
/// JSON-RPC rate limit middleware
|
||||
pub struct RateLimit<S> {
|
||||
service: S,
|
||||
rate_limit: Arc<RateLimitInner>,
|
||||
clock: QuantaClock,
|
||||
}
|
||||
|
||||
impl<S> tower::Layer<S> for RateLimitLayer {
|
||||
type Service = RateLimit<S>;
|
||||
|
||||
fn layer(&self, service: S) -> Self::Service {
|
||||
let clock = QuantaClock::default();
|
||||
RateLimit {
|
||||
service,
|
||||
rate_limit: Arc::new(RateLimitInner::direct_with_clock(self.0, &clock)),
|
||||
clock,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, S> RpcServiceT<'a> for RateLimit<S>
|
||||
where
|
||||
S: Send + Sync + RpcServiceT<'a> + Clone + 'static,
|
||||
{
|
||||
type Future = BoxFuture<'a, MethodResponse>;
|
||||
|
||||
fn call(&self, req: Request<'a>) -> Self::Future {
|
||||
let service = self.service.clone();
|
||||
let rate_limit = self.rate_limit.clone();
|
||||
let clock = self.clock.clone();
|
||||
|
||||
async move {
|
||||
let mut attempts = 0;
|
||||
let jitter = Jitter::up_to(MAX_JITTER);
|
||||
|
||||
loop {
|
||||
if attempts >= MAX_RETRIES {
|
||||
break reject_too_many_calls(req.id);
|
||||
}
|
||||
|
||||
if let Err(rejected) = rate_limit.check() {
|
||||
tokio::time::sleep(jitter + rejected.wait_time_from(clock.now())).await;
|
||||
} else {
|
||||
break service.call(req).await;
|
||||
}
|
||||
|
||||
attempts += 1;
|
||||
}
|
||||
}
|
||||
.boxed()
|
||||
}
|
||||
}
|
||||
|
||||
fn reject_too_many_calls(id: Id) -> MethodResponse {
|
||||
MethodResponse::error(id, ErrorObject::owned(-32999, "RPC rate limit exceeded", None::<()>))
|
||||
}
|
||||
@@ -39,6 +39,7 @@ use sp_core::crypto::SecretString;
|
||||
use std::{
|
||||
io, iter,
|
||||
net::SocketAddr,
|
||||
num::NonZeroU32,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
use tempfile::TempDir;
|
||||
@@ -102,6 +103,8 @@ pub struct Configuration {
|
||||
pub rpc_port: u16,
|
||||
/// The number of messages the JSON-RPC server is allowed to keep in memory.
|
||||
pub rpc_message_buffer_capacity: u32,
|
||||
/// RPC rate limit per minute.
|
||||
pub rpc_rate_limit: Option<NonZeroU32>,
|
||||
/// Prometheus endpoint configuration. `None` if disabled.
|
||||
pub prometheus_config: Option<PrometheusConfig>,
|
||||
/// Telemetry service URL. `None` if disabled.
|
||||
|
||||
@@ -403,6 +403,7 @@ where
|
||||
id_provider: rpc_id_provider,
|
||||
cors: config.rpc_cors.as_ref(),
|
||||
tokio_handle: config.tokio_handle.clone(),
|
||||
rate_limit: config.rpc_rate_limit,
|
||||
};
|
||||
|
||||
// TODO: https://github.com/paritytech/substrate/issues/13773
|
||||
|
||||
@@ -254,6 +254,7 @@ fn node_config<
|
||||
rpc_max_subs_per_conn: Default::default(),
|
||||
rpc_port: 9944,
|
||||
rpc_message_buffer_capacity: Default::default(),
|
||||
rpc_rate_limit: None,
|
||||
prometheus_config: None,
|
||||
telemetry_endpoints: None,
|
||||
default_heap_pages: None,
|
||||
|
||||
Reference in New Issue
Block a user