mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warn when v2 options are used in v1 unixd config (#3228)

Browse source 
Options like map_group would fail silently when version=2 wasn't
set in our unix config. this detects that case and warns that it
is occuring.

To prevent this in the future, we deny unknown keys in v2 so that
if (when?) we add v3, new keys will cause an error.
This commit is contained in:
Firstyear 2024-11-22 12:02:04 +10:00 committed by GitHub
parent 5393891ea8
commit d2f5e13c97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
unix_integration/resolver/src/unix_config.rs
View file

@ -14,8 +14,9 @@ use serde::Deserialize;
use kanidm_unix_common::constants::*; use kanidm_unix_common::constants::*;
// Allowed as the large enum is only short lived at startup to the true config
#[allow(clippy::large_enum_variant)]
// This bit of magic lets us deserialise the old config and the new versions. // This bit of magic lets us deserialise the old config and the new versions.
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(untagged)] #[serde(untagged)]
enum ConfigUntagged { enum ConfigUntagged {
@ -34,6 +35,7 @@ enum ConfigVersion {
} }
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(deny_unknown_fields)]
struct ConfigV2 { struct ConfigV2 {
cache_db_path: Option<String>, cache_db_path: Option<String>,
sock_path: Option<String>, sock_path: Option<String>,
@ -96,6 +98,12 @@ struct ConfigInt {
hsm_pin_path: Option<String>, hsm_pin_path: Option<String>,
hsm_type: Option<String>, hsm_type: Option<String>,
tpm_tcti_name: Option<String>, tpm_tcti_name: Option<String>,
// Detect and warn on values in these places.
#[serde(default)]
cache_db_path: Option<toml::value::Value>,
#[serde(default)]
kanidm: Option<toml::value::Value>,
} }
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
@ -287,6 +295,11 @@ impl UnixdConfig {
} }
fn apply_from_config_legacy(self, config: ConfigInt) -> Result<Self, UnixIntegrationError> { fn apply_from_config_legacy(self, config: ConfigInt) -> Result<Self, UnixIntegrationError> {
if config.kanidm.is_some() || config.cache_db_path.is_some() {
error!("You are using version=\"2\" options in a legacy config. THESE WILL NOT WORK.");
return Err(UnixIntegrationError);
}
let map_group = config let map_group = config
.allow_local_account_override .allow_local_account_override
.iter() .iter()