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

next/301/20240214/v1 #10426

Merged
merged 4 commits into from
Feb 15, 2024
Merged

next/301/20240214/v1 #10426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63caa0b
detect: respect directionality for filestore
catenacyber Jan 25, 2024
17f9d7a
detect-engine-iponly: improve ip list performance
cccs-sadugas Dec 29, 2023
b8b8aa6
stats: Do not expand dots of tm_name
awelzel Feb 5, 2024
08db0f3
stats: Add unittest for basic stats serialization
awelzel Feb 8, 2024
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
3 changes: 2 additions & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,8 @@ EXTRA_DIST = \
tests/detect-tls-version.c \
tests/detect-ipaddr.c \
tests/detect.c \
tests/stream-tcp.c
tests/stream-tcp.c \
tests/output-json-stats.c

install-headers:
mkdir -p $(DESTDIR)${includedir}/suricata
Expand Down
262 changes: 180 additions & 82 deletions src/detect-engine-iponly.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,78 @@ static IPOnlyCIDRItem *IPOnlyCIDRItemNew(void)
SCReturnPtr(item, "IPOnlyCIDRItem");
}

static uint8_t IPOnlyCIDRItemCompare(IPOnlyCIDRItem *head,
IPOnlyCIDRItem *item)
/**
* \brief Compares two list items
*
* \retval An integer less than, equal to, or greater than zero if lhs is
* considered to be respectively less than, equal to, or greater than
* rhs.
*/
static int IPOnlyCIDRItemCompareReal(const IPOnlyCIDRItem *lhs, const IPOnlyCIDRItem *rhs)
{
uint8_t i = 0;
for (; i < head->netmask / 32 || i < 1; i++) {
if (item->ip[i] < head->ip[i])
//if (*(uint8_t *)(item->ip + i) < *(uint8_t *)(head->ip + i))
return 1;
if (lhs->netmask == rhs->netmask) {
uint8_t i = 0;
for (; i < lhs->netmask / 32 || i < 1; i++) {
if (lhs->ip[i] < rhs->ip[i])
return -1;
if (lhs->ip[i] > rhs->ip[i])
return 1;
}
return 0;
}
return 0;

return lhs->netmask < rhs->netmask ? -1 : 1;
}

static int IPOnlyCIDRItemCompare(const void *lhsv, const void *rhsv)
{
const IPOnlyCIDRItem *lhs = *(const IPOnlyCIDRItem **)lhsv;
const IPOnlyCIDRItem *rhs = *(const IPOnlyCIDRItem **)rhsv;

return IPOnlyCIDRItemCompareReal(lhs, rhs);
}

static void IPOnlyCIDRListQSort(IPOnlyCIDRItem **head)
{
if (unlikely(head == NULL || *head == NULL))
return;

// First count the number of elements in the list
size_t len = 0;
IPOnlyCIDRItem *curr = *head;

while (curr) {
curr = curr->next;
len++;
}

// Place a pointer to the list item in an array for sorting
IPOnlyCIDRItem **tmp = SCMalloc(len * sizeof(IPOnlyCIDRItem *));

if (unlikely(tmp == NULL)) {
SCLogError("Failed to allocate enough memory to sort IP-only CIDR items.");
return;
}

curr = *head;
for (size_t i = 0; i < len; i++) {
tmp[i] = curr;
curr = curr->next;
}

// Perform the sort using the qsort algorithm
qsort(tmp, len, sizeof(IPOnlyCIDRItem *), IPOnlyCIDRItemCompare);

// Update the links to the next element
*head = tmp[0];

for (size_t i = 0; i + 1 < len; i++) {
tmp[i]->next = tmp[i + 1];
}

tmp[len - 1]->next = NULL;

SCFree(tmp);
}

//declaration for using it already
Expand Down Expand Up @@ -348,11 +410,9 @@ static int IPOnlyCIDRItemSetup(IPOnlyCIDRItem **gh, char *s)
return -1;
}


/**
* \brief This function insert a IPOnlyCIDRItem
* to a list of IPOnlyCIDRItems sorted by netmask
* ascending
* to a list of IPOnlyCIDRItems
* \param head Pointer to the head of IPOnlyCIDRItems list
* \param item Pointer to the item to insert in the list
*
Expand All @@ -361,37 +421,12 @@ static int IPOnlyCIDRItemSetup(IPOnlyCIDRItem **gh, char *s)
static IPOnlyCIDRItem *IPOnlyCIDRItemInsertReal(IPOnlyCIDRItem *head,
IPOnlyCIDRItem *item)
{
IPOnlyCIDRItem *it, *prev = NULL;

if (item == NULL)
return head;

/* Compare with the head */
if (item->netmask < head->netmask || (item->netmask == head->netmask && IPOnlyCIDRItemCompare(head, item))) {
item->next = head;
return item;
}

if (item->netmask == head->netmask && !IPOnlyCIDRItemCompare(head, item)) {
item->next = head->next;
head->next = item;
return head;
}

for (prev = it = head;
it != NULL && it->netmask < item->netmask;
it = it->next)
prev = it;

if (it == NULL) {
prev->next = item;
item->next = NULL;
} else {
item->next = it;
prev->next = item;
}

return head;
/* Always insert item as head */
item->next = head;
return item;
}

/**
Expand Down Expand Up @@ -1108,6 +1143,9 @@ void IPOnlyPrepare(DetectEngineCtx *de_ctx)
IPOnlyCIDRListPrint((de_ctx->io_ctx).ip_dst);
*/

IPOnlyCIDRListQSort(&(de_ctx->io_ctx).ip_src);
IPOnlyCIDRListQSort(&(de_ctx->io_ctx).ip_dst);

IPOnlyCIDRItem *src, *dst;
SCRadixNode *node = NULL;

Expand Down Expand Up @@ -1725,64 +1763,124 @@ static int IPOnlyTestSig03 (void)
static int IPOnlyTestSig04 (void)
{
int result = 1;

IPOnlyCIDRItem *head = NULL;
IPOnlyCIDRItem *new;

new = IPOnlyCIDRItemNew();
new->netmask= 10;
// Test a linked list of size 0, 1, 2, ..., 5
for (int size = 0; size < 6; size++) {
IPOnlyCIDRItem *new = NULL;

head = IPOnlyCIDRItemInsert(head, new);
if (size > 0) {
new = IPOnlyCIDRItemNew();
new->netmask = 10;
new->ip[0] = 3;

new = IPOnlyCIDRItemNew();
new->netmask= 11;
head = IPOnlyCIDRItemInsert(head, new);
}

head = IPOnlyCIDRItemInsert(head, new);
if (size > 1) {
new = IPOnlyCIDRItemNew();
new->netmask = 11;

new = IPOnlyCIDRItemNew();
new->netmask= 9;
head = IPOnlyCIDRItemInsert(head, new);
}

head = IPOnlyCIDRItemInsert(head, new);
if (size > 2) {
new = IPOnlyCIDRItemNew();
new->netmask = 9;

new = IPOnlyCIDRItemNew();
new->netmask= 10;
head = IPOnlyCIDRItemInsert(head, new);
}

head = IPOnlyCIDRItemInsert(head, new);
if (size > 3) {
new = IPOnlyCIDRItemNew();
new->netmask = 10;
new->ip[0] = 1;

new = IPOnlyCIDRItemNew();
new->netmask= 10;
head = IPOnlyCIDRItemInsert(head, new);
}

head = IPOnlyCIDRItemInsert(head, new);
if (size > 4) {
new = IPOnlyCIDRItemNew();
new->netmask = 10;
new->ip[0] = 2;

IPOnlyCIDRListPrint(head);
new = head;
if (new->netmask != 9) {
result = 0;
goto end;
}
new = new->next;
if (new->netmask != 10) {
result = 0;
goto end;
}
new = new->next;
if (new->netmask != 10) {
result = 0;
goto end;
}
new = new->next;
if (new->netmask != 10) {
result = 0;
goto end;
}
new = new->next;
if (new->netmask != 11) {
result = 0;
goto end;
head = IPOnlyCIDRItemInsert(head, new);
}

IPOnlyCIDRListPrint(head);

IPOnlyCIDRListQSort(&head);

if (size == 0) {
if (head != NULL) {
result = 0;
goto end;
}
}

/**
* Validate the following list entries for each size
* 1 - 10
* 2 - 10<3> 11
* 3 - 9 10<3> 11
* 4 - 9 10<1> 10<3> 11
* 5 - 9 10<1> 10<2> 10<3> 11
*/
new = head;
if (size >= 3) {
if (new->netmask != 9) {
result = 0;
goto end;
}
new = new->next;
}

if (size >= 4) {
if (new->netmask != 10 || new->ip[0] != 1) {
result = 0;
goto end;
}
new = new->next;
}

if (size >= 5) {
if (new->netmask != 10 || new->ip[0] != 2) {
result = 0;
goto end;
}
new = new->next;
}

if (size >= 1) {
if (new->netmask != 10 || new->ip[0] != 3) {
result = 0;
goto end;
}
new = new->next;
}

if (size >= 2) {
if (new->netmask != 11) {
result = 0;
goto end;
}
new = new->next;
}

if (new != NULL) {
result = 0;
goto end;
}

IPOnlyCIDRListFree(head);
head = NULL;
}

end:
IPOnlyCIDRListFree(head);
if (head) {
IPOnlyCIDRListFree(head);
head = NULL;
}
return result;
}

Expand Down
25 changes: 19 additions & 6 deletions src/detect-filestore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ static int FilestorePostMatchWithOptions(Packet *p, Flow *f, const DetectFilesto
switch (filestore->direction) {
case FILESTORE_DIR_DEFAULT:
rule_dir = 1;
break;
// will use both sides if scope is not default
// fallthrough
case FILESTORE_DIR_BOTH:
toserver_dir = 1;
toclient_dir = 1;
Expand Down Expand Up @@ -160,16 +161,28 @@ static int FilestorePostMatchWithOptions(Packet *p, Flow *f, const DetectFilesto
AppLayerTxData *txd = AppLayerParserGetTxData(f->proto, f->alproto, txv);
DEBUG_VALIDATE_BUG_ON(txd == NULL);
if (txd != NULL) {
txd->file_flags |= FLOWFILE_STORE;
if (toclient_dir) {
txd->file_flags |= FLOWFILE_STORE_TC;
}
if (toserver_dir) {
txd->file_flags |= FLOWFILE_STORE_TS;
}
}
}
} else if (this_flow) {
/* set in flow and AppLayerStateData */
f->file_flags |= FLOWFILE_STORE;

AppLayerStateData *sd = AppLayerParserGetStateData(f->proto, f->alproto, f->alstate);
if (sd != NULL) {
sd->file_flags |= FLOWFILE_STORE;
if (toclient_dir) {
f->file_flags |= FLOWFILE_STORE_TC;
if (sd != NULL) {
sd->file_flags |= FLOWFILE_STORE_TC;
}
}
if (toserver_dir) {
f->file_flags |= FLOWFILE_STORE_TS;
if (sd != NULL) {
sd->file_flags |= FLOWFILE_STORE_TS;
}
}
} else {
FileStoreFileById(fc, file_id);
Expand Down
5 changes: 3 additions & 2 deletions src/flow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@ typedef struct AppLayerParserState_ AppLayerParserState;
#define FLOWFILE_NO_SIZE_TS BIT_U16(10)
#define FLOWFILE_NO_SIZE_TC BIT_U16(11)

/** store all files in the flow */
#define FLOWFILE_STORE BIT_U16(12)
/** store files in the flow */
#define FLOWFILE_STORE_TS BIT_U16(12)
#define FLOWFILE_STORE_TC BIT_U16(13)

#define FLOWFILE_NONE_TS (FLOWFILE_NO_MAGIC_TS | \
FLOWFILE_NO_STORE_TS | \
Expand Down
Loading
Loading