tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

openid cleanup: derive and use Updater

This commit is contained in:
Dietmar Maurer 2021-08-11 13:22:45 +02:00
parent 80f950c05d
commit e4a5c072b4
2 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/api2/config/access/openid.rs
View File

@ -6,7 +6,7 @@ use ::serde::{Deserialize, Serialize};
use proxmox::api::{api, Permission, Router, RpcEnvironment};
use crate::config::domains::{self, OpenIdRealmConfig};
use crate::config::domains::{self, OpenIdRealmConfig, OpenIdRealmConfigUpdater};
use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_REALM_ALLOCATE};
use crate::api2::types::*;
@ -164,29 +164,9 @@ pub enum DeletableProperty {
realm: {
schema: REALM_ID_SCHEMA,
},
"issuer-url": {
description: "OpenID Issuer Url",
type: String,
optional: true,
},
"client-id": {
description: "OpenID Client ID",
type: String,
optional: true,
},
"client-key": {
description: "OpenID Client Key",
type: String,
optional: true,
},
autocreate: {
description: "Automatically create users if they do not exist.",
optional: true,
type: bool,
},
comment: {
schema: SINGLE_LINE_COMMENT_SCHEMA,
optional: true,
update: {
type: OpenIdRealmConfigUpdater,
flatten: true,
},
delete: {
description: "List of properties to delete.",
@ -210,11 +190,7 @@ pub enum DeletableProperty {
/// Update an OpenID realm configuration
pub fn update_openid_realm(
realm: String,
issuer_url: Option<String>,
client_id: Option<String>,
client_key: Option<String>,
autocreate: Option<bool>,
comment: Option<String>,
update: OpenIdRealmConfigUpdater,
delete: Option<Vec<DeletableProperty>>,
digest: Option<String>,
_rpcenv: &mut dyn RpcEnvironment,
@ -241,7 +217,7 @@ pub fn update_openid_realm(
}
}
if let Some(comment) = comment {
if let Some(comment) = update.comment {
let comment = comment.trim().to_string();
if comment.is_empty() {
config.comment = None;
@ -250,11 +226,11 @@ pub fn update_openid_realm(
}
}
if let Some(issuer_url) = issuer_url { config.issuer_url = issuer_url; }
if let Some(client_id) = client_id { config.client_id = client_id; }
if let Some(issuer_url) = update.issuer_url { config.issuer_url = issuer_url; }
if let Some(client_id) = update.client_id { config.client_id = client_id; }
if client_key.is_some() { config.client_key = client_key; }
if autocreate.is_some() { config.autocreate = autocreate; }
if update.client_key.is_some() { config.client_key = update.client_key; }
if update.autocreate.is_some() { config.autocreate = update.autocreate; }
domains.set_data(&realm, "openid", &config)?;

20
src/config/domains.rs
View File

@ -42,17 +42,7 @@ pub enum OpenIdUserAttribute {
realm: {
schema: REALM_ID_SCHEMA,
},
"issuer-url": {
description: "OpenID Issuer Url",
type: String,
},
"client-id": {
description: "OpenID Client ID",
type: String,
},
"client-key": {
description: "OpenID Client Key",
type: String,
optional: true,
},
comment: {
@ -60,9 +50,7 @@ pub enum OpenIdUserAttribute {
schema: SINGLE_LINE_COMMENT_SCHEMA,
},
autocreate: {
description: "Automatically create users if they do not exist.",
optional: true,
type: bool,
default: false,
},
"username-claim": {
@ -71,19 +59,25 @@ pub enum OpenIdUserAttribute {
},
},
)]
#[derive(Serialize,Deserialize)]
#[derive(Serialize,Deserialize,Updater)]
#[serde(rename_all="kebab-case")]
/// OpenID configuration properties.
pub struct OpenIdRealmConfig {
#[updater(skip)]
pub realm: String,
/// OpenID Issuer Url
pub issuer_url: String,
/// OpenID Client ID
pub client_id: String,
/// OpenID Client Key
#[serde(skip_serializing_if="Option::is_none")]
pub client_key: Option<String>,
#[serde(skip_serializing_if="Option::is_none")]
pub comment: Option<String>,
/// Automatically create users if they do not exist.
#[serde(skip_serializing_if="Option::is_none")]
pub autocreate: Option<bool>,
#[updater(skip)]
#[serde(skip_serializing_if="Option::is_none")]
pub username_claim: Option<OpenIdUserAttribute>,
}