squash! all: add stable-id specifiers "${HOST}" and "${DEVICE}"th/per-host-stable-id

>>> NEW COMMIT MESSAGE

all: add stable-id specifier "${DEVICE}"

Add new stable-id specifier "${DEVICE}" to explicitly declare that the
connection's identity differs per-device.

Note that for settings like "ipv6.addr-gen-mode=stable" we already hash
the interface's name. So, in combination with addr-gen-mode, using this
specifier has no real use. But for example, we don't do that for
"ipv4.dhcp-client-id=stable".

The point is, in various context we possibly anyway already include a
per-device token into the generation algorithm. But that is not the
case for all of them.

Especially for the DHCPv4 client identifier which is supposed to differ
between interfaces (according to RFC). While we don't do that by default
with "ipv4.dhcp-client-id=stable", it can be now configured by the user.
Note that the fact that the client-id by default is the same accross interfaces,
is not a common problem, because commonly profiles are restricted to one device
via connection.interface-name.

6 files changed, 12 insertions, 63 deletions

diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index cc306be1b1..06f96a4e1f 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -152,7 +152,7 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this slave's master connection (eg, \"bond\"), or NULL if this connection is not a slave.")
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example with ipv6.addr-gen-mode=stable-privacy, also the device's name and a per-host key is included, so that different systems and interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${HOST}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-host, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds the the interface name of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index d6b25a005f..f8f1b017e6 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -1547,15 +1547,15 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
 	 * identifier with ipv4.dhcp-client-id=stable.
 	 *
 	 * Note that depending on the context where it is used, other parameters are
-	 * also seeded into the generation algorithm. For example with
-	 * ipv6.addr-gen-mode=stable-privacy, also the device's name and a per-host
-	 * key is included, so that different systems and interfaces yield different
-	 * addresses.
+	 * also seeded into the generation algorithm. For example, a per-host key
+	 * is commonly also included, so that different systems end up generating
+	 * different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's
+	 * name is included, so that different interfaces yield different addresses.
 	 *
 	 * The '$' character is treated special to perform dynamic substitutions
-	 * at runtime. Currently supported are "${CONNECTION}", "${HOST}", "${DEVICE}",
+	 * at runtime. Currently supported are "${CONNECTION}", "${DEVICE}",
 	 * "${BOOT}", "${RANDOM}".
-	 * These effectively create unique IDs per-connection, per-host, per-device, per-boot,
+	 * These effectively create unique IDs per-connection, per-device, per-boot,
 	 * or every time. Note that "${DEVICE}" corresponds the the interface name of the
 	 * device.
 	 * Any unrecognized patterns following '$' are treated verbatim, however
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 5ad38d45ca..d133452b87 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1177,7 +1177,6 @@ _get_stable_id (NMDevice *self,
 		uuid = nm_connection_get_uuid (connection);
 
 		stable_type = nm_utils_stable_id_parse (stable_id,
-		                                        NULL,
 		                                        nm_device_get_ip_iface (self),
 		                                        NULL,
 		                                        uuid,
@@ -1199,12 +1198,12 @@ _get_stable_id (NMDevice *self,
 			nm_assert (stable_type == NM_UTILS_STABLE_TYPE_RANDOM);
 			priv->current_stable_id = nm_str_realloc (nm_utils_stable_id_random ());
 		}
-
 		_LOGT (LOGD_DEVICE,
-		       "stable-id: type=%d, \"%s\"%s",
+		       "stable-id: type=%d, \"%s\""
+		       "%s%s%s",
 		       (int) priv->current_stable_id_type,
 		       priv->current_stable_id,
-		       stable_type == NM_UTILS_STABLE_TYPE_GENERATED ? " (generated)" : "");
+		       NM_PRINT_FMT_QUOTED (stable_type == NM_UTILS_STABLE_TYPE_GENERATED, " from \"", generated, "\"", ""));
 	}
 
 	*out_stable_type = priv->current_stable_id_type;
