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

detect: spelling: multi-tenancy fixes

Browse Source
pull/8828/head
Victor Julien 3 years ago
parent a3c8105ac4
commit bbcf6fe76b
3 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File

51
src/detect-engine.c
Unescape Escape View File

@ -98,9 +98,9 @@ static DetectEngineMasterCtx g_master_de_ctx = { SCMUTEX_INITIALIZER,
static uint32_t TenantIdHash(HashTable *h, void *data, uint16_t data_len); static uint32_t TenantIdHash(HashTable *h, void *data, uint16_t data_len);
static char TenantIdCompare(void *d1, uint16_t d1_len, void *d2, uint16_t d2_len); static char TenantIdCompare(void *d1, uint16_t d1_len, void *d2, uint16_t d2_len);
static void TenantIdFree(void *d); static void TenantIdFree(void *d);
static uint32_t DetectEngineTentantGetIdFromLivedev(const void *ctx, const Packet *p); static uint32_t DetectEngineTenantGetIdFromLivedev(const void *ctx, const Packet *p);
static uint32_t DetectEngineTentantGetIdFromVlanId(const void *ctx, const Packet *p); static uint32_t DetectEngineTenantGetIdFromVlanId(const void *ctx, const Packet *p);
static uint32_t DetectEngineTentantGetIdFromPcap(const void *ctx, const Packet *p); static uint32_t DetectEngineTenantGetIdFromPcap(const void *ctx, const Packet *p);
static DetectEngineAppInspectionEngine *g_app_inspect_engines = NULL; static DetectEngineAppInspectionEngine *g_app_inspect_engines = NULL;
static DetectEnginePktInspectionEngine *g_pkt_inspect_engines = NULL; static DetectEnginePktInspectionEngine *g_pkt_inspect_engines = NULL;
@ -3161,15 +3161,15 @@ static TmEcode DetectEngineThreadCtxInitForMT(ThreadVars *tv, DetectEngineThread
SCLogDebug("TENANT_SELECTOR_UNKNOWN"); SCLogDebug("TENANT_SELECTOR_UNKNOWN");
break; break;
case TENANT_SELECTOR_VLAN: case TENANT_SELECTOR_VLAN:
det_ctx->TenantGetId = DetectEngineTentantGetIdFromVlanId; det_ctx->TenantGetId = DetectEngineTenantGetIdFromVlanId;
SCLogDebug("TENANT_SELECTOR_VLAN"); SCLogDebug("TENANT_SELECTOR_VLAN");
break; break;
case TENANT_SELECTOR_LIVEDEV: case TENANT_SELECTOR_LIVEDEV:
det_ctx->TenantGetId = DetectEngineTentantGetIdFromLivedev; det_ctx->TenantGetId = DetectEngineTenantGetIdFromLivedev;
SCLogDebug("TENANT_SELECTOR_LIVEDEV"); SCLogDebug("TENANT_SELECTOR_LIVEDEV");
break; break;
case TENANT_SELECTOR_DIRECT: case TENANT_SELECTOR_DIRECT:
det_ctx->TenantGetId = DetectEngineTentantGetIdFromPcap; det_ctx->TenantGetId = DetectEngineTenantGetIdFromPcap;
SCLogDebug("TENANT_SELECTOR_DIRECT"); SCLogDebug("TENANT_SELECTOR_DIRECT");
break; break;
} }
@ -4038,7 +4038,7 @@ static int DetectEngineMultiTenantSetupLoadLivedevMappings(const ConfNode *mappi
ld->tenant_id = tenant_id; ld->tenant_id = tenant_id;
ld->tenant_id_set = true; ld->tenant_id_set = true;
if (DetectEngineTentantRegisterLivedev(tenant_id, ld->id) != 0) { if (DetectEngineTenantRegisterLivedev(tenant_id, ld->id) != 0) {
goto error; goto error;
} }
@ -4097,7 +4097,7 @@ static int DetectEngineMultiTenantSetupLoadVlanMappings(const ConfNode *mappings
goto bad_mapping; goto bad_mapping;
} }
if (DetectEngineTentantRegisterVlanId(tenant_id, vlan_id) != 0) { if (DetectEngineTenantRegisterVlanId(tenant_id, vlan_id) != 0) {
goto error; goto error;
} }
SCLogConfig("vlan %u connected to tenant-id %u", vlan_id, tenant_id); SCLogConfig("vlan %u connected to tenant-id %u", vlan_id, tenant_id);
@ -4274,7 +4274,7 @@ error:
return -1; return -1;
} }
static uint32_t DetectEngineTentantGetIdFromVlanId(const void *ctx, const Packet *p) static uint32_t DetectEngineTenantGetIdFromVlanId(const void *ctx, const Packet *p)
{ {
const DetectEngineThreadCtx *det_ctx = ctx; const DetectEngineThreadCtx *det_ctx = ctx;
uint32_t x = 0; uint32_t x = 0;
@ -4298,7 +4298,7 @@ static uint32_t DetectEngineTentantGetIdFromVlanId(const void *ctx, const Packet
return 0; return 0;
} }
static uint32_t DetectEngineTentantGetIdFromLivedev(const void *ctx, const Packet *p) static uint32_t DetectEngineTenantGetIdFromLivedev(const void *ctx, const Packet *p)
{ {
const DetectEngineThreadCtx *det_ctx = ctx; const DetectEngineThreadCtx *det_ctx = ctx;
const LiveDevice *ld = p->livedev; const LiveDevice *ld = p->livedev;
@ -4310,8 +4310,8 @@ static uint32_t DetectEngineTentantGetIdFromLivedev(const void *ctx, const Packe
return ld->tenant_id; return ld->tenant_id;
} }
static int DetectEngineTentantRegisterSelector(enum DetectEngineTenantSelectors selector, static int DetectEngineTenantRegisterSelector(
uint32_t tenant_id, uint32_t traffic_id) enum DetectEngineTenantSelectors selector, uint32_t tenant_id, uint32_t traffic_id)
{ {
DetectEngineMasterCtx *master = &g_master_de_ctx; DetectEngineMasterCtx *master = &g_master_de_ctx;
SCMutexLock(&master->lock); SCMutexLock(&master->lock);
@ -4351,8 +4351,8 @@ static int DetectEngineTentantRegisterSelector(enum DetectEngineTenantSelectors
return 0; return 0;
} }
static int DetectEngineTentantUnregisterSelector(enum DetectEngineTenantSelectors selector, static int DetectEngineTenantUnregisterSelector(
uint32_t tenant_id, uint32_t traffic_id) enum DetectEngineTenantSelectors selector, uint32_t tenant_id, uint32_t traffic_id)
{ {
DetectEngineMasterCtx *master = &g_master_de_ctx; DetectEngineMasterCtx *master = &g_master_de_ctx;
SCMutexLock(&master->lock); SCMutexLock(&master->lock);
@ -4387,34 +4387,35 @@ static int DetectEngineTentantUnregisterSelector(enum DetectEngineTenantSelector
return -1; return -1;
} }
int DetectEngineTentantRegisterLivedev(uint32_t tenant_id, int device_id) int DetectEngineTenantRegisterLivedev(uint32_t tenant_id, int device_id)
{ {
return DetectEngineTentantRegisterSelector(TENANT_SELECTOR_LIVEDEV, tenant_id, (uint32_t)device_id); return DetectEngineTenantRegisterSelector(
TENANT_SELECTOR_LIVEDEV, tenant_id, (uint32_t)device_id);
} }
int DetectEngineTentantRegisterVlanId(uint32_t tenant_id, uint16_t vlan_id) int DetectEngineTenantRegisterVlanId(uint32_t tenant_id, uint16_t vlan_id)
{ {
return DetectEngineTentantRegisterSelector(TENANT_SELECTOR_VLAN, tenant_id, (uint32_t)vlan_id); return DetectEngineTenantRegisterSelector(TENANT_SELECTOR_VLAN, tenant_id, (uint32_t)vlan_id);
} }
int DetectEngineTentantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id) int DetectEngineTenantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id)
{ {
return DetectEngineTentantUnregisterSelector(TENANT_SELECTOR_VLAN, tenant_id, (uint32_t)vlan_id); return DetectEngineTenantUnregisterSelector(TENANT_SELECTOR_VLAN, tenant_id, (uint32_t)vlan_id);
} }
int DetectEngineTentantRegisterPcapFile(uint32_t tenant_id) int DetectEngineTenantRegisterPcapFile(uint32_t tenant_id)
{ {
SCLogInfo("registering %u %d 0", TENANT_SELECTOR_DIRECT, tenant_id); SCLogInfo("registering %u %d 0", TENANT_SELECTOR_DIRECT, tenant_id);
return DetectEngineTentantRegisterSelector(TENANT_SELECTOR_DIRECT, tenant_id, 0); return DetectEngineTenantRegisterSelector(TENANT_SELECTOR_DIRECT, tenant_id, 0);
} }
int DetectEngineTentantUnregisterPcapFile(uint32_t tenant_id) int DetectEngineTenantUnregisterPcapFile(uint32_t tenant_id)
{ {
SCLogInfo("unregistering %u %d 0", TENANT_SELECTOR_DIRECT, tenant_id); SCLogInfo("unregistering %u %d 0", TENANT_SELECTOR_DIRECT, tenant_id);
return DetectEngineTentantUnregisterSelector(TENANT_SELECTOR_DIRECT, tenant_id, 0); return DetectEngineTenantUnregisterSelector(TENANT_SELECTOR_DIRECT, tenant_id, 0);
} }
static uint32_t DetectEngineTentantGetIdFromPcap(const void *ctx, const Packet *p) static uint32_t DetectEngineTenantGetIdFromPcap(const void *ctx, const Packet *p)
{ {
return p->pcap_v.tenant_id; return p->pcap_v.tenant_id;
} }

10
src/detect-engine.h
Unescape Escape View File

@ -129,11 +129,11 @@ int DetectEngineReloadIsIdle(void);
int DetectEngineLoadTenantBlocking(uint32_t tenant_id, const char *yaml); int DetectEngineLoadTenantBlocking(uint32_t tenant_id, const char *yaml);
int DetectEngineReloadTenantBlocking(uint32_t tenant_id, const char *yaml, int reload_cnt); int DetectEngineReloadTenantBlocking(uint32_t tenant_id, const char *yaml, int reload_cnt);
int DetectEngineTentantRegisterLivedev(uint32_t tenant_id, int device_id); int DetectEngineTenantRegisterLivedev(uint32_t tenant_id, int device_id);
int DetectEngineTentantRegisterVlanId(uint32_t tenant_id, uint16_t vlan_id); int DetectEngineTenantRegisterVlanId(uint32_t tenant_id, uint16_t vlan_id);
int DetectEngineTentantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id); int DetectEngineTenantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id);
int DetectEngineTentantRegisterPcapFile(uint32_t tenant_id); int DetectEngineTenantRegisterPcapFile(uint32_t tenant_id);
int DetectEngineTentantUnregisterPcapFile(uint32_t tenant_id); int DetectEngineTenantUnregisterPcapFile(uint32_t tenant_id);
uint8_t DetectEngineInspectGenericList(DetectEngineCtx *, DetectEngineThreadCtx *, uint8_t DetectEngineInspectGenericList(DetectEngineCtx *, DetectEngineThreadCtx *,
const struct DetectEngineAppInspectionEngine_ *, const Signature *, Flow *, uint8_t, void *, const struct DetectEngineAppInspectionEngine_ *, const Signature *, Flow *, uint8_t, void *,

8
src/runmode-unix-socket.c
Unescape Escape View File

@ -903,7 +903,7 @@ TmEcode UnixSocketRegisterTenantHandler(json_t *cmd, json_t* answer, void *data)
/* 4 add to system */ /* 4 add to system */
int r = -1; int r = -1;
if (strcmp(htype, "pcap") == 0) { if (strcmp(htype, "pcap") == 0) {
r = DetectEngineTentantRegisterPcapFile(tenant_id); r = DetectEngineTenantRegisterPcapFile(tenant_id);
} else if (strcmp(htype, "vlan") == 0) { } else if (strcmp(htype, "vlan") == 0) {
if (traffic_id < 0) { if (traffic_id < 0) {
json_object_set_new(answer, "message", json_string("vlan requires argument")); json_object_set_new(answer, "message", json_string("vlan requires argument"));
@ -915,7 +915,7 @@ TmEcode UnixSocketRegisterTenantHandler(json_t *cmd, json_t* answer, void *data)
} }
SCLogInfo("VLAN handler: id %u maps to tenant %u", (uint32_t)traffic_id, tenant_id); SCLogInfo("VLAN handler: id %u maps to tenant %u", (uint32_t)traffic_id, tenant_id);
r = DetectEngineTentantRegisterVlanId(tenant_id, (uint16_t)traffic_id); r = DetectEngineTenantRegisterVlanId(tenant_id, (uint16_t)traffic_id);
} }
if (r != 0) { if (r != 0) {
json_object_set_new(answer, "message", json_string("handler setup failure")); json_object_set_new(answer, "message", json_string("handler setup failure"));
@ -984,7 +984,7 @@ TmEcode UnixSocketUnregisterTenantHandler(json_t *cmd, json_t* answer, void *dat
/* 4 add to system */ /* 4 add to system */
int r = -1; int r = -1;
if (strcmp(htype, "pcap") == 0) { if (strcmp(htype, "pcap") == 0) {
r = DetectEngineTentantUnregisterPcapFile(tenant_id); r = DetectEngineTenantUnregisterPcapFile(tenant_id);
} else if (strcmp(htype, "vlan") == 0) { } else if (strcmp(htype, "vlan") == 0) {
if (traffic_id < 0) { if (traffic_id < 0) {
json_object_set_new(answer, "message", json_string("vlan requires argument")); json_object_set_new(answer, "message", json_string("vlan requires argument"));
@ -996,7 +996,7 @@ TmEcode UnixSocketUnregisterTenantHandler(json_t *cmd, json_t* answer, void *dat
} }
SCLogInfo("VLAN handler: removing mapping of %u to tenant %u", (uint32_t)traffic_id, tenant_id); SCLogInfo("VLAN handler: removing mapping of %u to tenant %u", (uint32_t)traffic_id, tenant_id);
r = DetectEngineTentantUnregisterVlanId(tenant_id, (uint16_t)traffic_id); r = DetectEngineTenantUnregisterVlanId(tenant_id, (uint16_t)traffic_id);
} }
if (r != 0) { if (r != 0) {
json_object_set_new(answer, "message", json_string("handler unregister failure")); json_object_set_new(answer, "message", json_string("handler unregister failure"));

Write Preview
Loading…
Cancel
Save