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 8C352748DA for ; Tue, 22 Jun 2021 10:56:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 942EA24039 for ; Tue, 22 Jun 2021 10:56:34 +0200 (CEST) Received: from dev7.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0319E23E73 for ; Tue, 22 Jun 2021 10:56:29 +0200 (CEST) Received: by dev7.proxmox.com (Postfix, from userid 0) id 9EC2F80F64; Tue, 22 Jun 2021 10:56:22 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Tue, 22 Jun 2021 10:56:20 +0200 Message-Id: <20210622085620.1551677-13-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210622085620.1551677-1-dietmar@proxmox.com> References: <20210622085620.1551677-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.680 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 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_PASS -0.001 SPF: sender matches 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. [access.rs, domains.rs] Subject: [pbs-devel] [PATH proxmox-backup v1 12/12] implement openid user-attr configuration 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: Tue, 22 Jun 2021 08:56:35 -0000 --- src/api2/access.rs | 25 +++++++++++++++++++------ src/config/domains.rs | 22 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/api2/access.rs b/src/api2/access.rs index 115779f3..6872b0db 100644 --- a/src/api2/access.rs +++ b/src/api2/access.rs @@ -19,7 +19,7 @@ use crate::api2::types::*; use crate::auth_helpers::*; use crate::server::ticket::ApiTicket; use crate::tools::ticket::{self, Empty, Ticket}; -use crate::config::domains::{OPENID_STATE_DIR, OpenIdRealmConfig};) +use crate::config::domains::{OPENID_STATE_DIR, OpenIdUserAttribute, OpenIdRealmConfig}; use crate::config::acl as acl_config; use crate::config::acl::{PRIVILEGES, PRIV_PERMISSIONS_MODIFY, PRIV_SYS_AUDIT}; @@ -294,15 +294,28 @@ 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 info = open_id.verify_authorization_code(&code, &private_auth_state)?; // eprintln!("VERIFIED {} {:?} {:?}", info.subject().as_str(), info.name(), info.email()); - // fixme: allow to use other attributes - let unique_name = info.subject().as_str(); + let unique_name = match config.user_attr { + None | Some(OpenIdUserAttribute::Subject) => info.subject().as_str(), + Some(OpenIdUserAttribute::Username) => { + match info.preferred_username() { + Some(name) => name.as_str(), + None => bail!("missing claim 'preferred_name'"), + } + } + Some(OpenIdUserAttribute::Email) => { + match info.email() { + Some(name) => name.as_str(), + None => bail!("missing claim 'email'"), + } + } + }; let user_id = Userid::try_from(format!("{}@{}", unique_name, realm))?; @@ -338,7 +351,7 @@ pub fn openid_login( crate::server::rest::auth_logger()? .log(format!("successful auth for user '{}'", user_id)); - + Ok(json!({ "username": user_id, "ticket": ticket, @@ -446,7 +459,7 @@ pub fn list_permissions( let auth_id = match auth_id { Some(auth_id) if auth_id == current_auth_id => current_auth_id, Some(auth_id) => { - if user_privs & PRIV_SYS_AUDIT != 0 + if user_privs & PRIV_SYS_AUDIT != 0 || (auth_id.is_token() && !current_auth_id.is_token() && auth_id.user() == current_auth_id.user()) diff --git a/src/config/domains.rs b/src/config/domains.rs index 7db1f0be..a975fed1 100644 --- a/src/config/domains.rs +++ b/src/config/domains.rs @@ -29,6 +29,22 @@ lazy_static! { pub static ref CONFIG: SectionConfig = init(); } +#[api()] +#[derive(Eq, PartialEq, Debug, Serialize, Deserialize)] +#[serde(rename_all = "lowercase")] +/// Use the value of this attribute/claim as unique user name. It is +/// up to the identity provider to guarantee the uniqueness. The +/// OpenID specification only guarantees that Subject ('sub') is unique. Also +/// make sure that the user is not allowed to change that attribute by +/// himself! +pub enum OpenIdUserAttribute { + /// Subject (OpenId 'sub' claim) + Subject, + /// Username (OpenId 'preferred_username' claim) + Username, + /// Email (OpenId 'email' claim) + Email, +} #[api( properties: { @@ -58,6 +74,10 @@ lazy_static! { type: bool, default: false, }, + "user-attr": { + type: OpenIdUserAttribute, + optional: true, + }, }, )] #[derive(Serialize,Deserialize)] @@ -73,6 +93,8 @@ pub struct OpenIdRealmConfig { pub comment: Option, #[serde(skip_serializing_if="Option::is_none")] pub autocreate: Option, + #[serde(skip_serializing_if="Option::is_none")] + pub user_attr: Option, } impl OpenIdRealmConfig { -- 2.30.2