From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pdm-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 8B3F61FF168 for <inbox@lore.proxmox.com>; Tue, 4 Mar 2025 15:43:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E6113201F; Tue, 4 Mar 2025 15:43:07 +0100 (CET) From: Shannon Sterz <s.sterz@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Tue, 4 Mar 2025 15:42:36 +0100 Message-Id: <20250304144247.231089-11-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304144247.231089-1-s.sterz@proxmox.com> References: <20250304144247.231089-1-s.sterz@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.014 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: [pdm-devel] [PATCH proxmox v5 10/21] login: add optional field for ticket_info and make password optional X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion <pdm-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/> List-Post: <mailto:pdm-devel@lists.proxmox.com> List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Datacenter Manager development discussion <pdm-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com> tickets created through the new HttpOnly ticket endpoint won't return a ticket in the password field. so this field will be left empty. hence make it optional. the endpoint does return a ticket_info parameter, though, that includes the information when a ticket needs to be refreshed. so add a new optional field for that too. Signed-off-by: Shannon Sterz <s.sterz@proxmox.com> --- proxmox-login/src/api.rs | 9 ++++++++- proxmox-login/src/lib.rs | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/proxmox-login/src/api.rs b/proxmox-login/src/api.rs index aa8575fe..b7107312 100644 --- a/proxmox-login/src/api.rs +++ b/proxmox-login/src/api.rs @@ -21,7 +21,8 @@ pub struct CreateTicket { pub otp: Option<String>, /// The secret password. This can also be a valid ticket. - pub password: String, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub password: Option<String>, /// Verify ticket, and check if user have access 'privs' on 'path' #[serde(default, skip_serializing_if = "Option::is_none")] @@ -61,6 +62,12 @@ pub struct CreateTicketResponse { #[serde(default, skip_serializing_if = "Option::is_none")] pub ticket: Option<String>, + /// A purely informational ticket that can be used to gather information about when the actual + /// ticket needs to be refreshed. + #[serde(default, skip_serializing_if = "Option::is_none")] + #[serde(rename = "ticket-info")] + pub ticket_info: Option<String>, + /// The full userid with the `@realm` part. pub username: String, } diff --git a/proxmox-login/src/lib.rs b/proxmox-login/src/lib.rs index 5842d62a..d7798b62 100644 --- a/proxmox-login/src/lib.rs +++ b/proxmox-login/src/lib.rs @@ -129,7 +129,7 @@ impl Login { let request = api::CreateTicket { new_format: self.pve_compat.then_some(true), username: self.userid.clone(), - password: self.password.clone(), + password: Some(self.password.clone()), ..Default::default() }; @@ -279,7 +279,7 @@ impl SecondFactorChallenge { let request = api::CreateTicket { new_format: self.pve_compat.then_some(true), username: self.userid.clone(), - password: data.to_string(), + password: Some(data.to_string()), tfa_challenge: Some(self.ticket.clone()), ..Default::default() }; -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel