2017-03-24 12:41:04 +01:00
|
|
|
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
* Boston, MA 02110-1301 USA.
|
|
|
|
|
*
|
|
|
|
|
* Copyright 2017 Red Hat, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "nm-default.h"
|
|
|
|
|
|
|
|
|
|
#include "nm-setting-user.h"
|
|
|
|
|
|
|
|
|
|
#include "nm-setting.h"
|
|
|
|
|
#include "nm-setting-private.h"
|
|
|
|
|
#include "nm-utils-private.h"
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* SECTION:nm-setting-user
|
|
|
|
|
* @short_description: Describes user properties
|
|
|
|
|
*
|
|
|
|
|
* The #NMSettingUser object is a #NMSetting subclass that allow to attach
|
|
|
|
|
* arbitrary user data to #NMConnection objects.
|
|
|
|
|
**/
|
|
|
|
|
|
2017-05-04 14:44:18 +02:00
|
|
|
#define MAX_NUM_KEYS 256
|
|
|
|
|
|
2017-03-24 12:41:04 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
NM_GOBJECT_PROPERTIES_DEFINE (NMSettingUser,
|
|
|
|
|
PROP_DATA,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
GHashTable *data;
|
2017-05-04 14:44:18 +02:00
|
|
|
GHashTable *data_invalid;
|
2017-03-24 12:41:04 +01:00
|
|
|
const char **keys;
|
|
|
|
|
} NMSettingUserPrivate;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingUser:
|
|
|
|
|
*
|
|
|
|
|
* General User Profile Settings
|
|
|
|
|
*/
|
|
|
|
|
struct _NMSettingUser {
|
|
|
|
|
NMSetting parent;
|
|
|
|
|
NMSettingUserPrivate _priv;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct _NMSettingUserClass {
|
|
|
|
|
NMSettingClass parent;
|
|
|
|
|
};
|
|
|
|
|
|
libnm: use NMMetaSettingInfo for tracking setting priority
Previously, each (non abstract) NMSetting class had to register
its name and priority via _nm_register_setting().
Note, that libnm-core.la already links against "nm-meta-setting.c",
which also redundantly keeps track of the settings name and gtype
as well.
Re-use NMMetaSettingInfo also in libnm-core.la, to track this meta
data.
The goal is to get rid of private data structures that track
meta data about NMSetting classes. In this case, "registered_settings"
hash. Instead, we should have one place where all this meta data
is tracked. This was, it is also accessible as internal API,
which can be useful (for keyfile).
Note that NMSettingClass has some overlap with NMMetaSettingInfo.
One difference is, that NMMetaSettingInfo is const, while NMSettingClass
is only initialized during the class_init() method. Appart from that,
it's mostly a matter of taste, whether we attach meta data to
NMSettingClass, to NMMetaSettingInfo, or to a static-array indexed
by NMMetaSettingType.
Note, that previously, _nm_register_setting() was private API. That
means, no user could subclass a functioning NMSetting instance. The same
is still true: NMMetaSettingInfo is internal API and users cannot access
it to create their own NMSetting subclasses. But that is almost desired.
libnm is not designed, to be extensible via subclassing, nor is it
clear why that would be a useful thing to do. One day, we should remove
the NMSetting and NMSettingClass definitions from public headers. Their
only use is subclassing the types, which however does not work.
While libnm-core was linking already against nm-meta-setting.c,
nm_meta_setting_infos was unreferenced. So, this change increases
the binary size of libnm and NetworkManager (1032 bytes). Note however
that roughly the same information was previously allocated at runtime.
2018-07-27 14:08:14 +02:00
|
|
|
G_DEFINE_TYPE (NMSettingUser, nm_setting_user, NM_TYPE_SETTING)
|
2017-03-24 12:41:04 +01:00
|
|
|
|
|
|
|
|
#define NM_SETTING_USER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMSettingUser, NM_IS_SETTING_USER)
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
_key_char_is_regular (char ch)
|
|
|
|
|
{
|
|
|
|
|
/* allow words of printable characters, plus some
|
|
|
|
|
* special characters, for example to support base64 encoding. */
|
|
|
|
|
return (ch >= 'a' && ch <= 'z')
|
|
|
|
|
|| (ch >= 'A' && ch <= 'Z')
|
|
|
|
|
|| (ch >= '0' && ch <= '9')
|
|
|
|
|
|| NM_IN_SET (ch, '-', '_', '+', '/', '=');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_user_check_key:
|
|
|
|
|
* @key: the key to check
|
|
|
|
|
* @error: a #GError, %NULL to ignore.
|
|
|
|
|
*
|
|
|
|
|
* Checks whether @key is a valid user data key. This means,
|
|
|
|
|
* key is not %NULL, not too large and valid ASCII. Also,
|
|
|
|
|
* only digits and numbers are allowed with a few special
|
|
|
|
|
* characters. The key must contain at least one '.' and
|
|
|
|
|
* look like a fully qualified DNS name.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.8
|
|
|
|
|
*
|
|
|
|
|
* Returns: %TRUE if @key is a valid user data key.
|
|
|
|
|
*/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_setting_user_check_key (const char *key, GError **error)
|
|
|
|
|
{
|
|
|
|
|
gsize len;
|
|
|
|
|
gboolean has_dot;
|
|
|
|
|
char ch;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (!error || !*error, FALSE);
|
|
|
|
|
|
|
|
|
|
if (!key || !key[0]) {
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("missing key"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
len = strlen (key);
|
|
|
|
|
if (len > 255) {
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("key is too long"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
if (!g_utf8_validate (key, len, NULL)) {
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("key must be UTF8"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
has_dot = FALSE;
|
|
|
|
|
while (TRUE) {
|
|
|
|
|
ch = (key++)[0];
|
|
|
|
|
|
|
|
|
|
/* Allow something that looks like a FQN, separating namespaces by a single '.'
|
|
|
|
|
* We want to print the keys nicely in nmcli requiring escaping.
|
|
|
|
|
*
|
|
|
|
|
* If a user really has to encode special values in the name, he may base64 encode it. */
|
|
|
|
|
|
|
|
|
|
if (!_key_char_is_regular (ch))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
while (_key_char_is_regular (key[0]))
|
|
|
|
|
key++;
|
|
|
|
|
|
|
|
|
|
ch = key[0];
|
|
|
|
|
if (ch == '\0') {
|
|
|
|
|
if (!has_dot) {
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("key requires a '.' for a namespace"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ch != '.')
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
has_dot = TRUE;
|
|
|
|
|
ch = (++key)[0];
|
|
|
|
|
if (ch == '.') {
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("key cannot contain \"..\""));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("key contains invalid characters"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_user_check_val:
|
|
|
|
|
* @val: the value to check
|
|
|
|
|
* @error: a #GError, %NULL to ignore.
|
|
|
|
|
*
|
|
|
|
|
* Checks whether @val is a valid user data value. This means,
|
|
|
|
|
* value is not %NULL, not too large and valid UTF-8.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.8
|
|
|
|
|
*
|
|
|
|
|
* Returns: %TRUE if @val is a valid user data value.
|
|
|
|
|
*/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_setting_user_check_val (const char *val, GError **error)
|
|
|
|
|
{
|
|
|
|
|
gsize len;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (!error || !*error, FALSE);
|
|
|
|
|
|
|
|
|
|
if (!val) {
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("value is missing"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
len = strlen (val);
|
|
|
|
|
if (len > 8*1024) {
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("value is too large"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!g_utf8_validate (val, len, NULL)) {
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("value is not valid UTF8"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
static GHashTable *
|
|
|
|
|
_create_data_hash (void)
|
|
|
|
|
{
|
2017-11-15 16:06:43 +01:00
|
|
|
return g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free);
|
2017-03-24 12:41:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_user_get_keys:
|
|
|
|
|
* @setting: the #NMSettingUser
|
|
|
|
|
* @out_len: (out): the length of the returned array
|
|
|
|
|
*
|
|
|
|
|
* Returns: (array length=out_len) (transfer none): a
|
|
|
|
|
* %NULL-terminated array containing each key from the table.
|
|
|
|
|
**/
|
|
|
|
|
const char *const*
|
|
|
|
|
nm_setting_user_get_keys (NMSettingUser *setting, guint *out_len)
|
|
|
|
|
{
|
|
|
|
|
NMSettingUser *self = setting;
|
|
|
|
|
NMSettingUserPrivate *priv;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_USER (self), NULL);
|
|
|
|
|
|
|
|
|
|
priv = NM_SETTING_USER_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
|
|
if (priv->keys) {
|
|
|
|
|
NM_SET_OUT (out_len, g_hash_table_size (priv->data));
|
|
|
|
|
return priv->keys;
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-25 14:16:17 +02:00
|
|
|
priv->keys = nm_utils_strdict_get_keys (priv->data,
|
|
|
|
|
TRUE,
|
|
|
|
|
out_len);
|
2017-03-24 12:41:04 +01:00
|
|
|
|
2018-03-25 14:16:17 +02:00
|
|
|
/* don't return %NULL, but hijack the @keys fields as a pseudo
|
|
|
|
|
* empty strv array. */
|
|
|
|
|
return priv->keys ?: ((const char **) &priv->keys);
|
2017-03-24 12:41:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_user_get_data:
|
|
|
|
|
* @setting: the #NMSettingUser instance
|
|
|
|
|
* @key: the key to lookup
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.8
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer none): the value associated with @key or %NULL if no such
|
|
|
|
|
* value exists.
|
|
|
|
|
*/
|
|
|
|
|
const char *
|
|
|
|
|
nm_setting_user_get_data (NMSettingUser *setting, const char *key)
|
|
|
|
|
{
|
|
|
|
|
NMSettingUser *self = setting;
|
|
|
|
|
NMSettingUserPrivate *priv;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_USER (self), NULL);
|
|
|
|
|
g_return_val_if_fail (key, NULL);
|
|
|
|
|
|
|
|
|
|
priv = NM_SETTING_USER_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
|
|
if (!priv->data)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
return g_hash_table_lookup (priv->data, key);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_user_set_data:
|
|
|
|
|
* @setting: the #NMSettingUser instance
|
|
|
|
|
* @key: the key to set
|
2017-05-04 14:44:18 +02:00
|
|
|
* @val: (allow-none): the value to set or %NULL to clear a key.
|
|
|
|
|
* @error: (allow-none): optional error argument
|
2017-03-24 12:41:04 +01:00
|
|
|
*
|
|
|
|
|
* Since: 1.8
|
|
|
|
|
*
|
|
|
|
|
* Returns: %TRUE if the operation was successful. The operation
|
|
|
|
|
* can fail if @key or @val are not valid strings according
|
|
|
|
|
* to nm_setting_user_check_key() and nm_setting_user_check_val().
|
|
|
|
|
*/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_setting_user_set_data (NMSettingUser *setting,
|
|
|
|
|
const char *key,
|
|
|
|
|
const char *val,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
NMSettingUser *self = setting;
|
|
|
|
|
NMSettingUserPrivate *priv;
|
2017-05-04 14:44:18 +02:00
|
|
|
gboolean changed = FALSE;
|
2017-03-24 12:41:04 +01:00
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING (self), FALSE);
|
|
|
|
|
g_return_val_if_fail (!error || !*error, FALSE);
|
|
|
|
|
|
|
|
|
|
if (!nm_setting_user_check_key (key, error))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
2017-05-04 14:44:18 +02:00
|
|
|
if ( val
|
|
|
|
|
&& !nm_setting_user_check_val (val, error))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
2017-03-24 12:41:04 +01:00
|
|
|
priv = NM_SETTING_USER_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
|
|
if (!val) {
|
|
|
|
|
if ( priv->data
|
|
|
|
|
&& g_hash_table_remove (priv->data, key)) {
|
|
|
|
|
nm_clear_g_free (&priv->keys);
|
2017-05-04 14:44:18 +02:00
|
|
|
changed = TRUE;
|
2017-03-24 12:41:04 +01:00
|
|
|
}
|
2017-05-04 14:44:18 +02:00
|
|
|
goto out;
|
2017-03-24 12:41:04 +01:00
|
|
|
}
|
|
|
|
|
|
2017-05-04 14:44:18 +02:00
|
|
|
if (priv->data) {
|
2017-03-24 12:41:04 +01:00
|
|
|
const char *key2, *val2;
|
|
|
|
|
|
|
|
|
|
if (g_hash_table_lookup_extended (priv->data, key, (gpointer *) &key2, (gpointer *) &val2)) {
|
|
|
|
|
if (nm_streq (val, val2))
|
2017-05-04 14:44:18 +02:00
|
|
|
goto out;
|
|
|
|
|
} else {
|
|
|
|
|
if (g_hash_table_size (priv->data) >= MAX_NUM_KEYS) {
|
|
|
|
|
/* limit the number of valid keys */
|
|
|
|
|
g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("maximum number of user data entries reached"));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-24 12:41:04 +01:00
|
|
|
nm_clear_g_free (&priv->keys);
|
2017-05-04 14:44:18 +02:00
|
|
|
}
|
|
|
|
|
} else
|
|
|
|
|
priv->data = _create_data_hash ();
|
2017-03-24 12:41:04 +01:00
|
|
|
|
|
|
|
|
g_hash_table_insert (priv->data, g_strdup (key), g_strdup (val));
|
2017-05-04 14:44:18 +02:00
|
|
|
changed = TRUE;
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
if (priv->data_invalid) {
|
|
|
|
|
/* setting a value purges all invalid values that were set
|
|
|
|
|
* via GObject property. */
|
|
|
|
|
changed = TRUE;
|
|
|
|
|
g_clear_pointer (&priv->data_invalid, g_hash_table_unref);
|
|
|
|
|
}
|
|
|
|
|
if (changed)
|
|
|
|
|
_notify (self, PROP_DATA);
|
2017-03-24 12:41:04 +01:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|
|
|
|
{
|
2017-05-04 14:44:18 +02:00
|
|
|
NMSettingUser *self = NM_SETTING_USER (setting);
|
|
|
|
|
NMSettingUserPrivate *priv = NM_SETTING_USER_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
|
|
if (priv->data_invalid) {
|
|
|
|
|
const char *key, *val;
|
|
|
|
|
GHashTableIter iter;
|
|
|
|
|
gs_free_error GError *local = NULL;
|
|
|
|
|
|
|
|
|
|
g_hash_table_iter_init (&iter, priv->data_invalid);
|
|
|
|
|
while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) {
|
|
|
|
|
if (!nm_setting_user_check_key (key, &local)) {
|
|
|
|
|
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
|
|
|
|
|
_("invalid key \"%s\": %s"),
|
|
|
|
|
key, local->message);
|
|
|
|
|
} else if (!nm_setting_user_check_val (val, &local)) {
|
|
|
|
|
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
|
|
|
|
|
_("invalid value for \"%s\": %s"),
|
|
|
|
|
key, local->message);
|
|
|
|
|
} else {
|
|
|
|
|
nm_assert_not_reached ();
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_USER_SETTING_NAME, NM_SETTING_USER_DATA);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
nm_assert_not_reached ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( priv->data
|
|
|
|
|
&& g_hash_table_size (priv->data) > MAX_NUM_KEYS) {
|
|
|
|
|
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
|
|
|
|
|
_("maximum number of user data entries reached (%u instead of %u)"),
|
|
|
|
|
g_hash_table_size (priv->data), (unsigned) MAX_NUM_KEYS);
|
|
|
|
|
g_prefix_error (error, "%s.%s: ", NM_SETTING_USER_SETTING_NAME, NM_SETTING_USER_DATA);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
2017-03-24 12:41:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
compare_property (NMSetting *setting,
|
|
|
|
|
NMSetting *other,
|
|
|
|
|
const GParamSpec *prop_spec,
|
|
|
|
|
NMSettingCompareFlags flags)
|
|
|
|
|
{
|
|
|
|
|
NMSettingUserPrivate *priv, *pri2;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_USER (setting), FALSE);
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_USER (other), FALSE);
|
|
|
|
|
|
|
|
|
|
if (!nm_streq0 (prop_spec->name, NM_SETTING_USER_DATA))
|
|
|
|
|
goto call_parent;
|
|
|
|
|
|
|
|
|
|
priv = NM_SETTING_USER_GET_PRIVATE (NM_SETTING_USER (setting));
|
|
|
|
|
pri2 = NM_SETTING_USER_GET_PRIVATE (NM_SETTING_USER (other));
|
|
|
|
|
|
2018-07-26 17:44:36 +02:00
|
|
|
if (!nm_utils_hash_table_equal (priv->data, pri2->data, TRUE, g_str_equal))
|
2017-03-24 12:41:04 +01:00
|
|
|
return FALSE;
|
2017-05-04 14:44:18 +02:00
|
|
|
|
2018-07-26 17:44:36 +02:00
|
|
|
if (!nm_utils_hash_table_equal (priv->data_invalid, pri2->data_invalid, TRUE, g_str_equal))
|
2017-05-04 14:44:18 +02:00
|
|
|
return FALSE;
|
|
|
|
|
|
2017-03-24 12:41:04 +01:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
call_parent:
|
|
|
|
|
return NM_SETTING_CLASS (nm_setting_user_parent_class)->compare_property (setting, other, prop_spec, flags);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
get_property (GObject *object, guint prop_id,
|
|
|
|
|
GValue *value, GParamSpec *pspec)
|
|
|
|
|
{
|
|
|
|
|
NMSettingUser *self = NM_SETTING_USER (object);
|
|
|
|
|
NMSettingUserPrivate *priv = NM_SETTING_USER_GET_PRIVATE (self);
|
|
|
|
|
GHashTableIter iter;
|
|
|
|
|
GHashTable *data;
|
|
|
|
|
const char *key, *val;
|
|
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_DATA:
|
|
|
|
|
data = _create_data_hash ();
|
|
|
|
|
if (priv->data) {
|
|
|
|
|
g_hash_table_iter_init (&iter, priv->data);
|
|
|
|
|
while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val))
|
|
|
|
|
g_hash_table_insert (data, g_strdup (key), g_strdup (val));
|
|
|
|
|
}
|
2017-05-04 14:44:18 +02:00
|
|
|
if (priv->data_invalid) {
|
|
|
|
|
g_hash_table_iter_init (&iter, priv->data_invalid);
|
|
|
|
|
while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val))
|
|
|
|
|
g_hash_table_insert (data, g_strdup (key), g_strdup (val));
|
|
|
|
|
}
|
2017-03-24 12:41:04 +01:00
|
|
|
g_value_take_boxed (value, data);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_property (GObject *object, guint prop_id,
|
|
|
|
|
const GValue *value, GParamSpec *pspec)
|
|
|
|
|
{
|
|
|
|
|
NMSettingUser *self = NM_SETTING_USER (object);
|
|
|
|
|
NMSettingUserPrivate *priv = NM_SETTING_USER_GET_PRIVATE (self);
|
|
|
|
|
GHashTableIter iter;
|
|
|
|
|
GHashTable *data;
|
|
|
|
|
const char *key, *val;
|
|
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_DATA:
|
2017-05-04 14:44:18 +02:00
|
|
|
nm_clear_g_free (&priv->keys);
|
|
|
|
|
|
2017-03-24 12:41:04 +01:00
|
|
|
data = g_value_get_boxed (value);
|
|
|
|
|
if (!data || !g_hash_table_size (data)) {
|
|
|
|
|
g_clear_pointer (&priv->data, g_hash_table_unref);
|
2017-05-04 14:44:18 +02:00
|
|
|
g_clear_pointer (&priv->data_invalid, g_hash_table_unref);
|
2017-03-24 12:41:04 +01:00
|
|
|
return;
|
|
|
|
|
}
|
2017-05-04 14:44:18 +02:00
|
|
|
|
2017-03-24 12:41:04 +01:00
|
|
|
if (priv->data)
|
|
|
|
|
g_hash_table_remove_all (priv->data);
|
|
|
|
|
else
|
|
|
|
|
priv->data = _create_data_hash ();
|
2017-05-04 14:44:18 +02:00
|
|
|
|
|
|
|
|
if (priv->data_invalid)
|
|
|
|
|
g_hash_table_remove_all (priv->data_invalid);
|
|
|
|
|
|
|
|
|
|
g_hash_table_iter_init (&iter, data);
|
|
|
|
|
while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &val)) {
|
|
|
|
|
if ( nm_setting_user_check_key (key, NULL)
|
|
|
|
|
&& nm_setting_user_check_val (val, NULL))
|
|
|
|
|
g_hash_table_insert (priv->data, g_strdup (key), g_strdup (val));
|
|
|
|
|
else {
|
|
|
|
|
if (!priv->data_invalid)
|
|
|
|
|
priv->data_invalid = _create_data_hash ();
|
|
|
|
|
g_hash_table_insert (priv->data_invalid, g_strdup (key), g_strdup (val));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ( priv->data_invalid
|
|
|
|
|
&& !g_hash_table_size (priv->data_invalid))
|
|
|
|
|
g_clear_pointer (&priv->data_invalid, g_hash_table_unref);
|
|
|
|
|
|
2017-03-24 12:41:04 +01:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_setting_user_init (NMSettingUser *self)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_user_new:
|
|
|
|
|
*
|
|
|
|
|
* Creates a new #NMSettingUser object with default values.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the new empty #NMSettingUser object
|
|
|
|
|
**/
|
|
|
|
|
NMSetting *nm_setting_user_new (void)
|
|
|
|
|
{
|
|
|
|
|
return (NMSetting *) g_object_new (NM_TYPE_SETTING_USER, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
finalize (GObject *object)
|
|
|
|
|
{
|
|
|
|
|
NMSettingUser *self = NM_SETTING_USER (object);
|
|
|
|
|
NMSettingUserPrivate *priv = NM_SETTING_USER_GET_PRIVATE (self);
|
|
|
|
|
|
|
|
|
|
g_free (priv->keys);
|
|
|
|
|
if (priv->data)
|
|
|
|
|
g_hash_table_unref (priv->data);
|
2017-05-04 14:44:18 +02:00
|
|
|
if (priv->data_invalid)
|
|
|
|
|
g_hash_table_unref (priv->data_invalid);
|
2017-03-24 12:41:04 +01:00
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (nm_setting_user_parent_class)->finalize (object);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_setting_user_class_init (NMSettingUserClass *klass)
|
|
|
|
|
{
|
|
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
|
NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
|
|
|
|
|
|
|
|
|
|
object_class->set_property = set_property;
|
|
|
|
|
object_class->get_property = get_property;
|
|
|
|
|
object_class->finalize = finalize;
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
|
libnm: use NMMetaSettingInfo for tracking setting priority
Previously, each (non abstract) NMSetting class had to register
its name and priority via _nm_register_setting().
Note, that libnm-core.la already links against "nm-meta-setting.c",
which also redundantly keeps track of the settings name and gtype
as well.
Re-use NMMetaSettingInfo also in libnm-core.la, to track this meta
data.
The goal is to get rid of private data structures that track
meta data about NMSetting classes. In this case, "registered_settings"
hash. Instead, we should have one place where all this meta data
is tracked. This was, it is also accessible as internal API,
which can be useful (for keyfile).
Note that NMSettingClass has some overlap with NMMetaSettingInfo.
One difference is, that NMMetaSettingInfo is const, while NMSettingClass
is only initialized during the class_init() method. Appart from that,
it's mostly a matter of taste, whether we attach meta data to
NMSettingClass, to NMMetaSettingInfo, or to a static-array indexed
by NMMetaSettingType.
Note, that previously, _nm_register_setting() was private API. That
means, no user could subclass a functioning NMSetting instance. The same
is still true: NMMetaSettingInfo is internal API and users cannot access
it to create their own NMSetting subclasses. But that is almost desired.
libnm is not designed, to be extensible via subclassing, nor is it
clear why that would be a useful thing to do. One day, we should remove
the NMSetting and NMSettingClass definitions from public headers. Their
only use is subclassing the types, which however does not work.
While libnm-core was linking already against nm-meta-setting.c,
nm_meta_setting_infos was unreferenced. So, this change increases
the binary size of libnm and NetworkManager (1032 bytes). Note however
that roughly the same information was previously allocated at runtime.
2018-07-27 14:08:14 +02:00
|
|
|
setting_class->setting_info = &nm_meta_setting_infos[NM_META_SETTING_TYPE_USER];
|
2017-03-24 12:41:04 +01:00
|
|
|
setting_class->compare_property = compare_property;
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
setting_class->verify = verify;
|
2017-03-24 12:41:04 +01:00
|
|
|
|
|
|
|
|
/**
|
2018-03-24 15:18:21 +00:00
|
|
|
* NMSettingUser:data: (type GHashTable(utf8,utf8))
|
2017-03-24 12:41:04 +01:00
|
|
|
*
|
|
|
|
|
* A dictionary of key/value pairs with user data. This data is ignored by NetworkManager
|
|
|
|
|
* and can be used at the users discretion. The keys only support a strict ascii format,
|
|
|
|
|
* but the values can be arbitrary UTF8 strings up to a certain length.
|
|
|
|
|
*
|
|
|
|
|
* Since: 1.8
|
|
|
|
|
**/
|
2017-09-05 09:24:29 +02:00
|
|
|
/* ---ifcfg-rh---
|
|
|
|
|
* property: data
|
|
|
|
|
* variable: NM_USER_*
|
|
|
|
|
* description: each key/value pair is stored as a separate variable with
|
|
|
|
|
* name composed by concatenating NM_USER_ with the encoded key. The key is
|
|
|
|
|
* encoded by substituting lowercase letters with uppercase and prepending
|
|
|
|
|
* uppercase letters with an underscore. A dot is encoded as a double
|
|
|
|
|
* underscore. Remaining characters are encoded as underscore followed by a
|
|
|
|
|
* 3 digit octal representation of the character.
|
|
|
|
|
* example: NM_USER_FOO__BAR=something
|
|
|
|
|
* ---end---
|
|
|
|
|
*/
|
2017-03-24 12:41:04 +01:00
|
|
|
obj_properties[PROP_DATA] =
|
|
|
|
|
g_param_spec_boxed (NM_SETTING_USER_DATA, "", "",
|
|
|
|
|
G_TYPE_HASH_TABLE,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
|
|
|
|
|
|
|
|
|
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
|
|
|
|
|
|
|
|
|
|
_nm_setting_class_transform_property (setting_class, NM_SETTING_USER_DATA,
|
|
|
|
|
G_VARIANT_TYPE ("a{ss}"),
|
|
|
|
|
_nm_utils_strdict_to_dbus,
|
|
|
|
|
_nm_utils_strdict_from_dbus);
|
|
|
|
|
}
|