From 0e99983c9b42cf837beebc5f3b95cf0097a31087 Mon Sep 17 00:00:00 2001 From: Inga Stotland Date: Sun, 14 Jul 2019 16:23:19 -0700 Subject: [PATCH] mesh: Create or re-use a node storage directory for keyring This adds APIs to set a directory for storing node's key ring info. The directory is named MESH_STORAGE_DIR/. This directory may contain additional node info plus node configuration, if node configuration storage follows the same layout (as it does when JSON based config file format is used). Change-Id: I7e85b5742dd44e33e7c64e87468ec78b8a7ffd00 Signed-off-by: Anupam Roy --- mesh/keyring.c | 36 ++++++++++++++++++------------------ mesh/node.c | 42 ++++++++++++++++++++++++++++++++---------- mesh/node.h | 3 +-- 3 files changed, 51 insertions(+), 30 deletions(-) diff --git a/mesh/keyring.c b/mesh/keyring.c index e835157..0722f38 100644 --- a/mesh/keyring.c +++ b/mesh/keyring.c @@ -45,7 +45,7 @@ const char *net_key_dir = "/net_keys"; bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx, struct keyring_net_key *key) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; bool result = false; int fd; @@ -53,7 +53,7 @@ bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx, if (!node || !key) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); if (strlen(node_path) + strlen(net_key_dir) + 1 + 3 >= PATH_MAX) return false; @@ -78,7 +78,7 @@ bool keyring_put_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) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; bool result = false; int fd; @@ -86,7 +86,7 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx, if (!node || !key) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); if (strlen(node_path) + strlen(app_key_dir) + 1 + 3 >= PATH_MAX) return false; @@ -125,7 +125,7 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx, bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast, uint8_t count, uint8_t dev_key[16]) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; bool result = true; int fd, i; @@ -133,7 +133,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast, if (!node) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); if (strlen(node_path) + strlen(dev_key_dir) + 1 + 4 >= PATH_MAX) return false; @@ -163,7 +163,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast, bool keyring_get_net_key(struct mesh_node *node, uint16_t net_idx, struct keyring_net_key *key) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; bool result = false; int fd; @@ -171,7 +171,7 @@ bool keyring_get_net_key(struct mesh_node *node, uint16_t net_idx, if (!node || !key) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, net_key_dir, net_idx); @@ -189,7 +189,7 @@ bool keyring_get_net_key(struct mesh_node *node, uint16_t net_idx, bool keyring_get_app_key(struct mesh_node *node, uint16_t app_idx, struct keyring_app_key *key) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; bool result = false; int fd; @@ -197,7 +197,7 @@ bool keyring_get_app_key(struct mesh_node *node, uint16_t app_idx, if (!node || !key) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, app_key_dir, app_idx); @@ -215,7 +215,7 @@ bool keyring_get_app_key(struct mesh_node *node, uint16_t app_idx, bool keyring_get_remote_dev_key(struct mesh_node *node, uint16_t unicast, uint8_t dev_key[16]) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; bool result = false; int fd; @@ -223,7 +223,7 @@ bool keyring_get_remote_dev_key(struct mesh_node *node, uint16_t unicast, if (!node) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); snprintf(key_file, PATH_MAX, "%s%s/%4.4x", node_path, dev_key_dir, unicast); @@ -240,13 +240,13 @@ bool keyring_get_remote_dev_key(struct mesh_node *node, uint16_t unicast, bool keyring_del_net_key(struct mesh_node *node, uint16_t net_idx) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; if (!node) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, net_key_dir, net_idx); l_debug("RM Net Key %s", key_file); @@ -260,13 +260,13 @@ bool keyring_del_net_key(struct mesh_node *node, uint16_t net_idx) bool keyring_del_app_key(struct mesh_node *node, uint16_t app_idx) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; if (!node) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); snprintf(key_file, PATH_MAX, "%s%s/%3.3x", node_path, app_key_dir, app_idx); l_debug("RM App Key %s", key_file); @@ -278,14 +278,14 @@ bool keyring_del_app_key(struct mesh_node *node, uint16_t app_idx) bool keyring_del_remote_dev_key(struct mesh_node *node, uint16_t unicast, uint8_t count) { - char *node_path; + const char *node_path; char key_file[PATH_MAX]; int i; if (!node) return false; - node_path = node_path_get(node); + node_path = node_get_storage_dir(node); for (i = 0; i < count; i++) { snprintf(key_file, PATH_MAX, "%s%s/%4.4x", node_path, dev_key_dir, unicast + i); diff --git a/mesh/node.c b/mesh/node.c index 84111df..53709cb 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -24,7 +24,8 @@ #ifndef TIZEN_FEATURE_BLUEZ_MODIFY #define _GNU_SOURCE #endif - +#include +#include #include #include @@ -85,7 +86,7 @@ struct mesh_node { struct mesh_agent *agent; char *path; struct mesh_config *cfg; - char *node_path; + char *storage_dir; uint32_t disc_watch; time_t upd_sec; uint32_t seq_number; @@ -271,6 +272,7 @@ static void free_node_resources(void *data) mesh_net_free(node->net); l_free(node->comp); + l_free(node->storage_dir); l_free(node); } @@ -1520,6 +1522,29 @@ static bool add_local_node(struct mesh_node *node, uint16_t unicast, bool kr, return true; } +static bool init_storage_dir(struct mesh_node *node) +{ + char uuid[33]; + char dir_name[PATH_MAX]; + + if (node->storage_dir) + return true; + + if (!hex2str(node->uuid, 16, uuid, sizeof(uuid))) + return false; + + snprintf(dir_name, PATH_MAX, "%s/%s", mesh_get_storage_dir(), uuid); + + if (strlen(dir_name) >= PATH_MAX) + return false; + + create_dir(dir_name); + + node->storage_dir = l_strdup(dir_name); + + return true; +} + static void get_managed_objects_cb(struct l_dbus_message *msg, void *user_data) { struct l_dbus_message_iter objects, interfaces; @@ -1675,6 +1700,9 @@ static void get_managed_objects_cb(struct l_dbus_message *msg, void *user_data) net_key.old_key)) goto fail; + /* Initialize directory for storing keyring info */ + init_storage_dir(node); + if (!keyring_put_remote_dev_key(node, DEFAULT_NEW_UNICAST, num_ele, dev_key)) goto fail; @@ -2075,15 +2103,9 @@ struct mesh_config *node_config_get(struct mesh_node *node) return node->cfg; } -void node_path_set(struct mesh_node *node, char *path) -{ - l_free(node->node_path); - node->node_path = l_strdup(path); -} - -char *node_path_get(struct mesh_node *node) +const char *node_get_storage_dir(struct mesh_node *node) { - return node->node_path; + return node->storage_dir; } const char *node_get_app_path(struct mesh_node *node) diff --git a/mesh/node.h b/mesh/node.h index e387b4d..56ca796 100644 --- a/mesh/node.h +++ b/mesh/node.h @@ -100,7 +100,6 @@ uint16_t node_id_get(struct mesh_node *node); bool node_dbus_init(struct l_dbus *bus); void node_cleanup_all(void); struct mesh_config *node_config_get(struct mesh_node *node); -void node_path_set(struct mesh_node *node, char *path); -char *node_path_get(struct mesh_node *node); struct mesh_agent *node_get_agent(struct mesh_node *node); +const char *node_get_storage_dir(struct mesh_node *node); bool node_load_from_storage(const char *storage_dir); -- 2.7.4