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 9F34AA0B1C for ; Thu, 9 Nov 2023 16:34:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 76E0717053 for ; Thu, 9 Nov 2023 16:34:16 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 9 Nov 2023 16:34:15 +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 5143F47850 for ; Thu, 9 Nov 2023 16:34:15 +0100 (CET) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Thu, 9 Nov 2023 16:33:57 +0100 Message-Id: <20231109153403.529870-1-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.088 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-offline-mirror.rs, medium.rs, config.rs, subscription.rs, lib.rs, types.rs, proxmox-offline-mirror-helper.rs] Subject: [pbs-devel] [PATCH offline-mirror/proxmox/backup-server 0/6] improve pom multi-key handling and pbs key check 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: Thu, 09 Nov 2023 15:34:46 -0000 this patch series intends to improve the usability of the `proxmox-offline-mirror-helper`. it also refactors the handling of the `ProductType` type. by moving it into the `proxmox-subscription` crate, it is possible to check the product type consistently accross products. this enables us to also add a check for the product type to the `subscription set-offline-key` command in pbs. the first and third patches move the `ProductType` trait from pom into the `proxmox-subscription`. the second patch also exposes a `get_next_due_date()` function for the `SubscriptionInfo` type. these patches need to be applied for the other patches to work. the third patch adapts pom's handling of multi-key key-media. previously there was a bug where pom did not check if the subscription's server id matche the current system's. this commit fixes that and also adds some more convenience for systems that need keys for multiple products (e. g. a pve+pbs host). it also filters the keys by server id that are shown to cli users when using the interactive `setup` command. the fifth commit is just a rustfmt clean up for pom. the sixth commit adds a check to pbs that makes sure an offline subscription that is applied throuh the manager's `subscription set-offline-key` command is actually a pbs subscription. Stefan Sterz (2) @ proxmox: type: move `ProductType` type to `proxmox-subscription` from pom subscription: expose the `next_due_date` as an `i64` proxmox-subscription/src/lib.rs | 4 +- proxmox-subscription/src/subscription_info.rs | 58 ++++++++++++++++++- 2 files changed, 60 insertions(+), 2 deletions(-) Stefan Sterz (3) @ proxmox-offline-mirror: type: move `ProductType` enum to `proxmox-subscription` helper: improve handling of multiple keys when activating them offline mirror binary: rustfmt clean up src/bin/proxmox-offline-mirror-helper.rs | 101 +++++++++++------- src/bin/proxmox-offline-mirror.rs | 15 ++- src/bin/proxmox_offline_mirror_cmds/medium.rs | 4 +- .../subscription.rs | 4 +- src/config.rs | 4 +- src/subscription.rs | 4 +- src/types.rs | 44 +------- 7 files changed, 77 insertions(+), 99 deletions(-) Stefan Sterz (1) @ proxmox-backup: manager: check if offline subscription is for the correct product src/bin/proxmox_backup_manager/subscription.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- 2.39.2