* [PATCH BlueZ v2 1/3] mesh: Add local/remote bools to DevKey transactions
2019-09-25 16:33 [PATCH BlueZ v2 0/3] mesh: Fix Remote/Local dev key usage Brian Gix
@ 2019-09-25 16:33 ` Brian Gix
2019-09-25 16:33 ` [PATCH BlueZ v2 2/3] mesh: Use explicit Local vs Remote Device key usage Brian Gix
2019-09-25 16:33 ` [PATCH BlueZ v2 3/3] mesh: Fix Key Ring permissions for local nodes Brian Gix
2 siblings, 0 replies; 4+ messages in thread
From: Brian Gix @ 2019-09-25 16:33 UTC (permalink / raw)
To: linux-bluetooth; +Cc: brian.gix, inga.stotland, michal.lowas-rzechonek
DevKey operations require authorization on the part of the applications
making the requests. Messages to state changing Servers should use keys
from the local Key Database to demonstrate authority.
---
doc/mesh-api.txt | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/doc/mesh-api.txt b/doc/mesh-api.txt
index 9b9f4e3de..ec502dbd7 100644
--- a/doc/mesh-api.txt
+++ b/doc/mesh-api.txt
@@ -245,7 +245,7 @@ Methods:
org.bluez.mesh.Error.InvalidArguments
org.bluez.mesh.Error.NotFound
- void DevKeySend(object element_path, uint16 destination,
+ void DevKeySend(object element_path, uint16 destination, boolean remote,
uint16 net_index, array{byte} data)
This method is used to send a message originated by a local
@@ -259,6 +259,11 @@ Methods:
destination must be a uint16 to a unicast address, or a well
known group address.
+ The remote parameter, if true, looks up the destination address
+ in the key database to encrypt the message. If false the local
+ device key is used. If remote is true, but requested key does
+ not exist, a NotFound error will be returned.
+
The net_index parameter is the subnet index of the network on
which the message is to be sent.
@@ -782,8 +787,8 @@ Methods:
The data parameter is the incoming message.
- void DevKeyMessageReceived(uint16 source, uint16 net_index,
- array{byte} data)
+ void DevKeyMessageReceived(uint16 source, boolean local,
+ uint16 net_index, array{byte} data)
This method is called by meshd daemon when a message arrives
addressed to the application, which was sent with the remote
@@ -792,6 +797,10 @@ Methods:
The source parameter is unicast address of the remote
node-element that sent the message.
+ The local parameter if true indicates that the local device key
+ was used to decrypt the message. False indicates that the remote
+ nodes device key was used.
+
The net_index parameter indicates what subnet the message was
received on, and if a response is required, the same subnet
must be used to send the response.
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH BlueZ v2 2/3] mesh: Use explicit Local vs Remote Device key usage
2019-09-25 16:33 [PATCH BlueZ v2 0/3] mesh: Fix Remote/Local dev key usage Brian Gix
2019-09-25 16:33 ` [PATCH BlueZ v2 1/3] mesh: Add local/remote bools to DevKey transactions Brian Gix
@ 2019-09-25 16:33 ` Brian Gix
2019-09-25 16:33 ` [PATCH BlueZ v2 3/3] mesh: Fix Key Ring permissions for local nodes Brian Gix
2 siblings, 0 replies; 4+ messages in thread
From: Brian Gix @ 2019-09-25 16:33 UTC (permalink / raw)
To: linux-bluetooth; +Cc: brian.gix, inga.stotland, michal.lowas-rzechonek
When sending or receiving Device Key (privileged) mesh messages, the
local vs remote device key must be specified. This allows Apps to
specify Key Ring stored device keys, and sanity checks that the correct
key exists before allowing the transmission. Loopback messages to local
servers *must* use keys from the Key Ring to indicate privilege has been
granted.
---
mesh/model.c | 11 +++++++----
mesh/node.c | 25 +++++++++++++++----------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/mesh/model.c b/mesh/model.c
index a06b684a5..c029a8365 100644
--- a/mesh/model.c
+++ b/mesh/model.c
@@ -735,14 +735,16 @@ static int add_sub(struct mesh_net *net, struct mesh_model *mod,
}
static void send_dev_key_msg_rcvd(struct mesh_node *node, uint8_t ele_idx,
- uint16_t src, uint16_t net_idx,
- uint16_t size, const uint8_t *data)
+ uint16_t src, uint16_t app_idx,
+ uint16_t net_idx, uint16_t size,
+ const uint8_t *data)
{
struct l_dbus *dbus = dbus_get_bus();
struct l_dbus_message *msg;
struct l_dbus_message_builder *builder;
const char *owner;
const char *path;
+ bool local = (app_idx == APP_IDX_DEV_LOCAL);
owner = node_get_owner(node);
path = node_get_element_path(node, ele_idx);
@@ -758,6 +760,7 @@ static void send_dev_key_msg_rcvd(struct mesh_node *node, uint8_t ele_idx,
builder = l_dbus_message_builder_new(msg);
l_dbus_message_builder_append_basic(builder, 'q', &src);
+ l_dbus_message_builder_append_basic(builder, 'b', &local);
l_dbus_message_builder_append_basic(builder, 'q', &net_idx);
dbus_append_byte_array(builder, data, size);
@@ -936,8 +939,8 @@ bool mesh_model_rx(struct mesh_node *node, bool szmict, uint32_t seq0,
else if (decrypt_idx == APP_IDX_DEV_REMOTE ||
(decrypt_idx == APP_IDX_DEV_LOCAL &&
mesh_net_is_local_address(net, src, 1)))
- send_dev_key_msg_rcvd(node, i, src, 0,
- forward.size, forward.data);
+ send_dev_key_msg_rcvd(node, i, src, decrypt_idx,
+ 0, forward.size, forward.data);
}
/*
diff --git a/mesh/node.c b/mesh/node.c
index b6824f505..833377e99 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -1976,7 +1976,8 @@ static struct l_dbus_message *dev_key_send_call(struct l_dbus *dbus,
const char *sender, *ele_path;
struct l_dbus_message_iter iter_data;
struct node_element *ele;
- uint16_t dst, net_idx, src;
+ uint16_t dst, app_idx, net_idx, src;
+ bool remote;
uint8_t *data;
uint32_t len;
@@ -1987,8 +1988,12 @@ static struct l_dbus_message *dev_key_send_call(struct l_dbus *dbus,
if (strcmp(sender, node->owner))
return dbus_error(msg, MESH_ERROR_NOT_AUTHORIZED, NULL);
- if (!l_dbus_message_get_arguments(msg, "oqqay", &ele_path, &dst,
- &net_idx, &iter_data))
+ if (!l_dbus_message_get_arguments(msg, "oqbqay", &ele_path, &dst,
+ &remote, &net_idx, &iter_data))
+ return dbus_error(msg, MESH_ERROR_INVALID_ARGS, NULL);
+
+ /* Loopbacks to local servers must use *remote* addressing */
+ if (!remote && mesh_net_is_local_address(node->net, dst, 1))
return dbus_error(msg, MESH_ERROR_INVALID_ARGS, NULL);
ele = l_queue_find(node->elements, match_element_path, ele_path);
@@ -1999,13 +2004,13 @@ static struct l_dbus_message *dev_key_send_call(struct l_dbus *dbus,
src = node_get_primary(node) + ele->idx;
if (!l_dbus_message_iter_get_fixed_array(&iter_data, &data, &len) ||
- !len || len > MAX_MSG_LEN)
+ !len || len > MAX_MSG_LEN)
return dbus_error(msg, MESH_ERROR_INVALID_ARGS,
"Incorrect data");
- /* TODO: use net_idx */
- if (!mesh_model_send(node, src, dst, APP_IDX_DEV_REMOTE, net_idx,
- DEFAULT_TTL, data, len))
+ app_idx = remote ? APP_IDX_DEV_REMOTE : APP_IDX_DEV_LOCAL;
+ if (!mesh_model_send(node, src, dst, app_idx, net_idx, DEFAULT_TTL,
+ data, len))
return dbus_error(msg, MESH_ERROR_NOT_FOUND, NULL);
return l_dbus_message_new_method_return(msg);
@@ -2226,9 +2231,9 @@ static void setup_node_interface(struct l_dbus_interface *iface)
"element_path", "destination",
"key_index", "data");
l_dbus_interface_method(iface, "DevKeySend", 0, dev_key_send_call,
- "", "oqqay", "element_path",
- "destination", "net_index",
- "data");
+ "", "oqbqay", "element_path",
+ "destination", "remote",
+ "net_index", "data");
l_dbus_interface_method(iface, "Publish", 0, publish_call, "", "oqay",
"element_path", "model_id", "data");
l_dbus_interface_method(iface, "VendorPublish", 0, vendor_publish_call,
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH BlueZ v2 3/3] mesh: Fix Key Ring permissions for local nodes
2019-09-25 16:33 [PATCH BlueZ v2 0/3] mesh: Fix Remote/Local dev key usage Brian Gix
2019-09-25 16:33 ` [PATCH BlueZ v2 1/3] mesh: Add local/remote bools to DevKey transactions Brian Gix
2019-09-25 16:33 ` [PATCH BlueZ v2 2/3] mesh: Use explicit Local vs Remote Device key usage Brian Gix
@ 2019-09-25 16:33 ` Brian Gix
2 siblings, 0 replies; 4+ messages in thread
From: Brian Gix @ 2019-09-25 16:33 UTC (permalink / raw)
To: linux-bluetooth; +Cc: brian.gix, inga.stotland, michal.lowas-rzechonek
We do *not* automatically create populated key rings for imported or
joined nodes, but we also do not *forbid* any node from adding a key
in it's possesion to the local key ring.
---
mesh/manager.c | 4 ----
mesh/node.c | 14 --------------
2 files changed, 18 deletions(-)
diff --git a/mesh/manager.c b/mesh/manager.c
index 501ec10fe..96d9af915 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
@@ -298,10 +298,6 @@ static struct l_dbus_message *import_node_call(struct l_dbus *dbus,
return dbus_error(msg, MESH_ERROR_INVALID_ARGS,
"Bad device key");
- if (mesh_net_is_local_address(net, primary, num_ele))
- return dbus_error(msg, MESH_ERROR_INVALID_ARGS,
- "Cannot overwrite local device key");
-
if (!keyring_put_remote_dev_key(node, primary, num_ele, key))
return dbus_error(msg, MESH_ERROR_FAILED, NULL);
diff --git a/mesh/node.c b/mesh/node.c
index 833377e99..cad1ac8fb 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -1692,23 +1692,9 @@ static void get_managed_objects_cb(struct l_dbus_message *msg, void *user_data)
import->net_idx, import->net_key))
goto fail;
- memcpy(net_key.old_key, import->net_key, 16);
- net_key.net_idx = import->net_idx;
- if (import->flags.kr)
- net_key.phase = KEY_REFRESH_PHASE_TWO;
- else
- net_key.phase = KEY_REFRESH_PHASE_NONE;
-
/* Initialize directory for storing keyring info */
init_storage_dir(node);
- if (!keyring_put_remote_dev_key(node, import->unicast,
- num_ele, import->dev_key))
- goto fail;
-
- if (!keyring_put_net_key(node, import->net_idx, &net_key))
- goto fail;
-
} else {
/* Callback for create node request */
struct keyring_net_key net_key;
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread