Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additional safety checks for Secure Session (check if empty clientID) #386

Merged
merged 2 commits into from
Feb 19, 2019
Merged

Additional safety checks for Secure Session (check if empty clientID) #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04afebc
Additional safety checks for Secure Session
ilammy Feb 19, 2019
00da790
Merge branch 'master' into ssesion-empty-args
ilammy Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 53 additions & 5 deletions src/themis/secure_session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,32 @@ themis_status_t secure_session_destroy(secure_session_t *session_ctx)
return res;
}

static themis_status_t secure_session_check_user_callbacks(const secure_session_user_callbacks_t *user_callbacks)
{
if (!user_callbacks)
{
return THEMIS_INVALID_PARAMETER;
}

if (!user_callbacks->get_public_key_for_id)
{
return THEMIS_INVALID_PARAMETER;
}

return THEMIS_SUCCESS;
}

themis_status_t secure_session_init(secure_session_t *session_ctx, const void *id, size_t id_length, const void *sign_key, size_t sign_key_length, const secure_session_user_callbacks_t *user_callbacks)
{
soter_status_t soter_status;
themis_status_t res = THEMIS_SUCCESS;

/* TODO: validate input parameters including callback pointers */
res = secure_session_check_user_callbacks(user_callbacks);
if (THEMIS_SUCCESS != res)
{
goto err;
}

res = secure_session_peer_init(&(session_ctx->we), id, id_length, NULL, 0, sign_key, sign_key_length);
if (THEMIS_SUCCESS != res)
{
Expand Down Expand Up @@ -225,7 +245,13 @@ themis_status_t secure_session_connect(secure_session_t *session_ctx)

if (THEMIS_SUCCESS == res)
{
ssize_t bytes_sent = session_ctx->user_callbacks->send_data(request, request_length, session_ctx->user_callbacks->user_data);
ssize_t bytes_sent = -1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-1 means nothing?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It means 'an error occurred'. send_data callback is expected to return a non-negative number of bytes that were transferred. It should be exactly the same as size_t request_length, anything else is considered an error. A negative value is guaranteed to be not equal to any non-negative number of bytes.


if (session_ctx->user_callbacks->send_data)
{
bytes_sent = session_ctx->user_callbacks->send_data(request, request_length, session_ctx->user_callbacks->user_data);
}

if (bytes_sent != (ssize_t)request_length)
{
res = THEMIS_SSESSION_TRANSPORT_ERROR;
Expand Down Expand Up @@ -924,7 +950,15 @@ ssize_t secure_session_send(secure_session_t *session_ctx, const void *message,
goto err;
}

bytes_sent = session_ctx->user_callbacks->send_data(out, out_size, session_ctx->user_callbacks->user_data);
if (session_ctx->user_callbacks->send_data)
{
bytes_sent = session_ctx->user_callbacks->send_data(out, out_size, session_ctx->user_callbacks->user_data);
}
else
{
bytes_sent = -1;
}

if (bytes_sent < 0 || (size_t)bytes_sent != out_size)
{
message_length = (ssize_t)THEMIS_SSESSION_TRANSPORT_ERROR;
Expand Down Expand Up @@ -983,7 +1017,15 @@ ssize_t secure_session_receive(secure_session_t *session_ctx, void *message, siz
}
}
}
res = session_ctx->user_callbacks->receive_data(in, in_size, session_ctx->user_callbacks->user_data);

if (session_ctx->user_callbacks->receive_data)
{
res = session_ctx->user_callbacks->receive_data(in, in_size, session_ctx->user_callbacks->user_data);
}
else
{
res = -1;
}

if (res < 0)
{
Expand All @@ -1003,7 +1045,13 @@ ssize_t secure_session_receive(secure_session_t *session_ctx, void *message, siz
res = session_ctx->state_handler(session_ctx, stack_buf, bytes_received, ka_buf, &ka_buf_length);
if ((THEMIS_SUCCESS == res) && (ka_buf_length > 0))
{
ssize_t bytes_sent = session_ctx->user_callbacks->send_data(ka_buf, ka_buf_length, session_ctx->user_callbacks->user_data);
ssize_t bytes_sent = -1;

if (session_ctx->user_callbacks->send_data)
{
bytes_sent = session_ctx->user_callbacks->send_data(ka_buf, ka_buf_length, session_ctx->user_callbacks->user_data);
}

if (bytes_sent != (ssize_t)ka_buf_length)
{
res = THEMIS_SSESSION_TRANSPORT_ERROR;
Expand Down
5 changes: 5 additions & 0 deletions src/themis/secure_session_peer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ themis_status_t secure_session_peer_init(secure_session_peer_t *peer, const void
{
size_t total_len = id_len + sign_key_len;

if (!id || !id_len || !sign_key || !sign_key_len)
{
return THEMIS_INVALID_PARAMETER;
}

if (ecdh_key)
{
total_len += ecdh_key_len;
Expand Down