From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EBDBF7249E for ; Thu, 1 Jul 2021 14:58:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DDAE92555A for ; Thu, 1 Jul 2021 14:58:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 597152554F for ; Thu, 1 Jul 2021 14:58:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2811E40318 for ; Thu, 1 Jul 2021 14:58:42 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 1 Jul 2021 14:58:32 +0200 Message-Id: <20210701125833.2773190-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.309 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 1/2] openid: move helper from config to api2 X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2021 12:58:43 -0000 it's not really needed in the config module, and this makes it easier to disable the proxmox-openid dependency linkage as a stop-gap measure. Signed-off-by: Fabian Grünbichler --- src/api2/access/openid.rs | 17 ++++++++++++++--- src/config/domains.rs | 14 -------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/api2/access/openid.rs b/src/api2/access/openid.rs index ea6133b4..91a26279 100644 --- a/src/api2/access/openid.rs +++ b/src/api2/access/openid.rs @@ -11,7 +11,8 @@ use proxmox::{list_subdirs_api_method}; use proxmox::{identity, sortable}; use proxmox::tools::fs::open_file_locked; -use proxmox_openid::OpenIdAuthenticator; +use proxmox_openid::{OpenIdAuthenticator, OpenIdConfig}; + use crate::server::ticket::ApiTicket; use crate::tools::ticket::Ticket; @@ -22,6 +23,16 @@ use crate::config::cached_user_info::CachedUserInfo; use crate::api2::types::*; use crate::auth_helpers::*; +fn openid_authenticator(realm_config: &OpenIdRealmConfig, redirect_url: &str) -> Result { + let config = OpenIdConfig { + issuer_url: realm_config.issuer_url.clone(), + client_id: realm_config.client_id.clone(), + client_key: realm_config.client_key.clone(), + }; + OpenIdAuthenticator::discover(&config, redirect_url) +} + + #[api( input: { properties: { @@ -77,7 +88,7 @@ pub fn openid_login( let (domains, _digest) = crate::config::domains::config()?; let config: OpenIdRealmConfig = domains.lookup("openid", &realm)?; - let open_id = config.authenticator(&redirect_url)?; + let open_id = openid_authenticator(&config, &redirect_url)?; let info = open_id.verify_authorization_code(&code, &private_auth_state)?; @@ -171,7 +182,7 @@ fn openid_auth_url( let (domains, _digest) = crate::config::domains::config()?; let config: OpenIdRealmConfig = domains.lookup("openid", &realm)?; - let open_id = config.authenticator(&redirect_url)?; + let open_id = openid_authenticator(&config, &redirect_url)?; let url = open_id.authorize_url(PROXMOX_BACKUP_RUN_DIR_M!(), &realm)? .to_string(); diff --git a/src/config/domains.rs b/src/config/domains.rs index d08efc24..775c02f3 100644 --- a/src/config/domains.rs +++ b/src/config/domains.rs @@ -3,8 +3,6 @@ use lazy_static::lazy_static; use std::collections::HashMap; use serde::{Serialize, Deserialize}; -use proxmox_openid::{OpenIdAuthenticator, OpenIdConfig}; - use proxmox::api::{ api, schema::*, @@ -95,18 +93,6 @@ pub struct OpenIdRealmConfig { pub username_claim: Option, } -impl OpenIdRealmConfig { - - pub fn authenticator(&self, redirect_url: &str) -> Result { - let config = OpenIdConfig { - issuer_url: self.issuer_url.clone(), - client_id: self.client_id.clone(), - client_key: self.client_key.clone(), - }; - OpenIdAuthenticator::discover(&config, redirect_url) - } -} - fn init() -> SectionConfig { let obj_schema = match OpenIdRealmConfig::API_SCHEMA { Schema::Object(ref obj_schema) => obj_schema, -- 2.30.2