mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-29 00:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added test to reproduce LIME issue when sending 2 messages while network not reachable + improved LIME error logs

Browse source
This commit is contained in:
Sylvain Berfini 2017-07-19 11:22:03 +02:00
parent b7658734f0
commit c673c854cb
2 changed files with 59 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
coreapi/lime.c
View file

@ -580,6 +580,7 @@ int lime_decryptMultipartMessage(void *cachedb, uint8_t *message, const char *se
char xpath_str[MAX_XPATH_LENGTH];
limeKey_t associatedKey;
const char *peerZidHex = NULL;
const char *sessionIndexHex = NULL;
xmlparsing_context_t *xml_ctx;
xmlXPathObjectPtr msg_object;
uint8_t *encryptedMessage = NULL;
@ -635,7 +636,6 @@ int lime_decryptMultipartMessage(void *cachedb, uint8_t *message, const char *se
if ((msg_object != NULL) && (msg_object->nodesetval != NULL)) {
for (i = 1; i <= msg_object->nodesetval->nodeNr; i++) {
const char *currentZidHex;
const char *sessionIndexHex;
const char *encryptedMessageb64;
const char *encryptedContentTypeb64;
snprintf(xpath_str, sizeof(xpath_str), "/doc/msg[%i]/pzid", i);
@ -646,7 +646,6 @@ int lime_decryptMultipartMessage(void *cachedb, uint8_t *message, const char *se
sessionIndexHex = linphone_get_xml_text_content(xml_ctx, xpath_str);
if (sessionIndexHex != NULL) {
usedSessionIndex = bctbx_str_to_uint32((const unsigned char *)sessionIndexHex);
linphone_free_xml_text_content(sessionIndexHex);
}
snprintf(xpath_str, sizeof(xpath_str), "/doc/msg[%i]/text", i);
encryptedMessageb64 = linphone_get_xml_text_content(xml_ctx, xpath_str);
@ -674,30 +673,36 @@ int lime_decryptMultipartMessage(void *cachedb, uint8_t *message, const char *se
/* do we have retrieved correctly all the needed data */
if (encryptedMessage == NULL) {
ms_error("[LIME] Encrypted message is null, something went wrong...");
return LIME_UNABLE_TO_DECRYPT_MESSAGE;
retval = LIME_UNABLE_TO_DECRYPT_MESSAGE;
goto error;
}
/* shall we derive our key before going for decryption */
if (usedSessionIndex < associatedKey.sessionIndex) {
/* something wen't wrong with the cache, this shall never happend */
ms_error("[LIME] Session index < associated key's session index, should not happen !");
/* something wen't wrong with the cache, this shall never happen */
uint8_t associatedKeyIndexHex[9];
bctbx_uint32_to_str(associatedKeyIndexHex, associatedKey.sessionIndex);
ms_error("[LIME] Session index [%s] < associated key's session index [%s], should not happen !", sessionIndexHex, associatedKeyIndexHex);
ms_free(encryptedMessage);
return LIME_UNABLE_TO_DECRYPT_MESSAGE;
retval = LIME_UNABLE_TO_DECRYPT_MESSAGE;
goto error;
}
if ((usedSessionIndex - associatedKey.sessionIndex > MAX_DERIVATION_NUMBER) ) {
/* we missed to many messages, ask for a cache reset via a ZRTP call */
ms_error("[LIME] Too many messages missed, cache should be reset by ZRTP call");
ms_error("[LIME] Too many messages missed (%i), cache should be reset by ZRTP call", usedSessionIndex - associatedKey.sessionIndex);
ms_free(encryptedMessage);
return LIME_UNABLE_TO_DECRYPT_MESSAGE;
retval = LIME_UNABLE_TO_DECRYPT_MESSAGE;
goto error;
}
if (associatedKey.sessionIndex != usedSessionIndex) {
ms_warning("Lime: unexpected session index [%i] received from [%s], [%i] messages will be discarded"
, usedSessionIndex
, peerURI
, usedSessionIndex-associatedKey.sessionIndex);
uint8_t associatedKeyIndexHex[9];
bctbx_uint32_to_str(associatedKeyIndexHex, associatedKey.sessionIndex);
ms_warning("LIME] unexpected session index [%s] received from [%s] (expected [%s]), [%i] messages will be discarded",
sessionIndexHex, peerURI, associatedKeyIndexHex, usedSessionIndex-associatedKey.sessionIndex);
}
while (usedSessionIndex>associatedKey.sessionIndex) {
lime_deriveKey(&associatedKey);
}
@ -710,7 +715,8 @@ int lime_decryptMultipartMessage(void *cachedb, uint8_t *message, const char *se
ms_free(*output);
*output = NULL;
ms_error("[LIME] Couldn't decrypt message");
return LIME_UNABLE_TO_DECRYPT_MESSAGE;
retval = LIME_UNABLE_TO_DECRYPT_MESSAGE;
goto error;
}
/* Decrypt the content-type */
@ -722,7 +728,8 @@ int lime_decryptMultipartMessage(void *cachedb, uint8_t *message, const char *se
ms_free(*content_type);
*content_type = NULL;
ms_error("[LIME] Couldn't decrypt content type");
return LIME_UNABLE_TO_DECRYPT_MESSAGE;
retval = LIME_UNABLE_TO_DECRYPT_MESSAGE;
goto error;
}
}
@ -731,6 +738,9 @@ int lime_decryptMultipartMessage(void *cachedb, uint8_t *message, const char *se
lime_setCachedKey(cachedb, &associatedKey, LIME_RECEIVER, validityTimeSpan);
error:
if (sessionIndexHex != NULL) {
linphone_free_xml_text_content(sessionIndexHex);
}
linphone_xmlparsing_context_destroy(xml_ctx);
return retval;
}

35
tester/message_tester.c
View file

@ -1292,6 +1292,40 @@ static void lime_text_message_without_cache(void) {
lime_text_message_to_non_lime(TRUE, FALSE);
}
static void lime_multiple_messages_while_network_unreachable(void) {
LinphoneChatRoom* chat_room;
LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
if (!linphone_core_lime_available(marie->lc)) {
ms_warning("Lime not available, skiping");
goto end;
}
if (enable_lime_for_message_test(marie, pauline) < 0) goto end;
chat_room = linphone_core_get_chat_room(pauline->lc, marie->identity);
linphone_core_set_network_reachable(pauline->lc, FALSE);
linphone_chat_room_send_message(chat_room,"Bla bla 1");
linphone_chat_room_send_message(chat_room,"Bla bla 2");
linphone_core_set_network_reachable(pauline->lc, TRUE);
BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceived,2));
BC_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneMessageReceivedLegacy,2));
BC_ASSERT_PTR_NOT_NULL(marie->stat.last_received_chat_message);
if (marie->stat.last_received_chat_message) {
BC_ASSERT_STRING_EQUAL(linphone_chat_message_get_text(marie->stat.last_received_chat_message), "Bla bla 2");
}
BC_ASSERT_PTR_NOT_NULL(linphone_core_get_chat_room(marie->lc,pauline->identity));
end:
remove("tmpZIDCacheMarie.sqlite");
remove("tmpZIDCachePauline.sqlite");
linphone_core_manager_destroy(marie);
linphone_core_manager_destroy(pauline);
}
void lime_transfer_message_base(bool_t encrypt_file,bool_t download_file_from_stored_msg, bool_t use_file_body_handler_in_upload, bool_t use_file_body_handler_in_download) {
LinphoneCoreManager *marie, *pauline;
LinphoneChatMessage *msg;
@ -2407,6 +2441,7 @@ test_t message_tests[] = {
TEST_ONE_TAG("Lime text message to non lime with preferred policy", lime_text_message_to_non_lime_preferred_policy, "LIME"),
TEST_ONE_TAG("Lime text message to non lime with preferred policy 2", lime_text_message_to_non_lime_preferred_policy_2, "LIME"),
TEST_ONE_TAG("Lime text message without cache", lime_text_message_without_cache, "LIME"),
TEST_ONE_TAG("Lime multiple messages while network wasn't reachable", lime_multiple_messages_while_network_unreachable, "LIME"),
TEST_ONE_TAG("Lime transfer message", lime_transfer_message, "LIME"),
TEST_ONE_TAG("Lime transfer message 2", lime_transfer_message_2, "LIME"),
TEST_ONE_TAG("Lime transfer message 3", lime_transfer_message_3, "LIME"),