aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

datajson: rename jsonline to ndjson

Browse Source
pull/13432/head
Eric Leblond 7 months ago committed by Victor Julien
parent f724c75cc9
commit f7dc2a71db
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

10
src/datajson.c
Unescape Escape View File

@ -387,7 +387,7 @@ static int DatajsonLoadString(Dataset *set, char *json_key, char *array_key, Dat
uint32_t cnt = 0; uint32_t cnt = 0;
if (format == DATASET_FORMAT_JSON) { if (format == DATASET_FORMAT_JSON) {
cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddStringElement); cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddStringElement);
} else if (format == DATASET_FORMAT_JSONLINE) { } else if (format == DATASET_FORMAT_NDJSON) {
cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddStringElement); cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddStringElement);
} }
THashConsolidateMemcap(set->hash); THashConsolidateMemcap(set->hash);
@ -449,7 +449,7 @@ static int DatajsonLoadMd5(Dataset *set, char *json_key, char *array_key, Datase
uint32_t cnt = 0; uint32_t cnt = 0;
if (format == DATASET_FORMAT_JSON) { if (format == DATASET_FORMAT_JSON) {
cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddMd5Element); cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddMd5Element);
} else if (format == DATASET_FORMAT_JSONLINE) { } else if (format == DATASET_FORMAT_NDJSON) {
cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddMd5Element); cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddMd5Element);
} }
THashConsolidateMemcap(set->hash); THashConsolidateMemcap(set->hash);
@ -511,7 +511,7 @@ static int DatajsonLoadSha256(Dataset *set, char *json_key, char *array_key, Dat
uint32_t cnt = 0; uint32_t cnt = 0;
if (format == DATASET_FORMAT_JSON) { if (format == DATASET_FORMAT_JSON) {
cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddSha256Element); cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddSha256Element);
} else if (format == DATASET_FORMAT_JSONLINE) { } else if (format == DATASET_FORMAT_NDJSON) {
cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddSha256Element); cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddSha256Element);
} }
THashConsolidateMemcap(set->hash); THashConsolidateMemcap(set->hash);
@ -569,7 +569,7 @@ static int DatajsonLoadIPv4(Dataset *set, char *json_key, char *array_key, Datas
if (format == DATASET_FORMAT_JSON) { if (format == DATASET_FORMAT_JSON) {
cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddIpv4Element); cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddIpv4Element);
} else if (format == DATASET_FORMAT_JSONLINE) { } else if (format == DATASET_FORMAT_NDJSON) {
cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddIpv4Element); cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddIpv4Element);
} }
THashConsolidateMemcap(set->hash); THashConsolidateMemcap(set->hash);
@ -628,7 +628,7 @@ static int DatajsonLoadIPv6(Dataset *set, char *json_key, char *array_key, Datas
if (format == DATASET_FORMAT_JSON) { if (format == DATASET_FORMAT_JSON) {
cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddIPv6Element); cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddIPv6Element);
} else if (format == DATASET_FORMAT_JSONLINE) { } else if (format == DATASET_FORMAT_NDJSON) {
cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddIPv6Element); cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddIPv6Element);
} }

2
src/datasets.h
Unescape Escape View File

@ -31,7 +31,7 @@ void DatasetPostReloadCleanup(void);
typedef enum { typedef enum {
DATASET_FORMAT_CSV = 0, DATASET_FORMAT_CSV = 0,
DATASET_FORMAT_JSON, DATASET_FORMAT_JSON,
DATASET_FORMAT_JSONLINE, DATASET_FORMAT_NDJSON,
} DatasetFormats; } DatasetFormats;
enum DatasetTypes { enum DatasetTypes {

18
src/detect-dataset.c
Unescape Escape View File

@ -119,7 +119,7 @@ int DetectDatasetBufferMatch(DetectEngineThreadCtx *det_ctx,
if (data == NULL || data_len == 0) if (data == NULL || data_len == 0)
return 0; return 0;
if ((sd->format == DATASET_FORMAT_JSON) || (sd->format == DATASET_FORMAT_JSONLINE)) { if ((sd->format == DATASET_FORMAT_JSON) || (sd->format == DATASET_FORMAT_NDJSON)) {
return DetectDatajsonBufferMatch(det_ctx, sd, data, data_len); return DetectDatajsonBufferMatch(det_ctx, sd, data, data_len);
} }
@ -268,8 +268,8 @@ static int DetectDatasetParse(const char *str, char *cmd, int cmd_len, char *nam
SCLogDebug("format %s", val); SCLogDebug("format %s", val);
if (strcmp(val, "csv") == 0) { if (strcmp(val, "csv") == 0) {
*format = DATASET_FORMAT_CSV; *format = DATASET_FORMAT_CSV;
} else if (strcmp(val, "jsonline") == 0) { } else if (strcmp(val, "ndjson") == 0) {
*format = DATASET_FORMAT_JSONLINE; *format = DATASET_FORMAT_NDJSON;
} else if (strcmp(val, "json") == 0) { } else if (strcmp(val, "json") == 0) {
*format = DATASET_FORMAT_JSON; *format = DATASET_FORMAT_JSON;
} else { } else {
@ -483,13 +483,13 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
} else if (strcmp(cmd_str,"isnotset") == 0) { } else if (strcmp(cmd_str,"isnotset") == 0) {
cmd = DETECT_DATASET_CMD_ISNOTSET; cmd = DETECT_DATASET_CMD_ISNOTSET;
} else if (strcmp(cmd_str,"set") == 0) { } else if (strcmp(cmd_str,"set") == 0) {
if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_JSONLINE)) { if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_NDJSON)) {
SCLogError("json format is not supported for 'set' command"); SCLogError("json format is not supported for 'set' command");
return -1; return -1;
} }
cmd = DETECT_DATASET_CMD_SET; cmd = DETECT_DATASET_CMD_SET;
} else if (strcmp(cmd_str,"unset") == 0) { } else if (strcmp(cmd_str,"unset") == 0) {
if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_JSONLINE)) { if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_NDJSON)) {
SCLogError("json format is not supported for 'unset' command"); SCLogError("json format is not supported for 'unset' command");
return -1; return -1;
} }
@ -499,7 +499,7 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
return -1; return -1;
} }
if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_JSONLINE)) { if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_NDJSON)) {
if (strlen(save) != 0) { if (strlen(save) != 0) {
SCLogError("json format is not supported with 'save' or 'state' option"); SCLogError("json format is not supported with 'save' or 'state' option");
return -1; return -1;
@ -535,9 +535,9 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
if (format == DATASET_FORMAT_JSON) { if (format == DATASET_FORMAT_JSON) {
set = DatajsonGet(name, type, load, memcap, hashsize, value_key, array_key, set = DatajsonGet(name, type, load, memcap, hashsize, value_key, array_key,
DATASET_FORMAT_JSON, remove_key); DATASET_FORMAT_JSON, remove_key);
} else if (format == DATASET_FORMAT_JSONLINE) { } else if (format == DATASET_FORMAT_NDJSON) {
set = DatajsonGet(name, type, load, memcap, hashsize, value_key, NULL, set = DatajsonGet(name, type, load, memcap, hashsize, value_key, NULL,
DATASET_FORMAT_JSONLINE, remove_key); DATASET_FORMAT_NDJSON, remove_key);
} else { } else {
set = DatasetGet(name, type, save, load, memcap, hashsize); set = DatasetGet(name, type, save, load, memcap, hashsize);
} }
@ -553,7 +553,7 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
cd->set = set; cd->set = set;
cd->cmd = cmd; cd->cmd = cmd;
cd->format = format; cd->format = format;
if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_JSONLINE)) { if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_NDJSON)) {
strlcpy(cd->json_key, enrichment_key, sizeof(cd->json_key)); strlcpy(cd->json_key, enrichment_key, sizeof(cd->json_key));
} }
cd->id = s; cd->id = s;

Write Preview
Loading…
Cancel
Save