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 1D1776C1D5 for ; Fri, 6 Aug 2021 09:17:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 13292A7D0 for ; Fri, 6 Aug 2021 09:17:14 +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 EE399A7C5 for ; Fri, 6 Aug 2021 09:17:12 +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 C18F942DF4; Fri, 6 Aug 2021 09:17:12 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Fri, 6 Aug 2021 09:17:08 +0200 Message-Id: <20210806071709.1796794-6-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210806071709.1796794-1-dietmar@proxmox.com> References: <20210806071709.1796794-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.735 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 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. [lib.rs] Subject: [pbs-devel] [PATCH proxmox-openid-rs 4/5] allow to configure prompt behaviour 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: Fri, 06 Aug 2021 07:17:14 -0000 And do not set it by default. --- src/lib.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 5d8b758..555e5ad 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -45,7 +45,7 @@ impl AdditionalClaims for GenericClaims {} pub type GenericUserInfoClaims = UserInfoClaims; - #[derive(Debug, Deserialize, Serialize, Clone)] +#[derive(Debug, Deserialize, Serialize, Clone)] pub struct OpenIdConfig { pub issuer_url: String, pub client_id: String, @@ -53,6 +53,8 @@ pub struct OpenIdConfig { pub client_key: Option, #[serde(skip_serializing_if="Option::is_none")] pub scopes: Option>, + #[serde(skip_serializing_if="Option::is_none")] + pub prompt: Option, } pub struct OpenIdAuthenticator { @@ -148,7 +150,24 @@ impl OpenIdAuthenticator { request = request.set_display(CoreAuthDisplay::Page); - request = request.add_prompt(CoreAuthPrompt::Login); + match self.config.prompt.as_deref() { + None => { /* nothing */ }, + Some("none") => { + request = request.add_prompt(CoreAuthPrompt::None); + } + Some("login") => { + request = request.add_prompt(CoreAuthPrompt::Login); + } + Some("consent") => { + request = request.add_prompt(CoreAuthPrompt::Consent); + } + Some("select_account") => { + request = request.add_prompt(CoreAuthPrompt::SelectAccount); + } + Some(extension) => { + request = request.add_prompt(CoreAuthPrompt::Extension(extension.into())); + } + } if let Some(ref scopes) = self.config.scopes { for scope in scopes.clone() { -- 2.30.2