Merge pull request #1593 from UltimateHackingKeyboard/disable_insecure_ble

Don't allow disabling bluetooth security.

Author: kareltucek

device/src/bt_conn.c

@@ -838,7 +838,7 @@ static void scheduleBtFlow(struct bt_conn *conn, bt_flow_t action, connection_id
 static void securityChanged(struct bt_conn *conn, bt_security_t level, enum bt_security_err err) {
     BT_TRACE_AND_ASSERT("bc3");
     // In case of failure, disconnect
-    if (err || (level < BT_SECURITY_L4 && !Cfg.Bt_AllowUnsecuredConnections)) {
+    if (err || level < BT_SECURITY_L4) {
         LOG_WRN("Bt security failed: %s, level %u, err %d, disconnecting", GetPeerStringByConn(conn), level, err);
 
         struct bt_conn_info info;

doc-dev/reference-manual.md

@@ -317,7 +317,6 @@ COMMAND = set emergencyKey KEYID
 COMMAND = validateMacros
 COMMAND = resetConfiguration
 COMMAND = set leds.alwaysOn BOOL
-COMMAND = set bluetooth.allowUnsecuredConnections BOOL
 COMMAND = set bluetooth.peripheralConnectionCount INT
 COMMAND = set bluetooth.minAdvertisingDelay INT
 COMMAND = set bluetooth.directedAdvertisingAllowed BOOL
@@ -365,6 +364,7 @@ COMMAND = setCompensateDiagonalSpeed {0|1}
 COMMAND = setDebounceDelay <time in ms, at most 250 (INT)>
 COMMAND = setKeystrokeDelay <time in ms, at most 65535 (INT)>
 COMMAND = setEmergencyKey KEYID
+COMMAND = set bluetooth.allowUnsecuredConnections BOOL
 ```
 
 ### Uncategorized commands

right/src/config_manager.c

@@ -278,7 +278,6 @@ const config_t DefaultCfg = (config_t){
         .I2cBaudRate = I2C_MAIN_BUS_NORMAL_BAUD_RATE,
 #endif
         .Bt_Enabled = true,
-        .Bt_AllowUnsecuredConnections = false,
         .Bt_MaxPeripheralConnections = 3,
         .Bt_MinAdvertisingDelay = 250,
         .Bt_AlwaysAdvertiseHid = true,

right/src/config_manager.h

@@ -95,7 +95,6 @@
         key_state_t* EmergencyKey;
 
         // bluetooth
-        bool Bt_AllowUnsecuredConnections;
         bool Bt_DirectedAdvertisingAllowed;
         bool Bt_Enabled;
         bool Bt_AlwaysAdvertiseHid;

right/src/macros/set_command.c

@@ -360,16 +360,6 @@ static macro_variable_t secondaryRoles(parser_context_t* ctx, set_command_action
     return noneVar();
 }
 
-static macro_variable_t allowUnsecuredConnections(parser_context_t* ctx, set_command_action_t action)
-{
-    ASSIGN_BOOL(Cfg.Bt_AllowUnsecuredConnections);
-    if (Cfg.Bt_AllowUnsecuredConnections) {
-        Macros_PrintfWithPos(ctx, "Warning: insecure connections were allowed. This may allow eavesdropping on your keyboard input!");
-    }
-
-    return noneVar();
-}
-
 static macro_variable_t bluetooth(parser_context_t* ctx, set_command_action_t action)
 {
     if (ConsumeToken(ctx, "enabled")) {
@@ -378,8 +368,6 @@ static macro_variable_t bluetooth(parser_context_t* ctx, set_command_action_t ac
 #if DEVICE_IS_UHK80_RIGHT
         Bt_SetEnabled(newBtEnabled);
 #endif
-    } else if (ConsumeToken(ctx, "allowUnsecuredConnections")) {
-        return allowUnsecuredConnections(ctx, action);
     } else if (ConsumeToken(ctx, "peripheralConnectionCount")) {
 #ifdef __ZEPHYR__
         DEFINE_INT_LIMITS(1, PERIPHERAL_CONNECTION_COUNT);
@@ -1099,9 +1087,6 @@ static macro_variable_t root(parser_context_t* ctx, set_command_action_t action)
         DEFINE_INT_LIMITS(0, 65535);
         ASSIGN_INT(Cfg.AutoShiftDelay);
     }
-    else if (ConsumeToken(ctx, "allowUnsecuredConnections")) {
-        return allowUnsecuredConnections(ctx, action);
-    }
     else if (ConsumeToken(ctx, "uiStyle")) {
         return uiStyle(ctx, action);
     }