Re: [pmg-devel] [PATCH proxmox-perl-rs v2 2/7] move openid code from pve-rs to common

[Wolfgang Bumiller <w.bumiller@proxmox.com>]

On Tue, May 07, 2024 at 10:47:40AM +0200, Markus Frank wrote:
> Change pve-rs functions to be wrapper functions for common
> and add similar wrapper functions for pmg-rs.
> 
> Signed-off-by: Markus Frank <m.frank@proxmox.com>
> ---
>  common/src/mod.rs        |  1 +
>  common/src/openid/mod.rs | 63 ++++++++++++++++++++++++++++++++++++++++
>  pmg-rs/Cargo.toml        |  1 +
>  pmg-rs/src/lib.rs        |  1 +
>  pmg-rs/src/openid/mod.rs | 47 ++++++++++++++++++++++++++++++
>  pve-rs/src/openid/mod.rs | 32 +++++---------------
>  6 files changed, 121 insertions(+), 24 deletions(-)
>  create mode 100644 common/src/openid/mod.rs
>  create mode 100644 pmg-rs/src/openid/mod.rs
> 
> diff --git a/common/src/mod.rs b/common/src/mod.rs
> index c3574f4..8460439 100644
> --- a/common/src/mod.rs
> +++ b/common/src/mod.rs
> @@ -3,3 +3,4 @@ mod calendar_event;
>  pub mod logger;
>  pub mod notify;
>  mod subscription;
> +pub mod openid;
(...)
> diff --git a/pmg-rs/src/openid/mod.rs b/pmg-rs/src/openid/mod.rs
> new file mode 100644
> index 0000000..c0988d6
> --- /dev/null
> +++ b/pmg-rs/src/openid/mod.rs
> @@ -0,0 +1,47 @@
> +#[perlmod::package(name = "PMG::RS::OpenId", lib = "pmg_rs")]

Do we have any reason to suspect we might need different functions
between pve and pmg here in the future?

I think it should be enough to just have the `Proxmox::RS::OpenId`
package and directly use that from the perl code.

The PVE::RS::* side wrapper should stick around for a while for easier
up/downgrading without dependency issues, but I don't think we need the
PMG::RS::* one?

> +mod export {
> +    use anyhow::Error;
> +
> +    use perlmod::Value;
> +
> +    use proxmox_openid::{OpenIdConfig, PrivateAuthState};
> +
> +    use crate::common::openid::export as common;
> +    use crate::common::openid::export::OpenId as OpenId;
> +
> +    /// Create a new OpenId client instance
> +    #[export(raw_return)]
> +    pub fn discover(
> +        #[raw] class: Value,
> +        config: OpenIdConfig,
> +        redirect_url: &str,
> +    ) -> Result<Value, Error> {
> +        common::discover(class, config, redirect_url)
> +    }
> +
> +    #[export]
> +    pub fn authorize_url(
> +        #[try_from_ref] this: &OpenId,
> +        state_dir: &str,
> +        realm: &str,
> +    ) -> Result<String, Error> {
> +        common::authorize_url(this, state_dir, realm)
> +    }
> +
> +    #[export]
> +    pub fn verify_public_auth_state(
> +        state_dir: &str,
> +        state: &str,
> +    ) -> Result<(String, PrivateAuthState), Error> {
> +        common::verify_public_auth_state(state_dir, state)
> +    }
> +
> +    #[export(raw_return)]
> +    pub fn verify_authorization_code(
> +        #[try_from_ref] this: &OpenId,
> +        code: &str,
> +        private_auth_state: PrivateAuthState,
> +    ) -> Result<Value, Error> {
> +        common::verify_authorization_code(this, code, private_auth_state)
> +    }
> +}


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