From: Howard Chung <howardchung@google.com>
To: linux-bluetooth@vger.kernel.org, luiz.von.dentz@intel.com
Cc: chromeos-bluetooth-upstreaming@chromium.org,
"howardchung@google.com" <howardchung@google.com>
Subject: [Bluez PATCH v3] core: Add new policy for Just-Works repairing
Date: Fri, 14 Feb 2020 11:45:20 +0800 [thread overview]
Message-ID: <20200214114350.Bluez.v3.1.I333a90ad3c75882c6f008c94a28ca7d3e8f6c76e@changeid> (raw)
From: "howardchung@google.com" <howardchung@google.com>
When kernel find out that the incoming Just-Works pairing is
initiated by a paired device, it is user space's responsibility to
decide the next action.
This patch includes the following:
- add JustWorksRepairing policy as an option in main.conf
- handle the confirmation request from kernel
---
The Just-Works repairing policy could be one of the following:
- never: default; reject the repairing immediately.
- confirm: prompt a confirmation dialog to user.
- always: always accept the repairing.
Changes in v3:
- move the check from src/agent.c to src/device.c
- fix the enum declaration in src/hcid.h
Changes in v2:
- let RequestAuthorization handle the situation
- remove the changes in client/
src/device.c | 16 ++++++++++++++++
src/hcid.h | 8 ++++++++
src/main.c | 27 +++++++++++++++++++++++++++
src/main.conf | 5 +++++
4 files changed, 56 insertions(+)
diff --git a/src/device.c b/src/device.c
index a4fe10980..a9cda47b3 100644
--- a/src/device.c
+++ b/src/device.c
@@ -6141,6 +6141,22 @@ int device_confirm_passkey(struct btd_device *device, uint8_t type,
struct authentication_req *auth;
int err;
+ /* Just-Works repairing policy */
+ if (confirm_hint && (device_is_paired(device, BDADDR_BREDR) ||
+ device_is_paired(device, BDADDR_LE_PUBLIC))) {
+ if (main_opts.jw_repairing == JW_REPAIRING_NEVER) {
+ btd_adapter_confirm_reply(device->adapter,
+ &device->bdaddr,
+ type, FALSE);
+ return 0;
+ } else if (main_opts.jw_repairing == JW_REPAIRING_ALWAYS) {
+ btd_adapter_confirm_reply(device->adapter,
+ &device->bdaddr,
+ type, TRUE);
+ return 0;
+ }
+ }
+
auth = new_auth(device, type, AUTH_TYPE_CONFIRM, FALSE);
if (!auth)
return -EPERM;
diff --git a/src/hcid.h b/src/hcid.h
index adea85ce2..ca405fde4 100644
--- a/src/hcid.h
+++ b/src/hcid.h
@@ -35,6 +35,12 @@ typedef enum {
BT_GATT_CACHE_NO,
} bt_gatt_cache_t;
+enum jw_repairing_t {
+ JW_REPAIRING_NEVER,
+ JW_REPAIRING_CONFIRM,
+ JW_REPAIRING_ALWAYS,
+};
+
struct main_opts {
char *name;
uint32_t class;
@@ -58,6 +64,8 @@ struct main_opts {
uint16_t gatt_mtu;
uint8_t key_size;
+
+ enum jw_repairing_t jw_repairing;
};
extern struct main_opts main_opts;
diff --git a/src/main.c b/src/main.c
index 1a6ab36a3..fc8c869fc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -93,6 +93,7 @@ static const char *supported_options[] = {
"MultiProfile",
"FastConnectable",
"Privacy",
+ "JustWorksRepairing",
NULL
};
@@ -193,6 +194,20 @@ static bt_gatt_cache_t parse_gatt_cache(const char *cache)
}
}
+static enum jw_repairing_t parse_jw_repairing(const char *jw_repairing)
+{
+ if (!strcmp(jw_repairing, "never")) {
+ return JW_REPAIRING_NEVER;
+ } else if (!strcmp(jw_repairing, "confirm")) {
+ return JW_REPAIRING_CONFIRM;
+ } else if (!strcmp(jw_repairing, "always")) {
+ return JW_REPAIRING_ALWAYS;
+ } else {
+ return JW_REPAIRING_NEVER;
+ }
+}
+
+
static void check_options(GKeyFile *config, const char *group,
const char **options)
{
@@ -331,6 +346,18 @@ static void parse_config(GKeyFile *config)
g_free(str);
}
+ str = g_key_file_get_string(config, "General",
+ "JustWorksRepairing", &err);
+ if (err) {
+ DBG("%s", err->message);
+ g_clear_error(&err);
+ main_opts.jw_repairing = JW_REPAIRING_NEVER;
+ } else {
+ DBG("just_works_repairing=%s", str);
+ main_opts.jw_repairing = parse_jw_repairing(str);
+ g_free(str);
+ }
+
str = g_key_file_get_string(config, "General", "Name", &err);
if (err) {
DBG("%s", err->message);
diff --git a/src/main.conf b/src/main.conf
index 40687a755..bb5ff5b15 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -72,6 +72,11 @@
# Defaults to "off"
# Privacy = off
+# Specify the policy to the JUST-WORKS repairing initiated by peer
+# Possible values: "never", "confirm", "always"
+# Defaults to "never"
+#JustWorksRepairing = never
+
[GATT]
# GATT attribute cache.
# Possible values:
--
2.25.0.265.gbab2e86ba0-goog
next reply other threads:[~2020-02-14 3:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 3:45 Howard Chung [this message]
2020-02-14 7:33 ` [Bluez PATCH v3] core: Add new policy for Just-Works repairing Johan Hedberg
2020-02-14 18:26 ` Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200214114350.Bluez.v3.1.I333a90ad3c75882c6f008c94a28ca7d3e8f6c76e@changeid \
--to=howardchung@google.com \
--cc=chromeos-bluetooth-upstreaming@chromium.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.von.dentz@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).