fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-19 05:40:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: add generic code for verifying properties in NMSetting

Browse source 
Current verifications happens by implementing NMSetting's verify().
Add code for a second step of validation, that can operate based on the
known type.

The use case will be to reject empty strings.
This commit is contained in:
Thomas Haller 2024-01-08 11:32:56 +01:00
parent b025bd92d9
commit e6abcb4d67
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 54 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/libnm-core-impl/nm-setting.c
View file

@ -2405,17 +2405,68 @@ nm_setting_verify(NMSetting *setting, NMConnection *connection, GError **error)
return result == NM_SETTING_VERIFY_SUCCESS || result == NM_SETTING_VERIFY_NORMALIZABLE;
}
static gboolean
_verify_properties(NMSetting *setting, GError **error)
{
NMSettingClass *klass = NM_SETTING_GET_CLASS(setting);
const NMSettInfoSetting *sett_info = _nm_setting_class_get_sett_info(klass);
guint16 i;
if (!sett_info)
return TRUE;
for (i = 0; i < sett_info->property_infos_len; i++) {
const NMSettInfoProperty *property_info = &sett_info->property_infos[i];
switch (property_info->property_type->direct_type) {
case NM_VALUE_TYPE_BOOL:
case NM_VALUE_TYPE_BYTES:
case NM_VALUE_TYPE_STRV:
case NM_VALUE_TYPE_ENUM:
case NM_VALUE_TYPE_FLAGS:
case NM_VALUE_TYPE_INT32:
case NM_VALUE_TYPE_INT64:
case NM_VALUE_TYPE_NONE:
case NM_VALUE_TYPE_UINT32:
case NM_VALUE_TYPE_UINT64:
case NM_VALUE_TYPE_STRING:
break;
default:
nm_assert_not_reached();
}
}
return TRUE;
}
NMSettingVerifyResult
_nm_setting_verify(NMSetting *setting, NMConnection *connection, GError **error)
{
NMSettingClass *klass;
NMSettingVerifyResult r;
g_return_val_if_fail(NM_IS_SETTING(setting), NM_SETTING_VERIFY_ERROR);
g_return_val_if_fail(!connection || NM_IS_CONNECTION(connection), NM_SETTING_VERIFY_ERROR);
g_return_val_if_fail(!error || *error == NULL, NM_SETTING_VERIFY_ERROR);
if (NM_SETTING_GET_CLASS(setting)->verify)
return NM_SETTING_GET_CLASS(setting)->verify(setting, connection, error);
klass = NM_SETTING_GET_CLASS(setting);
return NM_SETTING_VERIFY_SUCCESS;
if (!klass->verify)
return NM_SETTING_VERIFY_SUCCESS;
r = klass->verify(setting, connection, error);
if (r != NM_SETTING_VERIFY_ERROR) {
gs_free_error GError *local = NULL;
if (!_verify_properties(setting, &local)) {
g_clear_error(error);
g_propagate_error(error, g_steal_pointer(&local));
r = NM_SETTING_VERIFY_ERROR;
}
}
return r;
}
/**