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 9382F1FF173
	for <inbox@lore.proxmox.com>; Mon, 24 Mar 2025 04:38:18 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id C390B9AAC;
	Mon, 24 Mar 2025 04:38:10 +0100 (CET)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1742787481; x=1743392281;
 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=eWt1vObhpiqTc4rzIfw9dNDxIbh8by0UeNFybhiViNQ=;
 b=vBKOwFx0CrjizPejV6yXLK1Ehfjt4QK+3xGxabZDuxvxjRYFUnji04AYzbeT6RXWWQ
 wihPDI2h0bbqiUN8a622StQB/rnLoOKGNqnvb3RmzjA5HPaQnhnKbR2A58K8HfuxEBHd
 dGGgOAQrTtE1ROgP+jmDHIVP913PHTSWyJjQOtOvMtg5Sy6/Tf/ZYKa5GMzFg9U72Mr/
 lcg/VGy5TawHvXtaY5vXZIFyFUO3g8SMhkq8A2trxXym38X1ZMQ4M5laDu6M9UKps+WM
 kkdEi3S/U6JljxpWRQYnjEtrGx/kSAoDVyC0LndzaTz5Ks8710mQaEvEfk5mWBGw3DYK
 UcZQ==
X-Gm-Message-State: AOJu0YypKdaO5HOxPvep/WnYD12eWrak6ozwD0sclMpW7aI6sOQEHwoa
 uOK2PCvvBZePEdEZLnbZSWVncKKU/ZCH5Rl5FrPSPXWlHCcgY5Dj67wAxg==
X-Gm-Gg: ASbGncsIdXSMzIZFlKXm9p0xxRrm1CPogbw0F0FQ8fpas5+x5IEVyY3HyyxZ9pweb/g
 ALo0XcUEyy/WdxVB4B7tiMSPQYz6x+MtlQ21TnJxRSAwiE85NRm1NItMyu6+rkG0w06abjbYFtC
 TRz8QM3/AdPUHFgtMs0S6daEOWhX+WbH/CYyIpteVrGRRzEEoOZOfICOlqTZP41x9/Pgb40EnSV
 wy/1BdToWMTRN77l26f0dMoYksFfY2MDsDpLZoXBvPGUkz3R3Za7l5250yDbvOYkoQ759cdFwFh
 FblvHqJzImvyw5DbJKr1jy5cLHGYTUI358qC2Cwc1/IvHomozedDRjCh5nNQXxuKD0uf55Ott4f
 dVKSke9h4akI0YJ0a9bYS0wVsTnPnImKYGcElMNt0HSYsDjE40NV3ENBcCA==
X-Google-Smtp-Source: AGHT+IE04t9itRJxEN/vYVfOrm4AaAoiV/qFHzg9kQ8IyewOnDHXi5GswXY6SWxvvDz8Fve7IcOgVA==
X-Received: by 2002:a05:6902:250f:b0:e65:c4d2:dc48 with SMTP id
 3f1490d57ef6-e6690dccf55mr19739492276.2.1742787480562; 
 Sun, 23 Mar 2025 20:38:00 -0700 (PDT)
From: Thomas Skinner <thomas@atskinner.net>
To: pve-devel@lists.proxmox.com
Date: Sun, 23 Mar 2025 22:37:35 -0500
Message-Id: <20250324033737.1347963-4-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 access-control v4 1/1] fix #4234: add library
 functions for openid optional userinfo request
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>
---
 src/PVE/API2/OpenId.pm | 6 +++++-
 src/PVE/Auth/OpenId.pm | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/PVE/API2/OpenId.pm b/src/PVE/API2/OpenId.pm
index 77410e6..f70d242 100644
--- a/src/PVE/API2/OpenId.pm
+++ b/src/PVE/API2/OpenId.pm
@@ -170,7 +170,11 @@ __PACKAGE__->register_method ({
 
 	    my ($config, $openid) = $lookup_openid_auth->($realm, $redirect_url);
 
-	    my $info = $openid->verify_authorization_code($param->{code}, $private_auth_state);
+	    my $info = $openid->verify_authorization_code(
+		$param->{code},
+		$private_auth_state,
+		$config->{'query-userinfo'} // 1,
+	    );
 	    my $subject = $info->{'sub'};
 
 	    my $unique_name;
diff --git a/src/PVE/Auth/OpenId.pm b/src/PVE/Auth/OpenId.pm
index c8e4db9..cf74229 100755
--- a/src/PVE/Auth/OpenId.pm
+++ b/src/PVE/Auth/OpenId.pm
@@ -63,6 +63,12 @@ sub properties {
 	    pattern => '^[^\x00-\x1F\x7F <>#"]*$', # Prohibit characters not allowed in URI RFC 2396.
 	    optional => 1,
 	},
+	"query-userinfo" => {
+	    description => "Enables querying the userinfo endpoint for claims values.",
+	    type => 'boolean',
+	    default => 1,
+	    optional => 1,
+	},
    };
 }
 
@@ -78,6 +84,7 @@ sub options {
 	"acr-values" => { optional => 1 },
 	default => { optional => 1 },
 	comment => { optional => 1 },
+	"query-userinfo" => { optional => 1 },
     };
 }
 
-- 
2.39.5


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel