Domain Classification Improvements (#2396)

* Added
size_t ndpi_compress_str(const char * in, size_t len, char * out, size_t bufsize);
size_t ndpi_decompress_str(const char * in, size_t len, char * out, size_t bufsize);

used to compress short strings such as domain names. This code is based on
https://github.com/Ed-von-Schleck/shoco

* Major code rewrite for ndpi_hash and ndpi_domain_classify

* Improvements to make sure custom categories are loaded and enabled

* Fixed string encoding

* Extended SalesForce/Cloudflare domains list
This commit is contained in:
Luca Deri
2024-04-18 23:21:40 +02:00
committed by GitHub
parent 108b8331d5
commit ad117bfaab
65 changed files with 1194 additions and 612 deletions
+9 -12
View File
@@ -6,17 +6,10 @@
#include <assert.h>
#include "fuzzer/FuzzedDataProvider.h"
extern "C" void cleanup_func(ndpi_str_hash *h) {
(void)h;
/* Nothing to do */
return;
}
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
FuzzedDataProvider fuzzed_data(data, size);
u_int16_t i, rc, num_iteration, data_len, is_added = 0;
std::vector<char>value_added;
void *value;
ndpi_str_hash *h = NULL;
/* Just to have some data */
@@ -37,7 +30,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
data_len = fuzzed_data.ConsumeIntegralInRange(0, 127);
std::vector<char>data = fuzzed_data.ConsumeBytes<char>(data_len);
rc = ndpi_hash_add_entry(&h, data.data(), data.size(), &i);
rc = ndpi_hash_add_entry(&h, data.data(), data.size(), (u_int16_t)i);
/* Keep one random entry really added */
if (rc == 0 && fuzzed_data.ConsumeBool()) {
value_added = data;
@@ -48,19 +41,23 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
/* "Random" search */
num_iteration = fuzzed_data.ConsumeIntegral<u_int8_t>();
for (i = 0; i < num_iteration; i++) {
u_int16_t value16;
data_len = fuzzed_data.ConsumeIntegralInRange(0, 127);
std::vector<char>data = fuzzed_data.ConsumeBytes<char>(data_len);
ndpi_hash_find_entry(h, data.data(), data.size(), &value);
ndpi_hash_find_entry(h, data.data(), data.size(), &value16);
}
/* Search of an added entry */
if (is_added) {
ndpi_hash_find_entry(h, value_added.data(), value_added.size(), &value);
u_int16_t value16;
ndpi_hash_find_entry(h, value_added.data(), value_added.size(), &value16);
}
if (fuzzed_data.ConsumeBool())
ndpi_hash_free(NULL, cleanup_func);
ndpi_hash_free(&h, cleanup_func);
ndpi_hash_free(NULL);
ndpi_hash_free(&h);
return 0;
}