scottk/nDPId
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId.git synced 2025-11-01 18:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

nDPId: Fixed base64 encoding issue.

Browse Source 
* The issue can result in an error message like:
   `Base64 encoding failed with: Buffer too small.`
   and also in too big JSON strings generated by nDPId
   which nDPIsrvd does not like as it's length is
   greater than `NETWORK_BUFFER_MAX_SIZE`.
 * nDPId will now obey `NETWORK_BUFFER_MAX_SIZE` while
   trying to base64 encode raw packet data.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2022-11-08 09:26:04 +01:00
parent e629dd59cd
commit bc346a28f4
1 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
nDPId.c
View File

@@ -2340,11 +2340,10 @@ static void serialize_and_send(struct nDPId_reader_thread * const reader_thread)
} }
/* Slightly modified code from: https://en.wikibooks.org/wiki/Algorithm_Implementation/Miscellaneous/Base64 */ /* Slightly modified code from: https://en.wikibooks.org/wiki/Algorithm_Implementation/Miscellaneous/Base64 */
static char const * const base64_ret_strings[] = {"Success", "Buffer too small"}; static void base64encode(uint8_t const * const data_buf,
static int base64encode(uint8_t const * const data_buf, size_t dataLength,
size_t dataLength, char * const result,
char * const result, size_t * const resultSize)
size_t * const resultSize)
{ {
const char base64chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; const char base64chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
const uint8_t * data = (const uint8_t *)data_buf; const uint8_t * data = (const uint8_t *)data_buf;
@@ -2354,6 +2353,8 @@ static int base64encode(uint8_t const * const data_buf,
int padCount = dataLength % 3; int padCount = dataLength % 3;
uint8_t n0, n1, n2, n3; uint8_t n0, n1, n2, n3;
*resultSize = 0;
/* increment over the length of the string, three characters at a time */ /* increment over the length of the string, three characters at a time */
for (x = 0; x < dataLength; x += 3) for (x = 0; x < dataLength; x += 3)
{ {
@@ -2382,15 +2383,11 @@ static int base64encode(uint8_t const * const data_buf,
* if we have one byte available, then its encoding is spread * if we have one byte available, then its encoding is spread
* out over two characters * out over two characters
*/ */
if (resultIndex >= *resultSize) if (resultIndex + 1 >= *resultSize - padCount - 1)
{ {
return 1; /* indicate failure: buffer too small */ break;
} }
result[resultIndex++] = base64chars[n0]; result[resultIndex++] = base64chars[n0];
if (resultIndex >= *resultSize)
{
return 1; /* indicate failure: buffer too small */
}
result[resultIndex++] = base64chars[n1]; result[resultIndex++] = base64chars[n1];
/* /*
@@ -2399,9 +2396,9 @@ static int base64encode(uint8_t const * const data_buf,
*/ */
if ((x + 1) < dataLength) if ((x + 1) < dataLength)
{ {
if (resultIndex >= *resultSize) if (resultIndex >= *resultSize - padCount - 1)
{ {
return 1; /* indicate failure: buffer too small */ break;
} }
result[resultIndex++] = base64chars[n2]; result[resultIndex++] = base64chars[n2];
} }
@@ -2412,9 +2409,9 @@ static int base64encode(uint8_t const * const data_buf,
*/ */
if ((x + 2) < dataLength) if ((x + 2) < dataLength)
{ {
if (resultIndex >= *resultSize) if (resultIndex >= *resultSize - padCount - 1)
{ {
return 1; /* indicate failure: buffer too small */ break;
} }
result[resultIndex++] = base64chars[n3]; result[resultIndex++] = base64chars[n3];
} }
@@ -2428,21 +2425,12 @@ static int base64encode(uint8_t const * const data_buf,
{ {
for (; padCount < 3; padCount++) for (; padCount < 3; padCount++)
{ {
if (resultIndex >= *resultSize)
{
return 1; /* indicate failure: buffer too small */
}
result[resultIndex++] = '='; result[resultIndex++] = '=';
} }
} }
if (resultIndex >= *resultSize)
{
return 1; /* indicate failure: buffer too small */
}
result[resultIndex] = 0; result[resultIndex] = '\0';
*resultSize = resultIndex; *resultSize = resultIndex;
return 0; /* indicate success */
} }
static void jsonize_data_analysis(struct nDPId_reader_thread * const reader_thread, static void jsonize_data_analysis(struct nDPId_reader_thread * const reader_thread,
@@ -2584,37 +2572,40 @@ static void jsonize_packet_event(struct nDPId_reader_thread * const reader_threa
get_l4_protocol_idle_time_external(flow_ext->flow_basic.l4_protocol)); get_l4_protocol_idle_time_external(flow_ext->flow_basic.l4_protocol));
} }
char base64_data[NETWORK_BUFFER_MAX_SIZE]; size_t const serializer_buffer_len = ndpi_serializer_get_buffer_len(&workflow->ndpi_serializer);
size_t base64_data_len = sizeof(base64_data); if (serializer_buffer_len < NETWORK_BUFFER_MAX_SIZE)
int base64_retval = base64encode(packet, header->caplen, base64_data, &base64_data_len);
ndpi_serialize_string_boolean(&workflow->ndpi_serializer, "pkt_oversize", base64_data_len > sizeof(base64_data));
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_caplen", header->caplen);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_type", pkt_type);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_l3_offset", pkt_l3_offset);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_l4_offset", pkt_l4_offset);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_len", header->caplen);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_l4_len", pkt_l4_len);
ndpi_serialize_string_uint64(&workflow->ndpi_serializer, "thread_ts_usec", workflow->last_thread_time);
if (base64_retval == 0 && base64_data_len > 0)
{ {
if (ndpi_serialize_string_binary(&workflow->ndpi_serializer, "pkt", base64_data, base64_data_len) != 0) char base64_data[NETWORK_BUFFER_MAX_SIZE - serializer_buffer_len];
size_t base64_data_len = sizeof(base64_data);
base64encode(packet, header->caplen, base64_data, &base64_data_len);
ndpi_serialize_string_boolean(&workflow->ndpi_serializer, "pkt_oversize", header->caplen > base64_data_len);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_caplen", header->caplen);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_type", pkt_type);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_l3_offset", pkt_l3_offset);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_l4_offset", pkt_l4_offset);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_len", header->caplen);
ndpi_serialize_string_uint32(&workflow->ndpi_serializer, "pkt_l4_len", pkt_l4_len);
ndpi_serialize_string_uint64(&workflow->ndpi_serializer, "thread_ts_usec", workflow->last_thread_time);
if (base64_data_len > 0)
{
if (ndpi_serialize_string_binary(&workflow->ndpi_serializer, "pkt", base64_data, base64_data_len) != 0)
{
logger(1,
"[%8llu, %zu] JSON serializing base64 packet buffer failed",
reader_thread->workflow->packets_captured,
reader_thread->array_index);
}
}
else
{ {
logger(1, logger(1,
"[%8llu, %zu] JSON serializing base64 packet buffer failed", "[%8llu, %zu] Base64 encoding failed.",
reader_thread->workflow->packets_captured, reader_thread->workflow->packets_captured,
reader_thread->array_index); reader_thread->array_index);
} }
} }
else
{
logger(1,
"[%8llu, %zu] Base64 encoding failed with: %s.",
reader_thread->workflow->packets_captured,
reader_thread->array_index,
base64_ret_strings[base64_retval]);
}
serialize_and_send(reader_thread); serialize_and_send(reader_thread);
} }