bluetooth: services: lbs: update security configuration

Update security configuration for LBS service.

Signed-off-by: Eivind Jølsgard <[email protected]>

Author: eivindj-nordic

doc/nrf-bm/release_notes/release_notes_changelog.rst

@@ -142,6 +142,7 @@ Bluetooth LE Services
   * :ref:`lib_ble_service_dis` service.
   * :ref:`lib_ble_service_hids` service.
   * :ref:`lib_ble_service_hrs` service.
+  * :ref:`lib_ble_service_lbs` service.
 
 * :ref:`lib_ble_service_nus` service:
 

include/bm/bluetooth/services/ble_lbs.h

@@ -14,6 +14,7 @@
 
 #include <stdint.h>
 #include <ble.h>
+#include <bm/bluetooth/services/common.h>
 #include <bm/softdevice_handler/nrf_sdh_ble.h>
 
 #ifdef __cplusplus
@@ -41,6 +42,19 @@ struct ble_lbs;
 	extern void ble_lbs_on_ble_evt(const ble_evt_t *ble_evt, void *lbs_instance);              \
 	NRF_SDH_BLE_OBSERVER(_name ## _obs, ble_lbs_on_ble_evt, &_name, BLE_LBS_BLE_OBSERVER_PRIO)
 
+/** @brief Default security configuration. */
+#define BLE_LBS_CONFIG_SEC_MODE_DEFAULT                                                            \
+	{                                                                                          \
+		.lbs_button_char = {                                                               \
+			.read = BLE_GAP_CONN_SEC_MODE_OPEN,                                        \
+			.cccd_write = BLE_GAP_CONN_SEC_MODE_OPEN,                                  \
+		},                                                                                 \
+		.lbs_led_char = {                                                                  \
+			.read = BLE_GAP_CONN_SEC_MODE_OPEN,                                        \
+			.write = BLE_GAP_CONN_SEC_MODE_OPEN,                                       \
+		},                                                                                 \
+	}
+
 enum ble_lbs_evt_type {
 	BLE_LBS_EVT_LED_WRITE,
 };
@@ -68,6 +82,22 @@ typedef void (*lbs_evt_handler_t)(struct ble_lbs *lbs, const struct ble_lbs_evt
 struct ble_lbs_config {
 	/** @brief Event handler to be called when the LED Characteristic is written. */
 	lbs_evt_handler_t evt_handler;
+	/** Security configuration. */
+	struct {
+		/** LBS Button characteristic */
+		struct {
+			/** Security requirement for reading LBS button characteristic value. */
+			ble_gap_conn_sec_mode_t read;
+			/** Security requirement for writing LBS button characteristic CCCD. */
+			ble_gap_conn_sec_mode_t cccd_write;
+		} lbs_button_char;
+		struct {
+			/** Security requirement for reading LBS LED characteristic value. */
+			ble_gap_conn_sec_mode_t read;
+			/** Security requirement for wtiring LBS LED characteristic value. */
+			ble_gap_conn_sec_mode_t write;
+		} lbs_led_char;
+	} sec_mode;
 };
 
 /**

samples/bluetooth/ble_lbs/src/main.c

@@ -139,6 +139,7 @@ int main(void)
 	};
 	struct ble_lbs_config lbs_cfg = {
 		.evt_handler = lbs_evt_handler,
+		.sec_mode = BLE_LBS_CONFIG_SEC_MODE_DEFAULT,
 	};
 	struct ble_dis_config dis_config = {
 		.sec_mode = BLE_DIS_CONFIG_SEC_MODE_DEFAULT,

subsys/bluetooth/services/ble_lbs/lbs.c

@@ -92,6 +92,8 @@ uint32_t ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 	};
 	ble_gatts_attr_md_t cccd_md = {
 		.vloc = BLE_GATTS_VLOC_STACK,
+		.read_perm = BLE_GAP_CONN_SEC_MODE_OPEN,
+		.write_perm = cfg->sec_mode.lbs_button_char.cccd_write,
 	};
 	ble_gatts_char_md_t char_md = {
 		.char_props = {
@@ -102,6 +104,7 @@ uint32_t ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 	};
 	ble_gatts_attr_md_t attr_md = {
 		.vloc = BLE_GATTS_VLOC_STACK,
+		.read_perm = cfg->sec_mode.lbs_button_char.read,
 	};
 	ble_gatts_attr_t attr_char_value = {
 		.p_uuid = &char_uuid,
@@ -110,9 +113,6 @@ uint32_t ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 		.init_len = sizeof(uint8_t),
 		.max_len = sizeof(uint8_t),
 	};
-	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.read_perm);
-	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.read_perm);
-	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.write_perm);
 
 	nrf_err = sd_ble_gatts_characteristic_add(lbs->service_handle, &char_md, &attr_char_value,
 						  &lbs->button_char_handles);
@@ -135,6 +135,8 @@ uint32_t ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 	};
 	attr_md = (ble_gatts_attr_md_t){
 		.vloc = BLE_GATTS_VLOC_STACK,
+		.read_perm = cfg->sec_mode.lbs_led_char.read,
+		.write_perm = cfg->sec_mode.lbs_led_char.write,
 	};
 	attr_char_value = (ble_gatts_attr_t){
 		.p_uuid = &char_uuid,
@@ -143,8 +145,6 @@ uint32_t ble_lbs_init(struct ble_lbs *lbs, const struct ble_lbs_config *cfg)
 		.init_len = sizeof(uint8_t),
 		.max_len = sizeof(uint8_t),
 	};
-	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.read_perm);
-	BLE_GAP_CONN_SEC_MODE_SET_OPEN(&attr_md.write_perm);
 
 	nrf_err = sd_ble_gatts_characteristic_add(lbs->service_handle, &char_md, &attr_char_value,
 						  &lbs->led_char_handles);