From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E08E29E4DB for ; Mon, 27 Nov 2023 14:14:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C30B37B1C for ; Mon, 27 Nov 2023 14:14:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 27 Nov 2023 14:14:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9DDE844B47 for ; Mon, 27 Nov 2023 14:14:49 +0100 (CET) Date: Mon, 27 Nov 2023 14:14:28 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20231109153403.529870-1-s.sterz@proxmox.com> <20231109153403.529870-7-s.sterz@proxmox.com> In-Reply-To: <20231109153403.529870-7-s.sterz@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1701090687.cf63ay42h2.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, subscription.rs] Subject: [pbs-devel] applied: [PATCH proxmox-backup 6/6] manager: check if offline subscription is for the correct product 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: , X-List-Received-Date: Mon, 27 Nov 2023 13:14:50 -0000 with the bumped proxmox-subscription dependency folded in On November 9, 2023 4:34 pm, Stefan Sterz wrote: > previously when an offline key was set it wasn't verified that the > subscription was for the correct product. while pom only applies > subscriptions for the corresponding products, a user could manually > invoke the `subscription set-offline-key` command to circumvent that. >=20 > Signed-off-by: Stefan Sterz > --- > src/bin/proxmox_backup_manager/subscription.rs | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) >=20 > diff --git a/src/bin/proxmox_backup_manager/subscription.rs b/src/bin/pro= xmox_backup_manager/subscription.rs > index 66161af7..12f09ecf 100644 > --- a/src/bin/proxmox_backup_manager/subscription.rs > +++ b/src/bin/proxmox_backup_manager/subscription.rs > @@ -3,7 +3,7 @@ use serde_json::Value; >=20 > use proxmox_router::{cli::*, ApiHandler, RpcEnvironment}; > use proxmox_schema::api; > -use proxmox_subscription::SubscriptionInfo; > +use proxmox_subscription::{ProductType, SubscriptionInfo}; >=20 > use proxmox_backup::api2::{self, node::subscription::subscription_file_o= pts}; >=20 > @@ -51,6 +51,12 @@ pub fn set_offline_subscription_key(data: String) -> R= esult<(), Error> { > if !info.is_signed() { > bail!("Offline subscription key must be signed!"); > } > + > + let product_type =3D info.get_product_type()?; > + if product_type !=3D ProductType::Pbs { > + bail!("Subscription is not a PBS subscription ({product_type})!"= ); > + } > + > info.check_signature(&[proxmox_subscription::files::DEFAULT_SIGNING_= KEY]); > info.check_age(false); > info.check_server_id(); > -- > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20