mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to authorize an authenticated connection if required to access attribute

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2014-01-06 18:37:25 +00:00
parent c5081f46d2
commit beedfc0222
3 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ble/att_server.c
View File

@ -218,6 +218,22 @@ static void att_run(void){
uint8_t att_response_buffer[28]; uint8_t att_response_buffer[28];
uint16_t att_response_size = att_handle_request(&att_connection, att_request_buffer, att_request_size, att_response_buffer); uint16_t att_response_size = att_handle_request(&att_connection, att_request_buffer, att_request_size, att_response_buffer);
// intercept "insufficient authorization" for authenticated connections to allow for user authorization
if (att_response_buffer[0] == ATT_ERROR_RESPONSE
&& att_response_buffer[4] == ATT_ERROR_INSUFFICIENT_AUTHORIZATION
&& att_connection.authenticated){
switch (sm_authorization_state(att_client_addr_type, att_client_address)){
case AUTHORIZATION_UNKNOWN:
sm_request_authorization(att_client_addr_type, att_client_address);
return;
case AUTHORIZATION_PENDING:
return;
default:
break;
}
}
att_server_state = ATT_SERVER_IDLE; att_server_state = ATT_SERVER_IDLE;
if (att_response_size == 0) return; if (att_response_size == 0) return;

21
ble/sm.c
View File

@ -204,7 +204,7 @@ static bd_addr_t sm_s_address;
static uint8_t sm_actual_encryption_key_size; static uint8_t sm_actual_encryption_key_size;
static uint8_t sm_connection_encrypted; static uint8_t sm_connection_encrypted;
static uint8_t sm_connection_authenticated; // [0..1] static uint8_t sm_connection_authenticated; // [0..1]
static uint8_t sm_connection_authorized; static uint8_t sm_connection_authorization_state;
// PER INSTANCE DATA // PER INSTANCE DATA
@ -518,7 +518,7 @@ static void sm_notify_client_authorization(uint8_t type, uint8_t addr_type, bd_a
BD_ADDR_COPY(event.address, address); BD_ADDR_COPY(event.address, address);
event.authorization_result = result; event.authorization_result = result;
log_info("sm_notify_client_authorization %02x, addres_type %u, address (), result %u, index %u", event.type, event.addr_type, event.authorization_result); log_info("sm_notify_client_authorization %02x, address_type %u, address (), result %u", event.type, event.addr_type, event.authorization_result);
if (!sm_client_packet_handler) return; if (!sm_client_packet_handler) return;
sm_client_packet_handler(HCI_EVENT_PACKET, 0, (uint8_t*) &event, sizeof(event)); sm_client_packet_handler(HCI_EVENT_PACKET, 0, (uint8_t*) &event, sizeof(event));
@ -1285,7 +1285,7 @@ static void sm_event_packet_handler (void * connection, uint8_t packet_type, uin
// reset security properties // reset security properties
sm_connection_encrypted = 0; sm_connection_encrypted = 0;
sm_connection_authenticated = 0; sm_connection_authenticated = 0;
sm_connection_authorized = 0; sm_connection_authorization_state = AUTHORIZATION_UNKNOWN;
// request security // request security
if (sm_s_request_security){ if (sm_s_request_security){
@ -1692,31 +1692,30 @@ int sm_authenticated(uint8_t addr_type, bd_addr_t address){
return sm_connection_authenticated; return sm_connection_authenticated;
} }
int sm_authorized(uint8_t addr_type, bd_addr_t address){ authorization_state_t sm_authorization_state(uint8_t addr_type, bd_addr_t address){
if (!sm_get_connection(addr_type, address)) return 0; // wrong connection if (!sm_get_connection(addr_type, address)) return 0; // wrong connection
if (!sm_connection_encrypted) return 0; // unencrypted connection cannot be authorized if (!sm_connection_encrypted) return 0; // unencrypted connection cannot be authorized
if (!sm_connection_authenticated) return 0; // unauthenticatd connection cannot be authorized if (!sm_connection_authenticated) return 0; // unauthenticatd connection cannot be authorized
return sm_connection_authorized; return sm_connection_authorization_state;
} }
// request authorization // request authorization
void sm_request_authorization(uint8_t addr_type, bd_addr_t address){ void sm_request_authorization(uint8_t addr_type, bd_addr_t address){
sm_connection_authorization_state = AUTHORIZATION_PENDING;
sm_notify_client(SM_AUTHORIZATION_REQUEST, sm_m_addr_type, sm_m_address, 0, 0); sm_notify_client(SM_AUTHORIZATION_REQUEST, sm_m_addr_type, sm_m_address, 0, 0);
} }
// called by client app on authorization request // called by client app on authorization request
void sm_authorization_decline(uint8_t addr_type, bd_addr_t address){ void sm_authorization_decline(uint8_t addr_type, bd_addr_t address){
if (!sm_get_connection(addr_type, address)) return; // wrong connection if (!sm_get_connection(addr_type, address)) return; // wrong connection
sm_connection_authorized = 0; sm_connection_authorization_state = AUTHORIZATION_DECLINED;
// post event sm_notify_client_authorization(SM_AUTHORIZATION_RESULT, sm_m_addr_type, sm_m_address, 0);
sm_notify_client_authorization(SM_AUTHORIZATION_RESULT, sm_m_addr_type, sm_m_address, sm_connection_authorized);
} }
void sm_authorization_grant(uint8_t addr_type, bd_addr_t address){ void sm_authorization_grant(uint8_t addr_type, bd_addr_t address){
if (!sm_get_connection(addr_type, address)) return; // wrong connection if (!sm_get_connection(addr_type, address)) return; // wrong connection
sm_connection_authorized = 1; sm_connection_authorization_state = AUTHORIZATION_GRANTED;
// post event sm_notify_client_authorization(SM_AUTHORIZATION_RESULT, sm_m_addr_type, sm_m_address, 1);
sm_notify_client_authorization(SM_AUTHORIZATION_RESULT, sm_m_addr_type, sm_m_address, sm_connection_authorized);
} }
// GAP Bonding API // GAP Bonding API

12
ble/sm.h
View File

@ -70,6 +70,14 @@ typedef enum {
IO_CAPABILITY_UNKNOWN = 0xff IO_CAPABILITY_UNKNOWN = 0xff
} io_capability_t; } io_capability_t;
// Authorization state
typedef enum {
AUTHORIZATION_UNKNOWN,
AUTHORIZATION_PENDING,
AUTHORIZATION_DECLINED,
AUTHORIZATION_GRANTED
} authorization_state_t;
// Authentication requirement flags // Authentication requirement flags
#define SM_AUTHREQ_NO_BONDING 0x00 #define SM_AUTHREQ_NO_BONDING 0x00
#define SM_AUTHREQ_BONDING 0x01 #define SM_AUTHREQ_BONDING 0x01
@ -142,8 +150,8 @@ int sm_encryption_key_size(uint8_t addr_type, bd_addr_t address);
// @returns 1 if bonded with OOB/Passkey (AND MITM protection) // @returns 1 if bonded with OOB/Passkey (AND MITM protection)
int sm_authenticated(uint8_t addr_type, bd_addr_t address); int sm_authenticated(uint8_t addr_type, bd_addr_t address);
// @returns 1 if connection was authorized by client app (for this session) // @returns authorization_state for the current session
int sm_authorized(uint8_t addr_type, bd_addr_t address); authorization_state_t sm_authorization_state(uint8_t addr_type, bd_addr_t address);
// request authorization // request authorization
void sm_request_authorization(uint8_t addr_type, bd_addr_t address); void sm_request_authorization(uint8_t addr_type, bd_addr_t address);