From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-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 AF2151FF162 for <inbox@lore.proxmox.com>; Sat, 8 Feb 2025 06:43:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 00BFA187B7; Sat, 8 Feb 2025 06:43:23 +0100 (CET) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738993362; x=1739598162; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3YGkm24P0s16gwB9BHNSZzbEJxNom/ajtty6BKR4PE4=; b=fQDiqV12ssiTgk17mylJyZZHPLawlDwpT5SJpS5RlWyA2Dq/jgrv9c+0VJij6Vg5Ul iL8+Oc4g2Wf/1Ex6aYPkQd1d5p7kW0lu+N30TMFH/dLwRM555yAg/w3BhVHSsoxK9vuG 3oPSL6qesdPa4dY2k9Y5kcsTlg+9DjGZfAQ8LdMCt3CusqHe28U4ySEnLWbxDCgEnrxV 4AaTko9UziOD5shSkXoRB/dqQAldjogxifchSiBqb0cnsqQnQgJhX+NHVa1hcNRJz2R8 EHpnswLlDm2dN8X2S/SSlL12pSRiB7LhDurGEkVl24ALyG1msUjiAN3wEsB8uKkFU2Zr JWuQ== X-Gm-Message-State: AOJu0YzSwwAOGA7Rh9vqkPqORo+w6okruUGfKm4gRLwgXEF+MEi752Zr uVoxzDItQVXI/SQFwSraw3VhdhLQt3udaurn8CRjfzN4q24bTL69g9RP2w== X-Gm-Gg: ASbGncvyK9bKOQj7ZnF29LjIcEqzcYnz46nLZbLwdBUrIWfMURE9mkXcZkcJcJFxzlw SYpvaJgWf+Ntjb3oq00kG5JPco8ZIbP4EBzZ48agvC0fpTot228u1yVsVkT3iiU7KpM2x4Rd+/A jX1oEImHJGslH06ZavfZZT/LPWRQq2IOV/DwZEctxv2dW8GXH9GT0ePk3uJTd+sK8tjGlL0yCyX x1k8kxluvpLeWxAXr71GLRWWzMVBDQQIfDpRcbtAJOKosdfULw5cFLAiIyHBMwoi3y2jypqSvXZ Mlk8+iewoKpuTFInm6s/IGt0b2UMH86dg9NQMNBTzK+HBri67Zt4hzmO7hQdZ2Amry0GIB0yjw9 aeOyCv7+lfUYJQTRmX96ojutN2U1S X-Google-Smtp-Source: AGHT+IGuc0UsgL6lDJ3bx9BItBJZvvJdVlsrIyHFx+Ad2HYsVMGNRwbzGQDktH1Qbn87UW1VBubZ+A== X-Received: by 2002:a05:6902:1a47:b0:e57:87b3:d2e0 with SMTP id 3f1490d57ef6-e5b46167b37mr5489396276.3.1738993361726; Fri, 07 Feb 2025 21:42:41 -0800 (PST) From: Thomas Skinner <thomas@atskinner.net> To: pve-devel@lists.proxmox.com Date: Fri, 7 Feb 2025 23:42:08 -0600 Message-Id: <20250208054209.598307-5-thomas@atskinner.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250208054209.598307-1-thomas@atskinner.net> References: <20250208054209.598307-1-thomas@atskinner.net> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.027 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 FREEMAIL_FORGED_FROMDOMAIN 0.001 2nd level domains in From and EnvelopeFrom freemail headers are different FREEMAIL_FROM 0.001 Sender email is commonly abused enduser mail provider HEADER_FROM_DIFFERENT_DOMAINS 0.07 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox-openid v3 1/1] fix #4234: openid: add library functions for optional userinfo endpoint X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Cc: Thomas Skinner <thomas@atskinner.net> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Signed-off-by: Thomas Skinner <thomas@atskinner.net> --- proxmox-openid/src/lib.rs | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/proxmox-openid/src/lib.rs b/proxmox-openid/src/lib.rs index fe65fded..d2a53d45 100644 --- a/proxmox-openid/src/lib.rs +++ b/proxmox-openid/src/lib.rs @@ -31,6 +31,7 @@ use openidconnect::{ PkceCodeVerifier, RedirectUrl, Scope, + StandardClaims, UserInfoClaims, }; @@ -195,6 +196,15 @@ impl OpenIdAuthenticator { &self, code: &str, private_auth_state: &PrivateAuthState, + ) -> Result<(CoreIdTokenClaims, GenericUserInfoClaims), Error> { + self.verify_authorization_code_userinfo(code, private_auth_state, false) + } + + pub fn verify_authorization_code_userinfo( + &self, + code: &str, + private_auth_state: &PrivateAuthState, + disable_userinfo: bool, ) -> Result<(CoreIdTokenClaims, GenericUserInfoClaims), Error> { let code = AuthorizationCode::new(code.to_string()); // Exchange the code with a token. @@ -213,6 +223,14 @@ impl OpenIdAuthenticator { .claims(&id_token_verifier, &private_auth_state.nonce) .map_err(|err| format_err!("Failed to verify ID token: {}", err))?; + if disable_userinfo { + let empty_userinfo_claims = UserInfoClaims::new( + StandardClaims::new(id_token_claims.subject().clone()), + GenericClaims(Value::Null), + ); + return Ok((id_token_claims.clone(), empty_userinfo_claims)); + } + let userinfo_claims: GenericUserInfoClaims = self .client .user_info(token_response.access_token().to_owned(), None)? @@ -227,9 +245,19 @@ impl OpenIdAuthenticator { &self, code: &str, private_auth_state: &PrivateAuthState, + ) -> Result<Value, Error> { + self.verify_authorization_code_simple_userinfo(code, private_auth_state, false) + } + + /// Like verify_authorization_code_simple_userinfo(), but returns claims as serde_json::Value + pub fn verify_authorization_code_simple_userinfo( + &self, + code: &str, + private_auth_state: &PrivateAuthState, + disable_userinfo: bool, ) -> Result<Value, Error> { let (id_token_claims, userinfo_claims) = - self.verify_authorization_code(code, private_auth_state)?; + self.verify_authorization_code_userinfo(code, private_auth_state, disable_userinfo)?; let mut data = serde_json::to_value(id_token_claims)?; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel