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

classification: remove global from parsing

Browse Source 
Parsing code used a 'fd' global. Remove this.
pull/1484/head
Victor Julien 12 years ago
parent 9764a35604
commit 393689ce44
8 changed files with 59 additions and 89 deletions
Show Stats Download Patch File Download Diff File

10
src/alert-fastlog.c
Unescape Escape View File

@ -298,9 +298,8 @@ static int AlertFastLogTest01()
de_ctx->flags |= DE_QUIET; de_ctx->flags |= DE_QUIET;
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any " de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
"(msg:\"FastLog test\"; content:\"GET\"; " "(msg:\"FastLog test\"; content:\"GET\"; "
@ -346,9 +345,8 @@ static int AlertFastLogTest02()
de_ctx->flags |= DE_QUIET; de_ctx->flags |= DE_QUIET;
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any " de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
"(msg:\"FastLog test\"; content:\"GET\"; " "(msg:\"FastLog test\"; content:\"GET\"; "

15
src/detect-classtype.c
Unescape Escape View File

@ -182,9 +182,8 @@ int DetectClasstypeTest01()
goto end; goto end;
} }
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any " de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any "
"(msg:\"Classtype test\"; " "(msg:\"Classtype test\"; "
@ -214,9 +213,8 @@ int DetectClasstypeTest02()
goto end; goto end;
} }
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
sig = SigInit(de_ctx, "alert tcp any any -> any any " sig = SigInit(de_ctx, "alert tcp any any -> any any "
"(msg:\"Classtype test\"; Classtype:bad-unknown; sid:1;)"); "(msg:\"Classtype test\"; Classtype:bad-unknown; sid:1;)");
@ -281,9 +279,8 @@ int DetectClasstypeTest03()
goto end; goto end;
} }
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
sig = SigInit(de_ctx, "alert tcp any any -> any any " sig = SigInit(de_ctx, "alert tcp any any -> any any "
"(msg:\"Classtype test\"; Classtype:bad-unknown; priority:1; sid:1;)"); "(msg:\"Classtype test\"; Classtype:bad-unknown; priority:1; sid:1;)");

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

@ -821,7 +821,7 @@ static DetectEngineCtx *DetectEngineCtxInitReal(int minimal, const char *prefix)
SCProfilingKeywordInitCounters(de_ctx); SCProfilingKeywordInitCounters(de_ctx);
#endif #endif
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, NULL);
SCRConfLoadReferenceConfigFile(de_ctx); SCRConfLoadReferenceConfigFile(de_ctx);
if (ActionInitConfig() < 0) { if (ActionInitConfig() < 0) {

5
src/detect-msg.c
Unescape Escape View File

@ -148,9 +148,8 @@ static int DetectMsgParseTest01(void)
if (de_ctx == NULL) if (de_ctx == NULL)
goto end; goto end;
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
sig = SigInit(de_ctx, "alert tcp any any -> any any (msg:\"flow stateless to_server\"; flow:stateless,to_server; content:\"flowstatelesscheck\"; classtype:bad-unknown; sid: 40000002; rev: 1;)"); sig = SigInit(de_ctx, "alert tcp any any -> any any (msg:\"flow stateless to_server\"; flow:stateless,to_server; content:\"flowstatelesscheck\"; classtype:bad-unknown; sid: 40000002; rev: 1;)");
if(sig == NULL) if(sig == NULL)

5
src/detect-parse.c
Unescape Escape View File

@ -1918,9 +1918,8 @@ int SigParseTest02 (void)
if (de_ctx == NULL) if (de_ctx == NULL)
goto end; goto end;
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
sig = SigInit(de_ctx, "alert tcp any !21:902 -> any any (msg:\"ET MALWARE Suspicious 220 Banner on Local Port\"; content:\"220\"; offset:0; depth:4; pcre:\"/220[- ]/\"; sid:2003055; rev:4;)"); sig = SigInit(de_ctx, "alert tcp any !21:902 -> any any (msg:\"ET MALWARE Suspicious 220 Banner on Local Port\"; content:\"220\"; offset:0; depth:4; pcre:\"/220[- ]/\"; sid:2003055; rev:4;)");
if (sig == NULL) { if (sig == NULL) {

10
src/log-droplog.c
Unescape Escape View File

@ -384,9 +384,8 @@ int LogDropLogTest01()
de_ctx->flags |= DE_QUIET; de_ctx->flags |= DE_QUIET;
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
de_ctx->sig_list = SigInit(de_ctx, "drop tcp any any -> any any " de_ctx->sig_list = SigInit(de_ctx, "drop tcp any any -> any any "
"(msg:\"LogDropLog test\"; content:\"GET\"; Classtype:unknown; sid:1;)"); "(msg:\"LogDropLog test\"; content:\"GET\"; Classtype:unknown; sid:1;)");
@ -453,9 +452,8 @@ int LogDropLogTest02()
de_ctx->flags |= DE_QUIET; de_ctx->flags |= DE_QUIET;
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
de_ctx->sig_list = SigInit(de_ctx, "alert udp any any -> any any " de_ctx->sig_list = SigInit(de_ctx, "alert udp any any -> any any "
"(msg:\"LogDropLog test\"; content:\"GET\"; Classtype:unknown; sid:1;)"); "(msg:\"LogDropLog test\"; content:\"GET\"; Classtype:unknown; sid:1;)");

92
src/util-classification-config.c
Unescape Escape View File

@ -49,7 +49,6 @@
/* Holds a pointer to the default path for the classification.config file */ /* Holds a pointer to the default path for the classification.config file */
static const char *default_file_path = SC_CLASS_CONF_DEF_CONF_FILEPATH; static const char *default_file_path = SC_CLASS_CONF_DEF_CONF_FILEPATH;
static FILE *fd = NULL;
static pcre *regex = NULL; static pcre *regex = NULL;
static pcre_extra *regex_study = NULL; static pcre_extra *regex_study = NULL;
@ -70,10 +69,9 @@ static char *SCClassConfGetConfFilename(void);
* *
* \param de_ctx Pointer to the Detection Engine Context. * \param de_ctx Pointer to the Detection Engine Context.
* *
* \retval 0 On success. * \retval fp NULL on error
* \retval -1 On failure.
*/ */
int SCClassConfInitContextAndLocalResources(DetectEngineCtx *de_ctx) FILE *SCClassConfInitContextAndLocalResources(DetectEngineCtx *de_ctx, FILE *fd)
{ {
char *filename = NULL; char *filename = NULL;
const char *eb = NULL; const char *eb = NULL;
@ -119,7 +117,7 @@ int SCClassConfInitContextAndLocalResources(DetectEngineCtx *de_ctx)
goto error; goto error;
} }
return 0; return fd;
error: error:
if (de_ctx->class_conf_ht != NULL) { if (de_ctx->class_conf_ht != NULL) {
@ -140,7 +138,7 @@ int SCClassConfInitContextAndLocalResources(DetectEngineCtx *de_ctx)
regex_study = NULL; regex_study = NULL;
} }
return -1; return NULL;
} }
@ -167,12 +165,14 @@ static char *SCClassConfGetConfFilename(void)
/** /**
* \brief Releases resources used by the Classification Config API. * \brief Releases resources used by the Classification Config API.
*/ */
static void SCClassConfDeInitLocalResources(DetectEngineCtx *de_ctx) static void SCClassConfDeInitLocalResources(DetectEngineCtx *de_ctx, FILE *fd)
{ {
if (fd != NULL) {
fclose(fd);
fd = NULL;
}
fclose(fd);
default_file_path = SC_CLASS_CONF_DEF_CONF_FILEPATH; default_file_path = SC_CLASS_CONF_DEF_CONF_FILEPATH;
fd = NULL;
if (regex != NULL) { if (regex != NULL) {
pcre_free(regex); pcre_free(regex);
regex = NULL; regex = NULL;
@ -341,7 +341,7 @@ static int SCClassConfIsLineBlankOrComment(char *line)
* *
* \param de_ctx Pointer to the Detection Engine Context. * \param de_ctx Pointer to the Detection Engine Context.
*/ */
void SCClassConfParseFile(DetectEngineCtx *de_ctx) void SCClassConfParseFile(DetectEngineCtx *de_ctx, FILE *fd)
{ {
char line[1024]; char line[1024];
uint8_t i = 1; uint8_t i = 1;
@ -517,9 +517,10 @@ void SCClassConfClasstypeHashFree(void *ch)
* \param de_ctx Pointer to the Detection Engine Context that should be updated * \param de_ctx Pointer to the Detection Engine Context that should be updated
* with Classtype information. * with Classtype information.
*/ */
void SCClassConfLoadClassficationConfigFile(DetectEngineCtx *de_ctx) void SCClassConfLoadClassficationConfigFile(DetectEngineCtx *de_ctx, FILE *fd)
{ {
if (SCClassConfInitContextAndLocalResources(de_ctx) == -1) { fd = SCClassConfInitContextAndLocalResources(de_ctx, fd);
if (fd == NULL) {
#ifdef UNITTESTS #ifdef UNITTESTS
if (RunmodeIsUnittests() && fd == NULL) { if (RunmodeIsUnittests() && fd == NULL) {
return; return;
@ -530,8 +531,8 @@ void SCClassConfLoadClassficationConfigFile(DetectEngineCtx *de_ctx)
return; return;
} }
SCClassConfParseFile(de_ctx); SCClassConfParseFile(de_ctx, fd);
SCClassConfDeInitLocalResources(de_ctx); SCClassConfDeInitLocalResources(de_ctx, fd);
return; return;
} }
@ -573,18 +574,18 @@ SCClassConfClasstype *SCClassConfGetClasstype(const char *ct_name,
* *
* \file_path Pointer to the file_path for the dummy classification file. * \file_path Pointer to the file_path for the dummy classification file.
*/ */
void SCClassConfGenerateValidDummyClassConfigFD01(void) FILE *SCClassConfGenerateValidDummyClassConfigFD01(void)
{ {
const char *buffer = const char *buffer =
"config classification: nothing-wrong,Nothing Wrong With Us,3\n" "config classification: nothing-wrong,Nothing Wrong With Us,3\n"
"config classification: unknown,Unknown are we,3\n" "config classification: unknown,Unknown are we,3\n"
"config classification: bad-unknown,We think it's bad, 2\n"; "config classification: bad-unknown,We think it's bad, 2\n";
fd = SCFmemopen((void *)buffer, strlen(buffer), "r"); FILE *fd = SCFmemopen((void *)buffer, strlen(buffer), "r");
if (fd == NULL) if (fd == NULL)
SCLogDebug("Error with SCFmemopen() called by Classifiation Config test code"); SCLogDebug("Error with SCFmemopen() called by Classifiation Config test code");
return; return fd;
} }
/** /**
@ -593,7 +594,7 @@ void SCClassConfGenerateValidDummyClassConfigFD01(void)
* *
* \file_path Pointer to the file_path for the dummy classification file. * \file_path Pointer to the file_path for the dummy classification file.
*/ */
void SCClassConfGenerateInValidDummyClassConfigFD02(void) FILE *SCClassConfGenerateInValidDummyClassConfigFD02(void)
{ {
const char *buffer = const char *buffer =
"config classification: not-suspicious,Not Suspicious Traffic,3\n" "config classification: not-suspicious,Not Suspicious Traffic,3\n"
@ -604,11 +605,11 @@ void SCClassConfGenerateInValidDummyClassConfigFD02(void)
"config classification: policy-violation,Potential Corporate " "config classification: policy-violation,Potential Corporate "
"config classification: bamboola,Unknown Traffic,3\n"; "config classification: bamboola,Unknown Traffic,3\n";
fd = SCFmemopen((void *)buffer, strlen(buffer), "r"); FILE *fd = SCFmemopen((void *)buffer, strlen(buffer), "r");
if (fd == NULL) if (fd == NULL)
SCLogDebug("Error with SCFmemopen() called by Classifiation Config test code"); SCLogDebug("Error with SCFmemopen() called by Classifiation Config test code");
return; return fd;
} }
/** /**
@ -617,7 +618,7 @@ void SCClassConfGenerateInValidDummyClassConfigFD02(void)
* *
* \file_path Pointer to the file_path for the dummy classification file. * \file_path Pointer to the file_path for the dummy classification file.
*/ */
void SCClassConfGenerateInValidDummyClassConfigFD03(void) FILE *SCClassConfGenerateInValidDummyClassConfigFD03(void)
{ {
const char *buffer = const char *buffer =
"conig classification: not-suspicious,Not Suspicious Traffic,3\n" "conig classification: not-suspicious,Not Suspicious Traffic,3\n"
@ -625,26 +626,11 @@ void SCClassConfGenerateInValidDummyClassConfigFD03(void)
"config classification: _badunknown,Potentially Bad Traffic, 2\n" "config classification: _badunknown,Potentially Bad Traffic, 2\n"
"config classification: misc-activity,Misc activity,-1\n"; "config classification: misc-activity,Misc activity,-1\n";
fd = SCFmemopen((void *)buffer, strlen(buffer), "r"); FILE *fd = SCFmemopen((void *)buffer, strlen(buffer), "r");
if (fd == NULL) if (fd == NULL)
SCLogDebug("Error with SCFmemopen() called by Classifiation Config test code"); SCLogDebug("Error with SCFmemopen() called by Classifiation Config test code");
return; return fd;
}
/**
* \brief Deletes a file, whose path is specified as the argument.
*
* \file_path Pointer to the file_path that has to be deleted.
*/
void SCClassConfDeleteDummyClassificationConfigFD(void)
{
if (fd != NULL) {
fclose(fd);
fd = NULL;
}
return;
} }
/** /**
@ -659,9 +645,8 @@ int SCClassConfTest01(void)
if (de_ctx == NULL) if (de_ctx == NULL)
return result; return result;
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
if (de_ctx->class_conf_ht == NULL) if (de_ctx->class_conf_ht == NULL)
return result; return result;
@ -686,9 +671,8 @@ int SCClassConfTest02(void)
if (de_ctx == NULL) if (de_ctx == NULL)
return result; return result;
SCClassConfGenerateInValidDummyClassConfigFD03(); FILE *fd = SCClassConfGenerateInValidDummyClassConfigFD03();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
if (de_ctx->class_conf_ht == NULL) if (de_ctx->class_conf_ht == NULL)
return result; return result;
@ -712,9 +696,8 @@ int SCClassConfTest03(void)
if (de_ctx == NULL) if (de_ctx == NULL)
return result; return result;
SCClassConfGenerateInValidDummyClassConfigFD02(); FILE *fd = SCClassConfGenerateInValidDummyClassConfigFD02();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
if (de_ctx->class_conf_ht == NULL) if (de_ctx->class_conf_ht == NULL)
return result; return result;
@ -738,9 +721,8 @@ int SCClassConfTest04(void)
if (de_ctx == NULL) if (de_ctx == NULL)
return 0; return 0;
SCClassConfGenerateValidDummyClassConfigFD01(); FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
if (de_ctx->class_conf_ht == NULL) if (de_ctx->class_conf_ht == NULL)
return 0; return 0;
@ -772,9 +754,8 @@ int SCClassConfTest05(void)
if (de_ctx == NULL) if (de_ctx == NULL)
return 0; return 0;
SCClassConfGenerateInValidDummyClassConfigFD03(); FILE *fd = SCClassConfGenerateInValidDummyClassConfigFD03();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
if (de_ctx->class_conf_ht == NULL) if (de_ctx->class_conf_ht == NULL)
return 0; return 0;
@ -805,9 +786,8 @@ int SCClassConfTest06(void)
if (de_ctx == NULL) if (de_ctx == NULL)
return 0; return 0;
SCClassConfGenerateInValidDummyClassConfigFD02(); FILE *fd = SCClassConfGenerateInValidDummyClassConfigFD02();
SCClassConfLoadClassficationConfigFile(de_ctx); SCClassConfLoadClassficationConfigFile(de_ctx, fd);
SCClassConfDeleteDummyClassificationConfigFD();
if (de_ctx->class_conf_ht == NULL) if (de_ctx->class_conf_ht == NULL)
return 0; return 0;

9
src/util-classification-config.h
Unescape Escape View File

@ -45,16 +45,15 @@ typedef struct SCClassConfClasstype_ {
SCClassConfClasstype *SCClassConfAllocClasstype(uint8_t, const char *, SCClassConfClasstype *SCClassConfAllocClasstype(uint8_t, const char *,
const char *, int); const char *, int);
void SCClassConfDeAllocClasstype(SCClassConfClasstype *); void SCClassConfDeAllocClasstype(SCClassConfClasstype *);
void SCClassConfLoadClassficationConfigFile(DetectEngineCtx *); void SCClassConfLoadClassficationConfigFile(DetectEngineCtx *, FILE *fd);
SCClassConfClasstype *SCClassConfGetClasstype(const char *, SCClassConfClasstype *SCClassConfGetClasstype(const char *,
DetectEngineCtx *); DetectEngineCtx *);
void SCClassConfDeInitContext(DetectEngineCtx *); void SCClassConfDeInitContext(DetectEngineCtx *);
void SCClassConfRegisterTests(void); void SCClassConfRegisterTests(void);
/* for unittests */ /* for unittests */
void SCClassConfGenerateValidDummyClassConfigFD01(void); FILE *SCClassConfGenerateValidDummyClassConfigFD01(void);
void SCClassConfGenerateInValidDummyClassConfigFD02(void); FILE *SCClassConfGenerateInValidDummyClassConfigFD02(void);
void SCClassConfGenerateInValidDummyClassConfigFD03(void); FILE *SCClassConfGenerateInValidDummyClassConfigFD03(void);
void SCClassConfDeleteDummyClassificationConfigFD(void);
#endif /* __UTIL_CLASSIFICATION_CONFIG_H__ */ #endif /* __UTIL_CLASSIFICATION_CONFIG_H__ */

Write Preview
Loading…
Cancel
Save