@@ -13501,8 +13500,6 @@ nm_device_spawn_iface_helper (NMDevice *self)
 		if (nm_logging_enabled (LOGL_DEBUG, LOGD_DEVICE)) {
 			char *tmp;
 
-			/* Beware, we may print here --stable-id, which may contain ${HOST} specifier,
-			 * which essentially is the SHA1 sum of secret-key. */
 			tmp = g_strjoinv (" ", (char **) argv->pdata);
 			_LOGD (LOGD_DEVICE, "running '%s'", tmp);
 			g_free (tmp);
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 5e381cd314..b1a4cc25a2 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -2896,44 +2896,6 @@ nm_utils_secret_key_get (const guint8 **out_secret_key,
 	return secret_key->is_good;
 }
 
-static gboolean
-_secret_key_get_opaque (guint32 salt /* number in host-order */,
-                        char *out_hashed_key /* at least 41 bytes */)
-{
-	gboolean good_secret_key;
-	const guint8 *secret_key;
-	gsize key_len;
-	GChecksum *sum;
-	guint8 buf[20];
-	gsize buf_size;
-
-	/* returns the SHA1 sum of the secret-key in ASCII. Also, it includes
-	 * a salt, so that one cannot obtain the secret-key from the hashed value. */
-
-	nm_assert (salt != 0);
-	nm_assert (out_hashed_key);
-
-	salt = htons (salt);
-
-	good_secret_key = nm_utils_secret_key_get (&secret_key, &key_len);
-
-	sum = g_checksum_new (G_CHECKSUM_SHA1);
-	g_checksum_update (sum, (const guchar *) &salt, sizeof (salt));
-	g_checksum_update (sum, (const guchar *) secret_key, key_len);
-
-	buf_size = sizeof (buf);
-	g_checksum_get_digest (sum, buf, &buf_size);
-	nm_assert (buf_size == sizeof (buf));
-
-	g_checksum_free (sum);
-
-	/* converting a buffer of 20 bytes to ascii (without delimiter) requires
-	 * at least 41 bytes. @out_hashed_key must be this large.  */
-	_nm_utils_bin2str_full (buf, sizeof (buf), '\0', FALSE, out_hashed_key);
-
-	return good_secret_key;
-}
-
 /*****************************************************************************/
 
 const char *
@@ -3219,7 +3181,6 @@ _stable_id_append (GString *str,
 
 NMUtilsStableType
 nm_utils_stable_id_parse (const char *stable_id,
-                          const char *hostid,
                           const char *deviceid,
                           const char *bootid,
                           const char *uuid,
@@ -3227,7 +3188,6 @@ nm_utils_stable_id_parse (const char *stable_id,
 {
 	gsize i, idx_start;
 	GString *str = NULL;
-	char hostid_buf[41];
 
 	g_return_val_if_fail (out_generated, NM_UTILS_STABLE_TYPE_RANDOM);
 
@@ -3298,14 +3258,7 @@ nm_utils_stable_id_parse (const char *stable_id,
 			_stable_id_append (str, uuid);
 		else if (CHECK_PREFIX ("${BOOT}"))
 			_stable_id_append (str, bootid ?: nm_utils_get_boot_id ());
-		else if (CHECK_PREFIX ("${HOST}")) {
-			if (!hostid) {
-				/* use an arbitrary, but fixed salt. */
-				_secret_key_get_opaque (336556219u, hostid_buf);
-				hostid = hostid_buf;
-			}
-			_stable_id_append (str, hostid);
-		} else if (CHECK_PREFIX ("${DEVICE}"))
+		else if (CHECK_PREFIX ("${DEVICE}"))
 			_stable_id_append (str, deviceid);
 		else if (g_str_has_prefix (&stable_id[i], "${RANDOM}")) {
 			/* RANDOM makes not so much sense for cloned-mac-address
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 01bf9f1ba8..7f406d214c 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -340,7 +340,6 @@ typedef enum {
 } NMUtilsStableType;
 
 NMUtilsStableType nm_utils_stable_id_parse (const char *stable_id,
-                                            const char *hostid,
                                             const char *deviceid,
                                             const char *bootid,
                                             const char *uuid,
diff --git a/src/tests/test-general.c b/src/tests/test-general.c
index b52aea91ae..4db05ac847 100644
--- a/src/tests/test-general.c
+++ b/src/tests/test-general.c
@@ -1621,7 +1621,7 @@ do_test_stable_id_parse (const char *stable_id,
 	else
 		g_assert (stable_id);
 
-	stable_type = nm_utils_stable_id_parse (stable_id, "_HOST", "_DEVICE", "_BOOT", "_CONNECTION", &generated);
+	stable_type = nm_utils_stable_id_parse (stable_id, "_DEVICE", "_BOOT", "_CONNECTION", &generated);
 
 	g_assert_cmpint (expected_stable_type, ==, stable_type);