* [PATCH BlueZ v3 2/2] mesh: Automate AppKey update on KR phase 2-->3-->0
2019-09-05 22:35 [PATCH BlueZ v3 0/2] mesh: Streamline Key Refresh finalization Brian Gix
2019-09-05 22:35 ` [PATCH BlueZ v3 1/2] doc: Remove uneeded dbus API for App Key Refresh Brian Gix
@ 2019-09-05 22:35 ` Brian Gix
1 sibling, 0 replies; 3+ messages in thread
From: Brian Gix @ 2019-09-05 22:35 UTC (permalink / raw)
To: linux-bluetooth; +Cc: brian.gix, inga.stotland
Designed so that if an unexpcted abort() occurs, the bound NetKey remains
in state 2 or 3. If successful, the NetKey is set to Phase 0, and all
bound AppKeys are in their correct state.
---
mesh/keyring.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
mesh/keyring.h | 1 +
mesh/manager.c | 43 +++++++++++--------------------------
3 files changed, 71 insertions(+), 31 deletions(-)
diff --git a/mesh/keyring.c b/mesh/keyring.c
index 4b3d8b296..3a7f92f9f 100644
--- a/mesh/keyring.c
+++ b/mesh/keyring.c
@@ -23,6 +23,7 @@
#define _GNU_SOURCE
#include <fcntl.h>
+#include <dirent.h>
#include <stdio.h>
#include <unistd.h>
#include <dirent.h>
@@ -105,6 +106,7 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx,
return false;
}
}
+
lseek(fd, 0, SEEK_SET);
} else
fd = open(key_file, O_WRONLY | O_CREAT | O_TRUNC,
@@ -120,6 +122,62 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx,
return result;
}
+static void finalize(const char *fpath, uint16_t net_idx)
+{
+ struct keyring_app_key key;
+ int fd;
+
+ fd = open(fpath, O_RDWR);
+
+ if (fd < 0)
+ return;
+
+ if (read(fd, &key, sizeof(key)) != sizeof(key) ||
+ key.net_idx != net_idx)
+ goto done;
+
+ l_debug("Finalize %s", fpath);
+ memcpy(key.old_key, key.new_key, 16);
+ lseek(fd, 0, SEEK_SET);
+ write(fd, &key, sizeof(key));
+
+done:
+ close(fd);
+}
+
+bool keyring_finalize_app_keys(struct mesh_node *node, uint16_t net_idx)
+{
+ const char *node_path;
+ char key_dir[PATH_MAX];
+ DIR *dir;
+ struct dirent *entry;
+
+ if (!node)
+ return false;
+
+ node_path = node_get_storage_dir(node);
+
+ if (strlen(node_path) + strlen(app_key_dir) + 1 >= PATH_MAX)
+ return false;
+
+ snprintf(key_dir, PATH_MAX, "%s%s", node_path, app_key_dir);
+ dir = opendir(key_dir);
+ if (!dir) {
+ l_error("Failed to App Key storage directory: %s", key_dir);
+ return false;
+ }
+
+ while ((entry = readdir(dir)) != NULL) {
+ /* AppKeys are stored in regular files */
+ if (entry->d_type == DT_REG)
+ finalize(entry->d_name, net_idx);
+ }
+
+ closedir(dir);
+
+ return true;
+}
+
bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast,
uint8_t count, uint8_t dev_key[16])
{
diff --git a/mesh/keyring.h b/mesh/keyring.h
index 167191013..2fab6b0dc 100644
--- a/mesh/keyring.h
+++ b/mesh/keyring.h
@@ -38,6 +38,7 @@ bool keyring_get_net_key(struct mesh_node *node, uint16_t net_idx,
bool keyring_del_net_key(struct mesh_node *node, uint16_t net_idx);
bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx,
uint16_t net_idx, struct keyring_app_key *key);
+bool keyring_finalize_app_keys(struct mesh_node *node, uint16_t net_id);
bool keyring_get_app_key(struct mesh_node *node, uint16_t app_idx,
struct keyring_app_key *key);
bool keyring_del_app_key(struct mesh_node *node, uint16_t app_idx);
diff --git a/mesh/manager.c b/mesh/manager.c
index cf4782c45..90093bc2c 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
@@ -434,6 +434,7 @@ static struct l_dbus_message *store_new_subnet(struct mesh_node *node,
}
memcpy(key.old_key, new_key, 16);
+ memcpy(key.new_key, new_key, 16);
key.net_idx = net_idx;
key.phase = KEY_REFRESH_PHASE_NONE;
@@ -616,34 +617,6 @@ static struct l_dbus_message *update_appkey_call(struct l_dbus *dbus,
return l_dbus_message_new_method_return(msg);
}
-static struct l_dbus_message *complete_update_appkey_call(struct l_dbus *dbus,
- struct l_dbus_message *msg,
- void *user_data)
-{
- struct mesh_node *node = user_data;
- struct keyring_net_key net_key;
- struct keyring_app_key app_key;
- uint16_t app_idx;
-
- if (!l_dbus_message_get_arguments(msg, "q", &app_idx) ||
- app_idx > MAX_KEY_IDX)
- return dbus_error(msg, MESH_ERROR_INVALID_ARGS, NULL);
-
- if (!keyring_get_app_key(node, app_idx, &app_key) ||
- !keyring_get_net_key(node, app_key.net_idx, &net_key))
- return dbus_error(msg, MESH_ERROR_DOES_NOT_EXIST, NULL);
-
- if (net_key.phase != KEY_REFRESH_PHASE_TWO)
- return dbus_error(msg, MESH_ERROR_FAILED, "Invalid phase");
-
- memcpy(app_key.old_key, app_key.new_key, 16);
-
- if (!keyring_put_app_key(node, app_idx, app_key.net_idx, &app_key))
- return dbus_error(msg, MESH_ERROR_FAILED, NULL);
-
- return l_dbus_message_new_method_return(msg);
-}
-
static struct l_dbus_message *delete_appkey_call(struct l_dbus *dbus,
struct l_dbus_message *msg,
void *user_data)
@@ -698,9 +671,20 @@ static struct l_dbus_message *set_key_phase_call(struct l_dbus *dbus,
if (!keyring_get_net_key(node, net_idx, &key))
return dbus_error(msg, MESH_ERROR_DOES_NOT_EXIST, NULL);
+ if (phase == KEY_REFRESH_PHASE_NONE &&
+ key.phase >= KEY_REFRESH_PHASE_TWO)
+ return dbus_error(msg, MESH_ERROR_INVALID_ARGS, NULL);
+
if (phase == KEY_REFRESH_PHASE_THREE &&
key.phase != KEY_REFRESH_PHASE_NONE) {
memcpy(key.old_key, key.new_key, 16);
+ key.phase = KEY_REFRESH_PHASE_THREE;
+ if (!keyring_put_net_key(node, net_idx, &key))
+ return dbus_error(msg, MESH_ERROR_FAILED, NULL);
+
+ if (!keyring_finalize_app_keys(node, net_idx))
+ return dbus_error(msg, MESH_ERROR_FAILED, NULL);
+
key.phase = KEY_REFRESH_PHASE_NONE;
} else
key.phase = phase;
@@ -736,9 +720,6 @@ static void setup_management_interface(struct l_dbus_interface *iface)
"", "qq", "", "net_index", "app_index");
l_dbus_interface_method(iface, "UpdateAppKey", 0, update_appkey_call,
"", "q", "", "app_index");
- l_dbus_interface_method(iface, "CompleteAppKeyUpdate", 0,
- complete_update_appkey_call, "", "q",
- "", "app_index");
l_dbus_interface_method(iface, "DeleteAppKey", 0, delete_appkey_call,
"", "q", "", "app_index");
l_dbus_interface_method(iface, "ImportAppKey", 0, import_appkey_call,
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread