diff options
| author | Grzegorz Kolodziejczyk <grzegorz.kolodziejczyk@codecoup.pl> | 2018-05-29 10:32:17 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2018-05-29 14:06:34 +0300 |
| commit | 1e32752f38447d301d9cfe877c784c14f0364c6f (patch) | |
| tree | ab4a781e425987de84b0e60ebae2773ff8ef7255 /client/gatt.c | |
| parent | 9fd0a5485f4212b5eceb14e7edad67efdea5b33e (diff) | |
| download | bluez-1e32752f38447d301d9cfe877c784c14f0364c6f.tar.gz | |
client: Don't require authorization for trusted devices
This patch adds possibility to ommit authorization request from trusted
devices.
Diffstat (limited to 'client/gatt.c')
| -rw-r--r-- | client/gatt.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/client/gatt.c b/client/gatt.c index 3e70f365c..c7dfe42d7 100644 --- a/client/gatt.c +++ b/client/gatt.c @@ -1720,6 +1720,20 @@ error: g_free(aad); } +static bool is_device_trusted(const char *path) +{ + GDBusProxy *proxy; + DBusMessageIter iter; + bool trusted; + + proxy = bt_shell_get_env(path); + + if (g_dbus_proxy_get_property(proxy, "Trusted", &iter)) + dbus_message_iter_get_basic(&iter, &trusted); + + return trusted; +} + static DBusMessage *chrc_read_value(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -1739,7 +1753,7 @@ static DBusMessage *chrc_read_value(DBusConnection *conn, DBusMessage *msg, bt_shell_printf("ReadValue: %s offset %u link %s\n", path_to_address(device), offset, link); - if (chrc->authorization_req) { + if (!is_device_trusted(device) && chrc->authorization_req) { struct authorize_attribute_data *aad; aad = g_new0(struct authorize_attribute_data, 1); @@ -1865,6 +1879,7 @@ static DBusMessage *chrc_write_value(DBusConnection *conn, DBusMessage *msg, struct chrc *chrc = user_data; uint16_t offset = 0; bool prep_authorize = false; + char *device = NULL; DBusMessageIter iter; int value_len; uint8_t *value; @@ -1877,11 +1892,11 @@ static DBusMessage *chrc_write_value(DBusConnection *conn, DBusMessage *msg, "org.bluez.Error.InvalidArguments", NULL); dbus_message_iter_next(&iter); - if (parse_options(&iter, &offset, NULL, NULL, NULL, &prep_authorize)) + if (parse_options(&iter, &offset, NULL, &device, NULL, &prep_authorize)) return g_dbus_create_error(msg, "org.bluez.Error.InvalidArguments", NULL); - if (chrc->authorization_req) { + if (!is_device_trusted(device) && chrc->authorization_req) { struct authorize_attribute_data *aad; aad = g_new0(struct authorize_attribute_data, 1); |