|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
/* Copyright (C) 2007-2021 Open Information Security Foundation
|
|
|
|
|
/* Copyright (C) 2007-2022 Open Information Security Foundation
|
|
|
|
|
*
|
|
|
|
|
* You can copy, redistribute or modify this Program under the terms of
|
|
|
|
|
* the GNU General Public License version 2 as published by the Free
|
|
|
|
@ -29,92 +29,6 @@
|
|
|
|
|
#include "../detect.h"
|
|
|
|
|
#include "../detect-isdataat.h"
|
|
|
|
|
|
|
|
|
|
static int DetectEngineSMTPFiledataTest01(void)
|
|
|
|
|
{
|
|
|
|
|
uint8_t mimemsg[] = {0x4D, 0x49, 0x4D, 0x45, 0x2D, 0x56, 0x65, 0x72,
|
|
|
|
|
0x73, 0x69, 0x6F, 0x6E, 0x3A, 0x20, 0x31, 0x2E,
|
|
|
|
|
0x30, 0x0D, 0x0A, 0x43, 0x6F, 0x6E, 0x74, 0x65,
|
|
|
|
|
0x6E, 0x74, 0x2D, 0x54, 0x79, 0x70, 0x65, 0x3A,
|
|
|
|
|
0x20, 0x74, 0x65, 0x78, 0x74, 0x2F, 0x70, 0x6C,
|
|
|
|
|
0x61, 0x69, 0x6E, 0x3B, 0x20, 0x63, 0x68, 0x61,
|
|
|
|
|
0x72, 0x73, 0x65, 0x74, 0x3D, 0x55, 0x54, 0x46,
|
|
|
|
|
0x2D, 0x38, 0x3B, 0x0D, 0x0A, 0x43, 0x6F, 0x6E,
|
|
|
|
|
0x74, 0x65, 0x6E, 0x74, 0x2D, 0x54, 0x72, 0x61,
|
|
|
|
|
0x6E, 0x73, 0x66, 0x65, 0x72, 0x2D, 0x45, 0x6E,
|
|
|
|
|
0x63, 0x6F, 0x64, 0x69, 0x6E, 0x67, 0x3A, 0x20,
|
|
|
|
|
0x37, 0x62, 0x69, 0x74, 0x0D, 0x0A, 0x43, 0x6F,
|
|
|
|
|
0x6E, 0x74, 0x65, 0x6E, 0x74, 0x2D, 0x44, 0x69,
|
|
|
|
|
0x73, 0x70, 0x6F, 0x73, 0x69, 0x74, 0x69, 0x6F,
|
|
|
|
|
0x6E, 0x3A, 0x20, 0x61, 0x74, 0x74, 0x61, 0x63,
|
|
|
|
|
0x68, 0x6D, 0x65, 0x6E, 0x74, 0x3B, 0x20, 0x66,
|
|
|
|
|
0x69, 0x6C, 0x65, 0x6E, 0x61, 0x6D, 0x65, 0x3D,
|
|
|
|
|
0x22, 0x74, 0x65, 0x73, 0x74, 0x2E, 0x74, 0x78,
|
|
|
|
|
0x74, 0x22, 0x0D, 0x0A, 0x0D, 0x0A, 0x6d, 0x65,
|
|
|
|
|
0x73, 0x73, 0x61, 0x67, 0x65,};
|
|
|
|
|
uint32_t mimemsg_len = sizeof(mimemsg) - 1;
|
|
|
|
|
TcpSession ssn;
|
|
|
|
|
Packet *p;
|
|
|
|
|
ThreadVars th_v;
|
|
|
|
|
DetectEngineThreadCtx *det_ctx = NULL;
|
|
|
|
|
Flow f;
|
|
|
|
|
|
|
|
|
|
AppLayerParserThreadCtx *alp_tctx = AppLayerParserThreadCtxAlloc();
|
|
|
|
|
|
|
|
|
|
memset(&th_v, 0, sizeof(th_v));
|
|
|
|
|
memset(&f, 0, sizeof(f));
|
|
|
|
|
memset(&ssn, 0, sizeof(ssn));
|
|
|
|
|
|
|
|
|
|
p = UTHBuildPacket(NULL, 0, IPPROTO_TCP);
|
|
|
|
|
|
|
|
|
|
FLOW_INITIALIZE(&f);
|
|
|
|
|
f.protoctx = (void *)&ssn;
|
|
|
|
|
f.proto = IPPROTO_TCP;
|
|
|
|
|
f.flags |= FLOW_IPV4;
|
|
|
|
|
f.alstate = SMTPStateAlloc(NULL, ALPROTO_UNKNOWN);
|
|
|
|
|
|
|
|
|
|
MimeDecParseState *state = MimeDecInitParser(&f, NULL);
|
|
|
|
|
((MimeDecEntity *)state->stack->top->data)->ctnt_flags = CTNT_IS_ATTACHMENT;
|
|
|
|
|
state->body_begin = 1;
|
|
|
|
|
|
|
|
|
|
FAIL_IF(SMTPProcessDataChunk((uint8_t *)mimemsg, sizeof(mimemsg), state) != 0);
|
|
|
|
|
|
|
|
|
|
p->flow = &f;
|
|
|
|
|
p->flowflags |= FLOW_PKT_TOSERVER;
|
|
|
|
|
p->flowflags |= FLOW_PKT_ESTABLISHED;
|
|
|
|
|
p->flags |= PKT_HAS_FLOW|PKT_STREAM_EST|PKT_STREAM_EOF;
|
|
|
|
|
f.alproto = ALPROTO_SMTP;
|
|
|
|
|
|
|
|
|
|
StreamTcpInitConfig(true);
|
|
|
|
|
|
|
|
|
|
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
|
|
|
|
|
FAIL_IF_NULL(de_ctx);
|
|
|
|
|
de_ctx->flags |= DE_QUIET;
|
|
|
|
|
|
|
|
|
|
Signature *s = DetectEngineAppendSig(de_ctx, "alert smtp any any -> any any "
|
|
|
|
|
"(msg:\"file_data smtp test\"; "
|
|
|
|
|
"file_data; content:\"message\"; sid:1;)");
|
|
|
|
|
FAIL_IF_NULL(s);
|
|
|
|
|
|
|
|
|
|
SigGroupBuild(de_ctx);
|
|
|
|
|
DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
|
|
|
|
|
|
|
|
|
|
int r = AppLayerParserParse(NULL, alp_tctx, &f, ALPROTO_SMTP,
|
|
|
|
|
STREAM_TOSERVER | STREAM_START | STREAM_EOF, mimemsg, mimemsg_len);
|
|
|
|
|
FAIL_IF_NOT(r == 0);
|
|
|
|
|
FAIL_IF_NULL(f.alstate);
|
|
|
|
|
|
|
|
|
|
/* do detect */
|
|
|
|
|
SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
|
|
|
|
|
FAIL_IF_NOT(PacketAlertCheck(p, 1));
|
|
|
|
|
|
|
|
|
|
AppLayerParserThreadCtxFree(alp_tctx);
|
|
|
|
|
DetectEngineCtxFree(de_ctx);
|
|
|
|
|
StreamTcpFreeConfig(true);
|
|
|
|
|
FLOW_DESTROY(&f);
|
|
|
|
|
UTHFreePackets(&p, 1);
|
|
|
|
|
PASS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int DetectEngineSMTPFiledataTest02(void)
|
|
|
|
|
{
|
|
|
|
|
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
|
|
|
|
@ -131,80 +45,6 @@ static int DetectEngineSMTPFiledataTest02(void)
|
|
|
|
|
PASS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int DetectEngineSMTPFiledataTest03(void)
|
|
|
|
|
{
|
|
|
|
|
uint8_t mimemsg1[] = {0x65, 0x76,};
|
|
|
|
|
uint8_t mimemsg2[] = {0x69, 0x6C,};
|
|
|
|
|
uint32_t mimemsg1_len = sizeof(mimemsg1) - 1;
|
|
|
|
|
uint32_t mimemsg2_len = sizeof(mimemsg2) - 1;
|
|
|
|
|
TcpSession ssn;
|
|
|
|
|
Packet *p;
|
|
|
|
|
ThreadVars th_v;
|
|
|
|
|
DetectEngineThreadCtx *det_ctx = NULL;
|
|
|
|
|
Flow f;
|
|
|
|
|
|
|
|
|
|
AppLayerParserThreadCtx *alp_tctx = AppLayerParserThreadCtxAlloc();
|
|
|
|
|
|
|
|
|
|
memset(&th_v, 0, sizeof(th_v));
|
|
|
|
|
memset(&f, 0, sizeof(f));
|
|
|
|
|
memset(&ssn, 0, sizeof(ssn));
|
|
|
|
|
|
|
|
|
|
p = UTHBuildPacket(NULL, 0, IPPROTO_TCP);
|
|
|
|
|
|
|
|
|
|
FLOW_INITIALIZE(&f);
|
|
|
|
|
f.protoctx = (void *)&ssn;
|
|
|
|
|
f.proto = IPPROTO_TCP;
|
|
|
|
|
f.flags |= FLOW_IPV4;
|
|
|
|
|
f.alstate = SMTPStateAlloc(NULL, ALPROTO_UNKNOWN);
|
|
|
|
|
|
|
|
|
|
MimeDecParseState *state = MimeDecInitParser(&f, NULL);
|
|
|
|
|
((MimeDecEntity *)state->stack->top->data)->ctnt_flags = CTNT_IS_ATTACHMENT;
|
|
|
|
|
state->body_begin = 1;
|
|
|
|
|
|
|
|
|
|
FAIL_IF(SMTPProcessDataChunk((uint8_t *)mimemsg1, sizeof(mimemsg1), state) != 0);
|
|
|
|
|
FAIL_IF(SMTPProcessDataChunk((uint8_t *)mimemsg2, sizeof(mimemsg2), state) != 0);
|
|
|
|
|
|
|
|
|
|
p->flow = &f;
|
|
|
|
|
p->flowflags |= FLOW_PKT_TOSERVER;
|
|
|
|
|
p->flowflags |= FLOW_PKT_ESTABLISHED;
|
|
|
|
|
p->flags |= PKT_HAS_FLOW|PKT_STREAM_EST;
|
|
|
|
|
f.alproto = ALPROTO_SMTP;
|
|
|
|
|
|
|
|
|
|
StreamTcpInitConfig(true);
|
|
|
|
|
|
|
|
|
|
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
|
|
|
|
|
FAIL_IF_NULL(de_ctx);
|
|
|
|
|
de_ctx->flags |= DE_QUIET;
|
|
|
|
|
|
|
|
|
|
Signature *s = DetectEngineAppendSig(de_ctx, "alert smtp any any -> any any "
|
|
|
|
|
"(msg:\"file_data smtp test\"; "
|
|
|
|
|
"file_data; content:\"evil\"; sid:1;)");
|
|
|
|
|
FAIL_IF_NULL(s);
|
|
|
|
|
|
|
|
|
|
SigGroupBuild(de_ctx);
|
|
|
|
|
DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
|
|
|
|
|
|
|
|
|
|
int r = AppLayerParserParse(
|
|
|
|
|
NULL, alp_tctx, &f, ALPROTO_SMTP, STREAM_TOSERVER, mimemsg1, mimemsg1_len);
|
|
|
|
|
FAIL_IF_NOT(r == 0);
|
|
|
|
|
r = AppLayerParserParse(NULL, alp_tctx, &f, ALPROTO_SMTP,
|
|
|
|
|
STREAM_TOSERVER, mimemsg2, mimemsg2_len);
|
|
|
|
|
FAIL_IF_NOT(r == 0);
|
|
|
|
|
FAIL_IF_NULL(f.alstate);
|
|
|
|
|
|
|
|
|
|
/* do detect */
|
|
|
|
|
SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
|
|
|
|
|
|
|
|
|
|
FAIL_IF(PacketAlertCheck(p, 1));
|
|
|
|
|
|
|
|
|
|
AppLayerParserThreadCtxFree(alp_tctx);
|
|
|
|
|
DetectEngineCtxFree(de_ctx);
|
|
|
|
|
StreamTcpFreeConfig(true);
|
|
|
|
|
FLOW_DESTROY(&f);
|
|
|
|
|
UTHFreePackets(&p, 1);
|
|
|
|
|
PASS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int DetectFiledataParseTest01(void)
|
|
|
|
|
{
|
|
|
|
|
DetectEngineCtx *de_ctx = DetectEngineCtxInit();
|
|
|
|
@ -337,12 +177,8 @@ static int DetectFiledataIsdataatParseTest2(void)
|
|
|
|
|
|
|
|
|
|
void DetectFiledataRegisterTests(void)
|
|
|
|
|
{
|
|
|
|
|
UtRegisterTest("DetectEngineSMTPFiledataTest01",
|
|
|
|
|
DetectEngineSMTPFiledataTest01);
|
|
|
|
|
UtRegisterTest("DetectEngineSMTPFiledataTest02",
|
|
|
|
|
DetectEngineSMTPFiledataTest02);
|
|
|
|
|
UtRegisterTest("DetectEngineSMTPFiledataTest03",
|
|
|
|
|
DetectEngineSMTPFiledataTest03);
|
|
|
|
|
|
|
|
|
|
UtRegisterTest("DetectFiledataParseTest01", DetectFiledataParseTest01);
|
|
|
|
|
UtRegisterTest("DetectFiledataParseTest02", DetectFiledataParseTest02);
|
|
|
|
|