witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

More tests for lime file transfer + few improvements

Browse source
This commit is contained in:
Sylvain Berfini 2016-11-14 16:49:22 +01:00
parent e51fee9e5b
commit d3333be071
3 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/chat.c
View file

@ -586,7 +586,7 @@ LinphoneReason linphone_core_message_received(LinphoneCore *lc, SalOp *op, const
uint8_t *keyBuffer = (uint8_t *)malloc(keyLength);
/* decode the key into local key buffer */
b64_decode((char *)keyb64, strlen((char *)keyb64), keyBuffer, keyLength);
linphone_content_set_key(msg->file_transfer_information, (char *)keyBuffer, strlen((char *)keyBuffer));
linphone_content_set_key(msg->file_transfer_information, (char *)keyBuffer, keyLength);
/* duplicate key value into the linphone content private structure */
xmlFree(keyb64);
free(keyBuffer);

36
coreapi/chat_file_transfer.c
View file

@ -199,11 +199,11 @@ static void linphone_chat_message_process_response_from_post_file(void *data,
/* create a user body handler to take care of the file and add the content disposition and content-type
* headers */
if (msg->file_transfer_filepath != NULL) {
first_part_bh = (belle_sip_body_handler_t *)belle_sip_file_body_handler_new(msg->file_transfer_filepath, NULL, msg);
first_part_bh = (belle_sip_body_handler_t *)belle_sip_file_body_handler_new(msg->file_transfer_filepath, linphone_chat_message_file_transfer_on_progress, msg);
} else if (linphone_content_get_buffer(msg->file_transfer_information) != NULL) {
first_part_bh = (belle_sip_body_handler_t *)belle_sip_memory_body_handler_new_from_buffer(
linphone_content_get_buffer(msg->file_transfer_information),
linphone_content_get_size(msg->file_transfer_information), NULL, msg);
linphone_content_get_size(msg->file_transfer_information), linphone_chat_message_file_transfer_on_progress, msg);
} else {
first_part_bh = (belle_sip_body_handler_t *)belle_sip_user_body_handler_new(
linphone_content_get_size(msg->file_transfer_information), NULL, NULL,
@ -231,6 +231,7 @@ static void linphone_chat_message_process_response_from_post_file(void *data,
/* if we have an encryption key for the file, we must insert it into the msg and restore the correct
* filename */
const char *content_key = linphone_content_get_key(msg->file_transfer_information);
size_t content_key_size = linphone_content_get_key_size(msg->file_transfer_information);
if (content_key != NULL) {
/* parse the msg body */
xmlDocPtr xmlMessageBody = xmlParseDoc((const xmlChar *)body);
@ -250,11 +251,11 @@ static void linphone_chat_message_process_response_from_post_file(void *data,
->xmlChildrenNode; /* need to parse the children node to update the file-name
one */
/* convert key to base64 */
size_t b64Size = b64_encode(NULL, strlen(content_key), NULL, 0);
size_t b64Size = b64_encode(NULL, content_key_size, NULL, 0);
char *keyb64 = (char *)ms_malloc0(b64Size + 1);
int xmlStringLength;
b64Size = b64_encode(content_key, strlen(content_key), keyb64, b64Size);
b64Size = b64_encode(content_key, content_key_size, keyb64, b64Size);
keyb64[b64Size] = '\0'; /* libxml need a null terminated string */
/* add the node containing the key to the file-info node */
@ -455,24 +456,27 @@ static void linphone_chat_process_response_from_get_file(void *data, const belle
if (msg->file_transfer_filepath == NULL) {
retval = cb_process_downloading_file(lc, msg, NULL, 0, NULL);
} else {
ssize_t file_ret;
bctbx_vfs_t *vfs = bctbx_vfs_get_default();
bctbx_vfs_file_t *decrypted_file;
bctbx_vfs_file_t *encrypted_file = bctbx_file_open(vfs, msg->file_transfer_filepath, "r");
size_t encrypted_file_size = (size_t)bctbx_file_size(encrypted_file);
bctbx_vfs_file_t *file = bctbx_file_open(vfs, msg->file_transfer_filepath, "r+");
size_t encrypted_file_size = (size_t)bctbx_file_size(file);
char *encrypted_content = bctbx_malloc(encrypted_file_size);
char *decrypted_content = bctbx_malloc(encrypted_file_size);
retval = (int)bctbx_file_read(encrypted_file, encrypted_content, encrypted_file_size, 0);
bctbx_file_close(encrypted_file);
if (retval != BCTBX_VFS_ERROR && retval == (int)encrypted_file_size) {
file_ret = (int)bctbx_file_read(file, encrypted_content, encrypted_file_size, 0);
if (file_ret != BCTBX_VFS_ERROR && encrypted_file_size == (size_t)file_ret) {
retval = cb_process_downloading_file(lc, msg, encrypted_content, encrypted_file_size, decrypted_content);
cb_process_downloading_file(lc, msg, NULL, 0, NULL);
decrypted_file = bctbx_file_open(vfs, msg->file_transfer_filepath, "w");
bctbx_file_write(decrypted_file, decrypted_content, encrypted_file_size, 0);
bctbx_file_close(decrypted_file);
file_ret = bctbx_file_write(file, decrypted_content, encrypted_file_size, 0);
if (file_ret == BCTBX_VFS_ERROR) {
ms_error("file %s write failed: expected %lu, got %lu", msg->file_transfer_filepath, encrypted_file_size, file_ret);
retval = 503;
}
} else {
ms_error("file %s read failed: expected %d, got %d", msg->file_transfer_filepath, (int)encrypted_file_size, retval);
retval = 500;
ms_error("file %s read failed: expected %lu, got %lu", msg->file_transfer_filepath, encrypted_file_size, file_ret);
retval = 503;
}
bctbx_file_close(file);
bctbx_free(encrypted_content);
bctbx_free(decrypted_content);
}
@ -493,7 +497,7 @@ static void linphone_chat_process_response_from_get_file(void *data, const belle
if (retval <= 0) {
linphone_chat_message_set_state(msg, LinphoneChatMessageStateFileTransferDone);
} else {
ms_warning("File transfer decrypt failed with code %d", code);
ms_warning("File transfer decrypt failed with code %d and http code %d", (int)retval, code);
linphone_chat_message_set_state(msg, LinphoneChatMessageStateFileTransferError);
}
} else if (code >= 400 && code < 500) {

26
tester/message_tester.c
View file

@ -915,7 +915,7 @@ end:
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) {
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) {
FILE *ZIDCacheMarieFD, *ZIDCachePaulineFD;
LinphoneCoreManager *marie, *pauline;
LinphoneChatMessage *msg;
@ -968,7 +968,7 @@ void lime_transfer_message_base(bool_t encrypt_file,bool_t download_file_from_st
linphone_core_set_file_transfer_server(pauline->lc,"https://www.linphone.org:444/lft.php");
/* create a file transfer msg */
if (use_file_body_handler) {
if (use_file_body_handler_in_upload) {
msg = create_file_transfer_message_from_nowebcam(linphone_core_get_chat_room(pauline->lc, marie->identity));
} else {
msg = create_message_from_nowebcam(linphone_core_get_chat_room(pauline->lc, marie->identity));
@ -998,7 +998,7 @@ void lime_transfer_message_base(bool_t encrypt_file,bool_t download_file_from_st
else
BC_ASSERT_PTR_NULL(linphone_content_get_key(content));
if (use_file_body_handler) {
if (use_file_body_handler_in_download) {
linphone_chat_message_set_file_transfer_filepath(recv_msg, receive_filepath);
}
linphone_chat_message_download_file(recv_msg);
@ -1018,23 +1018,31 @@ end:
}
static void lime_transfer_message(void) {
lime_transfer_message_base(TRUE,FALSE,FALSE);
lime_transfer_message_base(TRUE, FALSE, FALSE, FALSE);
}
static void lime_transfer_message_2(void) {
lime_transfer_message_base(TRUE,FALSE,TRUE);
lime_transfer_message_base(TRUE, FALSE, TRUE, FALSE);
}
static void lime_transfer_message_3(void) {
lime_transfer_message_base(TRUE, FALSE, FALSE, TRUE);
}
static void lime_transfer_message_4(void) {
lime_transfer_message_base(TRUE, FALSE, TRUE, TRUE);
}
static void lime_transfer_message_from_history(void) {
lime_transfer_message_base(TRUE,TRUE,FALSE);
lime_transfer_message_base(TRUE, TRUE, FALSE, FALSE);
}
static void lime_transfer_message_without_encryption(void) {
lime_transfer_message_base(FALSE,FALSE,FALSE);
lime_transfer_message_base(FALSE, FALSE, FALSE, FALSE);
}
static void lime_transfer_message_without_encryption_2(void) {
lime_transfer_message_base(FALSE,FALSE,TRUE);
lime_transfer_message_base(FALSE, FALSE, TRUE, FALSE);
}
static void printHex(char *title, uint8_t *data, size_t length) {
@ -1967,6 +1975,8 @@ test_t message_tests[] = {
TEST_NO_TAG("Lime text message to non lime", lime_text_message_to_non_lime),
TEST_NO_TAG("Lime transfer message", lime_transfer_message),
TEST_NO_TAG("Lime transfer message 2", lime_transfer_message_2),
TEST_NO_TAG("Lime transfer message 3", lime_transfer_message_3),
TEST_NO_TAG("Lime transfer message 4", lime_transfer_message_4),
TEST_NO_TAG("Lime transfer message from history", lime_transfer_message_from_history),
TEST_NO_TAG("Lime transfer message without encryption", lime_transfer_message_without_encryption),
TEST_NO_TAG("Lime transfer message without encryption 2", lime_transfer_message_without_encryption_2),