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 357DA6C35C for ; Fri, 6 Aug 2021 13:58:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 08B63D467 for ; Fri, 6 Aug 2021 13:57:49 +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 664A4D429 for ; Fri, 6 Aug 2021 13:57:47 +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 260E342F10; Fri, 6 Aug 2021 13:57:47 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Fri, 6 Aug 2021 13:57:36 +0200 Message-Id: <20210806115744.1959420-1-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.715 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 v2 1/6] allow to configure used scopes 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 11:58:19 -0000 --- src/lib.rs | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 72bcd31..dcd08dd 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -34,16 +34,19 @@ use openidconnect::{ Scope, }; -#[derive(Debug, Deserialize, Serialize)] +#[derive(Debug, Deserialize, Serialize, Clone)] pub struct OpenIdConfig { pub issuer_url: String, pub client_id: String, #[serde(skip_serializing_if="Option::is_none")] pub client_key: Option, + #[serde(skip_serializing_if="Option::is_none")] + pub scopes: Option>, } pub struct OpenIdAuthenticator { client: CoreClient, + config: OpenIdConfig, } #[derive(Debug, Deserialize, Serialize)] @@ -111,6 +114,7 @@ impl OpenIdAuthenticator { Ok(Self { client, + config: config.clone(), }) } @@ -123,18 +127,25 @@ impl OpenIdAuthenticator { store_auth_state(Path::new(state_dir), realm, &private_auth_state)?; // Generate the authorization URL to which we'll redirect the user. - let (authorize_url, _csrf_state, _nonce) = self.client + let mut request = self.client .authorize_url( CoreAuthenticationFlow::AuthorizationCode, || CsrfToken::new(public_auth_state), || nonce, ) - .set_display(CoreAuthDisplay::Page) - .add_prompt(CoreAuthPrompt::Login) - .add_scope(Scope::new("email".to_string())) - .add_scope(Scope::new("profile".to_string())) - .set_pkce_challenge(private_auth_state.pkce_challenge()) - .url(); + .set_pkce_challenge(private_auth_state.pkce_challenge()); + + request = request.set_display(CoreAuthDisplay::Page); + + request = request.add_prompt(CoreAuthPrompt::Login); + + if let Some(ref scopes) = self.config.scopes { + for scope in scopes.clone() { + request = request.add_scope(Scope::new(scope)); + } + } + + let (authorize_url, _csrf_state, _nonce) = request.url(); Ok(authorize_url.to_string()) } -- 2.30.2