5b9f7169ed
A user may very well have connections on disk with bogus json.
Such connections may have failed to activate before, but rejecting
them now as invalid means that we stop loading them from disk. That is,
they disappear after upgrade.
Instead of doing that, also accept invalid json (beside "") and
normalize/coerce it to NULL.
https://bugzilla.redhat.com/show_bug.cgi?id=1366300
(cherry picked from commit 476810c290)
237 lines
7.1 KiB
C
237 lines
7.1 KiB
C
/* -*- 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 2013 Jiri Pirko <jiri@resnulli.us>
|
|
*/
|
|
|
|
#include "nm-default.h"
|
|
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "nm-setting-team.h"
|
|
#include "nm-utils.h"
|
|
#include "nm-utils-private.h"
|
|
#include "nm-connection-private.h"
|
|
#include "nm-utils-private.h"
|
|
|
|
/**
|
|
* SECTION:nm-setting-team
|
|
* @short_description: Describes connection properties for teams
|
|
*
|
|
* The #NMSettingTeam object is a #NMSetting subclass that describes properties
|
|
* necessary for team connections.
|
|
**/
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (NMSettingTeam, nm_setting_team, NM_TYPE_SETTING,
|
|
_nm_register_setting (TEAM, 1))
|
|
NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_TEAM)
|
|
|
|
#define NM_SETTING_TEAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_TEAM, NMSettingTeamPrivate))
|
|
|
|
typedef struct {
|
|
char *config;
|
|
} NMSettingTeamPrivate;
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_CONFIG,
|
|
LAST_PROP
|
|
};
|
|
|
|
/**
|
|
* nm_setting_team_new:
|
|
*
|
|
* Creates a new #NMSettingTeam object with default values.
|
|
*
|
|
* Returns: (transfer full): the new empty #NMSettingTeam object
|
|
**/
|
|
NMSetting *
|
|
nm_setting_team_new (void)
|
|
{
|
|
return (NMSetting *) g_object_new (NM_TYPE_SETTING_TEAM, NULL);
|
|
}
|
|
|
|
/**
|
|
* nm_setting_team_get_config:
|
|
* @setting: the #NMSettingTeam
|
|
*
|
|
* Returns: the #NMSettingTeam:config property of the setting
|
|
**/
|
|
const char *
|
|
nm_setting_team_get_config (NMSettingTeam *setting)
|
|
{
|
|
g_return_val_if_fail (NM_IS_SETTING_TEAM (setting), NULL);
|
|
|
|
return NM_SETTING_TEAM_GET_PRIVATE (setting)->config;
|
|
}
|
|
|
|
static gboolean
|
|
verify (NMSetting *setting, NMConnection *connection, GError **error)
|
|
{
|
|
NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (setting);
|
|
|
|
if (!_nm_connection_verify_required_interface_name (connection, error))
|
|
return FALSE;
|
|
|
|
if (priv->config) {
|
|
if (!_nm_utils_check_valid_json (priv->config, error)) {
|
|
g_prefix_error (error,
|
|
"%s.%s: ",
|
|
NM_SETTING_TEAM_SETTING_NAME,
|
|
NM_SETTING_TEAM_CONFIG);
|
|
/* for backward compatibility, we accept invalid json and normalize it */
|
|
if (!priv->config[0]) {
|
|
/* be more forgiving to "" and let it verify() as valid because
|
|
* at least anaconda used to write such configs */
|
|
return NM_SETTING_VERIFY_NORMALIZABLE;
|
|
}
|
|
return NM_SETTING_VERIFY_NORMALIZABLE_ERROR;
|
|
}
|
|
}
|
|
|
|
/* NOTE: normalizable/normalizable-errors must appear at the end with decreasing severity.
|
|
* Take care to properly order statements with priv->config above. */
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
compare_property (NMSetting *setting,
|
|
NMSetting *other,
|
|
const GParamSpec *prop_spec,
|
|
NMSettingCompareFlags flags)
|
|
{
|
|
NMSettingClass *parent_class;
|
|
|
|
/* If we are trying to match a connection in order to assume it (and thus
|
|
* @flags contains INFERRABLE), use the "relaxed" matching for team
|
|
* configuration. Otherwise, for all other purposes (including connection
|
|
* comparison before an update), resort to the default string comparison.
|
|
*/
|
|
if ( NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)
|
|
&& nm_streq0 (prop_spec->name, NM_SETTING_TEAM_CONFIG)) {
|
|
return _nm_utils_team_config_equal (NM_SETTING_TEAM_GET_PRIVATE (setting)->config,
|
|
NM_SETTING_TEAM_GET_PRIVATE (other)->config,
|
|
FALSE);
|
|
}
|
|
|
|
/* Otherwise chain up to parent to handle generic compare */
|
|
parent_class = NM_SETTING_CLASS (nm_setting_team_parent_class);
|
|
return parent_class->compare_property (setting, other, prop_spec, flags);
|
|
}
|
|
|
|
static void
|
|
nm_setting_team_init (NMSettingTeam *setting)
|
|
{
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (object);
|
|
|
|
g_free (priv->config);
|
|
|
|
G_OBJECT_CLASS (nm_setting_team_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
set_property (GObject *object, guint prop_id,
|
|
const GValue *value, GParamSpec *pspec)
|
|
{
|
|
NMSettingTeamPrivate *priv = NM_SETTING_TEAM_GET_PRIVATE (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_CONFIG:
|
|
g_free (priv->config);
|
|
priv->config = g_value_dup_string (value);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
get_property (GObject *object, guint prop_id,
|
|
GValue *value, GParamSpec *pspec)
|
|
{
|
|
NMSettingTeam *setting = NM_SETTING_TEAM (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_CONFIG:
|
|
g_value_set_string (value, nm_setting_team_get_config (setting));
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
nm_setting_team_class_init (NMSettingTeamClass *setting_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
|
|
NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
|
|
|
|
g_type_class_add_private (setting_class, sizeof (NMSettingTeamPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->set_property = set_property;
|
|
object_class->get_property = get_property;
|
|
object_class->finalize = finalize;
|
|
parent_class->compare_property = compare_property;
|
|
parent_class->verify = verify;
|
|
|
|
/* Properties */
|
|
/**
|
|
* NMSettingTeam:config:
|
|
*
|
|
* The JSON configuration for the team network interface. The property
|
|
* should contain raw JSON configuration data suitable for teamd, because
|
|
* the value is passed directly to teamd. If not specified, the default
|
|
* configuration is used. See man teamd.conf for the format details.
|
|
**/
|
|
/* ---ifcfg-rh---
|
|
* property: config
|
|
* variable: TEAM_CONFIG
|
|
* description: Team configuration in JSON. See man teamd.conf for details.
|
|
* ---end---
|
|
*/
|
|
g_object_class_install_property
|
|
(object_class, PROP_CONFIG,
|
|
g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "",
|
|
NULL,
|
|
G_PARAM_READWRITE |
|
|
NM_SETTING_PARAM_INFERRABLE |
|
|
G_PARAM_STATIC_STRINGS));
|
|
|
|
/* ---dbus---
|
|
* property: interface-name
|
|
* format: string
|
|
* description: Deprecated in favor of connection.interface-name, but can
|
|
* be used for backward-compatibility with older daemons, to set the
|
|
* team's interface name.
|
|
* ---end---
|
|
*/
|
|
_nm_setting_class_add_dbus_only_property (parent_class, "interface-name",
|
|
G_VARIANT_TYPE_STRING,
|
|
_nm_setting_get_deprecated_virtual_interface_name,
|
|
NULL);
|
|
}
|