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 225991FF15C
for <inbox@lore.proxmox.com>; Fri, 4 Apr 2025 16:08:09 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7B8F2332B9;
Fri, 4 Apr 2025 16:07:55 +0200 (CEST)
From: Mira Limbeck <m.limbeck@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 4 Apr 2025 16:07:17 +0200
Message-Id: <20250404140717.289504-1-m.limbeck@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250324033737.1347963-6-thomas@atskinner.net>
References: <20250324033737.1347963-6-thomas@atskinner.net>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.621 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
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [mod.rs]
Subject: [pve-devel] [PATCH v4 perl-rs] fix #4234: openid: adjust openid
verification function for userinfo option
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>
From: Thomas Skinner <thomas@atskinner.net>
Signed-off-by: Thomas Skinner <thomas@atskinner.net>
[ML: rebased on master, added code to common and pve-rs forwarding]
Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
---
PMG uses the functions as well, depending on how perlmod handles
unspecified parameters, those callsites may need to be updated.
common/src/oidc/mod.rs | 7 ++++++-
pve-rs/src/openid/mod.rs | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/common/src/oidc/mod.rs b/common/src/oidc/mod.rs
index 29791bc..1b398d6 100644
--- a/common/src/oidc/mod.rs
+++ b/common/src/oidc/mod.rs
@@ -54,9 +54,14 @@ pub mod export {
#[try_from_ref] this: &OIDC,
code: &str,
private_auth_state: PrivateAuthState,
+ query_userinfo: Option<bool>,
) -> Result<Value, Error> {
let oidc = this.inner.lock().unwrap();
- let claims = oidc.verify_authorization_code_simple(code, &private_auth_state)?;
+ let claims = oidc.verify_authorization_code_simple_userinfo(
+ code,
+ &private_auth_state,
+ query_userinfo.unwrap_or(true),
+ )?;
Ok(to_value(&claims)?)
}
diff --git a/pve-rs/src/openid/mod.rs b/pve-rs/src/openid/mod.rs
index 2adb8bb..f18639c 100644
--- a/pve-rs/src/openid/mod.rs
+++ b/pve-rs/src/openid/mod.rs
@@ -41,7 +41,8 @@ mod export {
#[try_from_ref] this: &OpenId,
code: &str,
private_auth_state: PrivateAuthState,
+ query_userinfo: Option<bool>,
) -> Result<Value, Error> {
- common::verify_authorization_code(this, code, private_auth_state)
+ common::verify_authorization_code(this, code, private_auth_state, query_userinfo)
}
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel