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 [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 0DBFA1FF173
for <inbox@lore.proxmox.com>; Mon, 24 Mar 2025 04:38:26 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 14E4D9AF4;
Mon, 24 Mar 2025 04:38:13 +0100 (CET)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742787482; x=1743392282;
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=I/SIIwvffS0EWcpp4gLFGPoXrU3cHgUVHVcnVxSLI9o=;
b=Wyy0zSkGNmu2xnKM8ucNfSLb9x8USv7KQU7tq6vn0GCebFV00ZNoNErvXg+Ul5a/LT
D4ny1KbLeWvank4aHzMExn/6EFfyl12qGp7MnfJnZhH7e5AXAf7YBAjO6lMdlCBIpP7q
UpaZkNmmO4z0NwWnqiFlBoBnetuVSIvIEH6C54GgM31SzE1RBrgSYU4qqsBDso85O7wV
b3HGJptZSjr1AJkBMvHqz1si0ptIihTC7PI5mjkNErDl87DmEy+6v6bIy0pA2lcMI6a1
aF2nV2wJz0eR2s+JCCwkFIFIdDD5X18izgTn2knhTryqjJ8Nr2lKCNHcN3lu0cBrFWXD
ZVPQ==
X-Gm-Message-State: AOJu0Yzt1ItlOj0C1kpREmRY9QZeKTfykFbsEVZ89/EVawvZcMAa7MzU
GW5JVFphN2FG6i973/6bJz58nz7941LgPRUaZ7gXH5H9eCX9oMQipjTZjg==
X-Gm-Gg: ASbGnctKiAah6z4s9Ddm+Ceg7EPyAh9XiGW15ZyFDZCFBrV2FPk7hANnZBlAp6n5QkM
q3cNveWPMckcxxHGhDus1qx4cUQ6Nx+qYkelJJ4hMuqsRaWas4IWcOAs2DLl3LvMaGbWLZ3JnMH
6S3CZp7LzIvyJLcieFCx3QlgDT/yR8Tr4GuiD1pow6soZJ4K88AMJPeSLzTHDojd38CgXQ+vnYs
Umm/PTJljsHwSU1UW3LJb2uuKG6173QNaEK/dcLcZDOmwcXqMCHhrsd8i1UDpm6VSlDjRVKtYbG
1B4Yx81jpHpg+r6b1HhleIvK0k9IVnLjUCVKaZjyTQDWlIJLNywFm3uZV7JOsfJA1giyQDOvBoJ
rkqi3OSAPNbrsa8ouDyXm5FXAtEZ2s6dtBarCyG1co96G0aBY3pt4cHygzg==
X-Google-Smtp-Source: AGHT+IELtcV4HFlgXl7JaYYyHOpp1LcqQhEC5psk/bRJiLZ/d2TfQAtUgx2qB/S4qlj6oNgsKTjcgQ==
X-Received: by 2002:a05:6902:228f:b0:e5d:b7d8:ad3b with SMTP id
3f1490d57ef6-e66a4d96904mr14268604276.19.1742787481902;
Sun, 23 Mar 2025 20:38:01 -0700 (PDT)
From: Thomas Skinner <thomas@atskinner.net>
To: pve-devel@lists.proxmox.com
Date: Sun, 23 Mar 2025 22:37:36 -0500
Message-Id: <20250324033737.1347963-5-thomas@atskinner.net>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250324033737.1347963-1-thomas@atskinner.net>
References: <20250324033737.1347963-1-thomas@atskinner.net>
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
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.062 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.01 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 v4 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..b36172c7 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, true)
+ }
+
+ pub fn verify_authorization_code_userinfo(
+ &self,
+ code: &str,
+ private_auth_state: &PrivateAuthState,
+ query_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 !query_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, true)
+ }
+
+ /// 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,
+ query_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, query_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