[pve-devel] [PATCH v4 perl-rs] fix #4234: openid: adjust openid verification function for userinfo option

[Mira Limbeck <m.limbeck@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