From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 0CB4D1FF17A for ; Tue, 11 Nov 2025 11:41:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 56F1B5A5F; Tue, 11 Nov 2025 11:42:18 +0100 (CET) Message-ID: Date: Tue, 11 Nov 2025 11:42:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox Backup Server development discussion , Christian Ebner References: <20250916124147.513342-1-c.ebner@proxmox.com> <20250916124147.513342-4-c.ebner@proxmox.com> Content-Language: en-US From: Hannes Laimer In-Reply-To: <20250916124147.513342-4-c.ebner@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1762857711731 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox v2 3/4] rest-server: optionally depend on factored out shared rate limiter X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Reviewed-by: Hannes Laimer Tested-by: Hannes Laimer On 9/16/25 14:42, Christian Ebner wrote: > The rate limiter implementation has been moved to a dedicated crate, > so depend on it for the rest servers rate limited stream connection. > > Signed-off-by: Christian Ebner > --- > Changes since version 1: > - not present in previous version > > proxmox-rest-server/Cargo.toml | 2 ++ > proxmox-rest-server/debian/control | 14 ++++++++------ > proxmox-rest-server/src/connection.rs | 4 +++- > 3 files changed, 13 insertions(+), 7 deletions(-) > > diff --git a/proxmox-rest-server/Cargo.toml b/proxmox-rest-server/Cargo.toml > index 81d93ca1..7478f6a8 100644 > --- a/proxmox-rest-server/Cargo.toml > +++ b/proxmox-rest-server/Cargo.toml > @@ -44,6 +44,7 @@ proxmox-daemon.workspace = true > proxmox-http = { workspace = true, features = ["body"] } > proxmox-lang.workspace = true > proxmox-log.workspace = true > +proxmox-rate-limiter = { workspace = true, optional = true, features = [ "shared-rate-limiter" ] } > proxmox-router.workspace = true > proxmox-schema = { workspace = true, features = [ "api-macro", "upid-api-impl" ] } > proxmox-sys = { workspace = true, features = [ "logrotate", "timer" ] } > @@ -54,5 +55,6 @@ proxmox-worker-task.workspace = true > default = [] > templates = ["dep:handlebars"] > rate-limited-stream = [ > + "dep:proxmox-rate-limiter", > "proxmox-http/rate-limited-stream", > ] > diff --git a/proxmox-rest-server/debian/control b/proxmox-rest-server/debian/control > index 263ca7ea..ee04bd3f 100644 > --- a/proxmox-rest-server/debian/control > +++ b/proxmox-rest-server/debian/control > @@ -29,8 +29,8 @@ Build-Depends-Arch: cargo:native , > librust-proxmox-async-0.5+default-dev , > librust-proxmox-compression-1+default-dev , > librust-proxmox-daemon-1+default-dev , > - librust-proxmox-http-1+body-dev (>= 1.0.2-~~) , > - librust-proxmox-http-1+default-dev (>= 1.0.2-~~) , > + librust-proxmox-http-1+body-dev (>= 1.0.3-~~) , > + librust-proxmox-http-1+default-dev (>= 1.0.3-~~) , > librust-proxmox-lang-1+default-dev (>= 1.5-~~) , > librust-proxmox-log-1+default-dev , > librust-proxmox-router-3+default-dev (>= 3.2.2-~~) , > @@ -91,8 +91,8 @@ Depends: > librust-proxmox-async-0.5+default-dev, > librust-proxmox-compression-1+default-dev, > librust-proxmox-daemon-1+default-dev, > - librust-proxmox-http-1+body-dev (>= 1.0.2-~~), > - librust-proxmox-http-1+default-dev (>= 1.0.2-~~), > + librust-proxmox-http-1+body-dev (>= 1.0.3-~~), > + librust-proxmox-http-1+default-dev (>= 1.0.3-~~), > librust-proxmox-lang-1+default-dev (>= 1.5-~~), > librust-proxmox-log-1+default-dev, > librust-proxmox-router-3+default-dev (>= 3.2.2-~~), > @@ -137,8 +137,10 @@ Multi-Arch: same > Depends: > ${misc:Depends}, > librust-proxmox-rest-server-dev (= ${binary:Version}), > - librust-proxmox-http-1+body-dev (>= 1.0.2-~~), > - librust-proxmox-http-1+rate-limited-stream-dev (>= 1.0.2-~~) > + librust-proxmox-http-1+body-dev (>= 1.0.3-~~), > + librust-proxmox-http-1+rate-limited-stream-dev (>= 1.0.3-~~), > + librust-proxmox-rate-limiter-1+default-dev, > + librust-proxmox-rate-limiter-1+shared-rate-limiter-dev > Provides: > librust-proxmox-rest-server-1+rate-limited-stream-dev (= ${binary:Version}), > librust-proxmox-rest-server-1.0+rate-limited-stream-dev (= ${binary:Version}), > diff --git a/proxmox-rest-server/src/connection.rs b/proxmox-rest-server/src/connection.rs > index 9511b7cb..6ffaac73 100644 > --- a/proxmox-rest-server/src/connection.rs > +++ b/proxmox-rest-server/src/connection.rs > @@ -24,7 +24,9 @@ use tokio_openssl::SslStream; > use tokio_stream::wrappers::ReceiverStream; > > #[cfg(feature = "rate-limited-stream")] > -use proxmox_http::{RateLimitedStream, ShareableRateLimit}; > +use proxmox_http::RateLimitedStream; > +#[cfg(feature = "rate-limited-stream")] > +use proxmox_rate_limiter::ShareableRateLimit; > > #[cfg(feature = "rate-limited-stream")] > pub type SharedRateLimit = Arc; _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel