smb: remove C implementation

Now that Rust is mandatory it is obsolete.

Ticket: #2849
pull/3802/head
Victor Julien 6 years ago
parent 8a2b94c6f4
commit f30c05e684

@ -38,8 +38,6 @@ app-layer-htp-xff.c app-layer-htp-xff.h \
app-layer-modbus.c app-layer-modbus.h \
app-layer-parser.c app-layer-parser.h \
app-layer-protos.c app-layer-protos.h \
app-layer-smb2.c app-layer-smb2.h \
app-layer-smb.c app-layer-smb.h \
app-layer-smb-tcp-rust.c app-layer-smb-tcp-rust.h \
app-layer-smtp.c app-layer-smtp.h \
app-layer-nfs-tcp.c app-layer-nfs-tcp.h \

@ -843,8 +843,6 @@ static void AppLayerProtoDetectPrintProbingParsers(AppLayerProtoDetectProbingPar
printf(" alproto: ALPROTO_JABBER\n");
else if (pp_pe->alproto == ALPROTO_SMB)
printf(" alproto: ALPROTO_SMB\n");
else if (pp_pe->alproto == ALPROTO_SMB2)
printf(" alproto: ALPROTO_SMB2\n");
else if (pp_pe->alproto == ALPROTO_DCERPC)
printf(" alproto: ALPROTO_DCERPC\n");
else if (pp_pe->alproto == ALPROTO_IRC)
@ -916,8 +914,6 @@ static void AppLayerProtoDetectPrintProbingParsers(AppLayerProtoDetectProbingPar
printf(" alproto: ALPROTO_JABBER\n");
else if (pp_pe->alproto == ALPROTO_SMB)
printf(" alproto: ALPROTO_SMB\n");
else if (pp_pe->alproto == ALPROTO_SMB2)
printf(" alproto: ALPROTO_SMB2\n");
else if (pp_pe->alproto == ALPROTO_DCERPC)
printf(" alproto: ALPROTO_DCERPC\n");
else if (pp_pe->alproto == ALPROTO_IRC)
@ -2470,7 +2466,7 @@ static int AppLayerProtoDetectTest09(void)
f.protomap = FlowGetProtoMapping(IPPROTO_TCP);
const char *buf = "|fe|SMB";
AppLayerProtoDetectPMRegisterPatternCS(IPPROTO_TCP, ALPROTO_SMB2, buf, 8, 4, STREAM_TOCLIENT);
AppLayerProtoDetectPMRegisterPatternCS(IPPROTO_TCP, ALPROTO_SMB, buf, 8, 4, STREAM_TOCLIENT);
AppLayerProtoDetectPrepareState();
/* AppLayerProtoDetectGetCtxThread() should be called post AppLayerProtoDetectPrepareState(), since
@ -2482,14 +2478,14 @@ static int AppLayerProtoDetectTest09(void)
FAIL_IF(alpd_ctx.ctx_ipp[FLOW_PROTO_TCP].ctx_pm[1].max_pat_id != 1);
FAIL_IF(alpd_ctx.ctx_ipp[FLOW_PROTO_TCP].ctx_pm[0].map != NULL);
FAIL_IF(alpd_ctx.ctx_ipp[FLOW_PROTO_TCP].ctx_pm[1].map == NULL);
FAIL_IF(alpd_ctx.ctx_ipp[FLOW_PROTO_TCP].ctx_pm[1].map[0]->alproto != ALPROTO_SMB2);
FAIL_IF(alpd_ctx.ctx_ipp[FLOW_PROTO_TCP].ctx_pm[1].map[0]->alproto != ALPROTO_SMB);
bool rdir = false;
uint32_t cnt = AppLayerProtoDetectPMGetProto(alpd_tctx,
&f, l7data, sizeof(l7data), STREAM_TOCLIENT,
pm_results, &rdir);
FAIL_IF(cnt != 1);
FAIL_IF(pm_results[0] != ALPROTO_SMB2);
FAIL_IF(pm_results[0] != ALPROTO_SMB);
AppLayerProtoDetectDestroyCtxThread(alpd_tctx);
AppLayerProtoDetectDeSetup();

@ -46,10 +46,9 @@
#include "app-layer.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "app-layer-smb.h"
#include "app-layer-smb2.h"
#include "app-layer-dcerpc.h"
#include "app-layer-dcerpc-udp.h"
#include "app-layer-smb-tcp-rust.h"
#include "app-layer-htp.h"
#include "app-layer-ftp.h"
#include "app-layer-ssl.h"
@ -1481,11 +1480,9 @@ void AppLayerParserRegisterProtocolParsers(void)
RegisterHTPParsers();
RegisterSSLParsers();
RegisterSMBParsers();
/** \todo bug 719 */
//RegisterSMB2Parsers();
RegisterDCERPCParsers();
RegisterDCERPCUDPParsers();
RegisterRustSMBTCPParsers();
RegisterFTPParsers();
RegisterSSHParsers();
RegisterSMTPParsers();

@ -60,9 +60,6 @@ const char *AppProtoToString(AppProto alproto)
case ALPROTO_SMB:
proto_name = "smb";
break;
case ALPROTO_SMB2:
proto_name = "smb2";
break;
case ALPROTO_DCERPC:
proto_name = "dcerpc";
break;
@ -135,7 +132,6 @@ AppProto StringToAppProto(const char *proto_name)
if (strcmp(proto_name,"msn")==0) return ALPROTO_MSN;
if (strcmp(proto_name,"jabber")==0) return ALPROTO_JABBER;
if (strcmp(proto_name,"smb")==0) return ALPROTO_SMB;
if (strcmp(proto_name,"smb2")==0) return ALPROTO_SMB2;
if (strcmp(proto_name,"dcerpc")==0) return ALPROTO_DCERPC;
if (strcmp(proto_name,"irc")==0) return ALPROTO_IRC;
if (strcmp(proto_name,"dns")==0) return ALPROTO_DNS;

@ -36,7 +36,6 @@ enum AppProtoEnum {
ALPROTO_MSN,
ALPROTO_JABBER,
ALPROTO_SMB,
ALPROTO_SMB2,
ALPROTO_DCERPC,
ALPROTO_IRC,

File diff suppressed because it is too large Load Diff

@ -1,171 +0,0 @@
/* Copyright (C) 2007-2010 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
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author Kirby Kuehl <kkuehl@gmail.com>
*/
#ifndef __APP_LAYER_SMB_H__
#define __APP_LAYER_SMB_H__
#include "suricata-common.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "flow.h"
#include "stream.h"
#include "app-layer-nbss.h"
#include "app-layer-dcerpc-common.h"
#include "app-layer-dcerpc.h"
#ifndef HAVE_RUST
typedef struct SMBHdr_ {
uint8_t protocol[4];
uint8_t command;
uint32_t status;
uint8_t flags;
uint16_t flags2;
uint16_t pidhigh;
uint64_t securitysignature;
uint16_t unused;
uint16_t tid;
uint16_t pid;
uint16_t uid;
uint16_t mid;
} SMBHdr;
#define SMB_HDR_LEN 32
#define MINIMUM_SMB_LEN 35
#define NBSS_SMB_HDRS_LEN 36
typedef struct SMBWordCount_ {
uint8_t wordcount;
uint8_t wordcountleft;
uint8_t *words;
} SMBWordCount;
typedef struct SMBByteCount_ {
uint8_t bytecountbytes;
uint16_t bytecount;
uint16_t bytecountleft;
uint8_t *bytes;
} SMBByteCount;
typedef struct SMBAndX_ {
uint8_t isandx;
uint8_t paddingparsed;
uint8_t andxcommand;
uint8_t maxchainedandx;
uint16_t andxoffset;
uint16_t andxbytesprocessed;
uint16_t datalength;
uint16_t datalengthhigh;
uint64_t dataoffset;
} SMBAndX;
typedef struct SMBState_ {
NBSSHdr nbss;
uint16_t transaction_id;
uint16_t bytesprocessed;
SMBHdr smb;
SMBWordCount wordcount;
SMBByteCount bytecount;
SMBAndX andx;
DCERPCState ds;
uint8_t dcerpc_present;
uint8_t data_needed_for_dir;
} SMBState;
#define SMB_FLAGS_SERVER_TO_REDIR 0x80
#define SMB_NO_SECONDARY_ANDX_COMMAND 0xff
/* http://msdn.microsoft.com/en-us/library/dd327674.aspx */
#define SMB_COM_CREATE_DIRECTORY 0x00
#define SMB_COM_DELETE_DIRECTORY 0x01
#define SMB_COM_OPEN 0x02
#define SMB_COM_CREATE 0x03
#define SMB_COM_CLOSE 0x04
#define SMB_COM_FLUSH 0x05
#define SMB_COM_DELETE 0x06
#define SMB_COM_RENAME 0x07
#define SMB_COM_QUERY_INFORMATION 0x08
#define SMB_COM_SET_INFORMATION 0x09
#define SMB_COM_READ 0x0A
#define SMB_COM_WRITE 0x0B
#define SMB_COM_LOCK_BYTE_RANGE 0x0C
#define SMB_COM_UNLOCK_BYTE_RANGE 0x0D
#define SMB_COM_CREATE_TEMPORARY 0x0E
#define SMB_COM_CREATE_NEW 0x0F
#define SMB_COM_CHECK_DIRECTORY 0x10
#define SMB_COM_PROCESS_EXIT 0x11
#define SMB_COM_SEEK 0x12
#define SMB_COM_LOCK_AND_READ 0x13
#define SMB_COM_WRITE_AND_UNLOCK 0x14
#define SMB_COM_READ_RAW 0x1A
#define SMB_COM_READ_MPX 0x1B
#define SMB_COM_READ_MPX_SECONDARY 0x1C
#define SMB_COM_WRITE_RAW 0x1D
#define SMB_COM_WRITE_MPX 0x1E
#define SMB_COM_WRITE_COMPLETE 0x20
#define SMB_COM_SET_INFORMATION2 0x22
#define SMB_COM_QUERY_INFORMATION2 0x23
#define SMB_COM_LOCKING_ANDX 0x24
#define SMB_COM_TRANSACTION 0x25
#define SMB_COM_TRANSACTION_SECONDARY 0x26
#define SMB_COM_IOCTL 0x27
#define SMB_COM_IOCTL_SECONDARY 0x28
#define SMB_COM_COPY 0x29
#define SMB_COM_MOVE 0x2A
#define SMB_COM_ECHO 0x2B
#define SMB_COM_WRITE_AND_CLOSE 0x2C
#define SMB_COM_OPEN_ANDX 0x2D
#define SMB_COM_READ_ANDX 0x2E
#define SMB_COM_WRITE_ANDX 0x2F
#define SMB_COM_CLOSE_AND_TREE_DISC 0x31
#define SMB_COM_TRANSACTION2 0x32
#define SMB_COM_TRANSACTION2_SECONDARY 0x33
#define SMB_COM_FIND_CLOSE2 0x34
#define SMB_COM_FIND_NOTIFY_CLOSE 0x35
#define SMB_COM_TREE_CONNECT 0x70
#define SMB_COM_TREE_DISCONNECT 0x71
#define SMB_COM_NEGOTIATE 0x72
#define SMB_COM_SESSION_SETUP_ANDX 0x73
#define SMB_COM_LOGOFF_ANDX 0x74
#define SMB_COM_TREE_CONNECT_ANDX 0x75
#define SMB_COM_QUERY_INFORMATION_DISK 0x80
#define SMB_COM_SEARCH 0x81
#define SMB_COM_FIND 0x82
#define SMB_COM_FIND_UNIQUE 0x83
#define SMB_COM_NT_TRANSACT 0xA0
#define SMB_COM_NT_TRANSACT_SECONDARY 0xA1
#define SMB_COM_NT_CREATE_ANDX 0xA2
#define SMB_COM_NT_CANCEL 0xA4
#define SMB_COM_NT_RENAME 0xA5
#define SMB_COM_OPEN_PRINT_FILE 0xC0
#define SMB_COM_WRITE_PRINT_FILE 0xC1
#define SMB_COM_CLOSE_PRINT_FILE 0xC2
#define SMB_COM_GET_PRINT_QUEUE 0xC3
int isAndX(SMBState *smb_state);
#endif /* HAVE_RUST */
void RegisterSMBParsers(void);
void SMBParserRegisterTests(void);
#endif /* __APP_LAYER_SMB_H__ */

@ -1,692 +0,0 @@
/* Copyright (C) 2007-2010 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
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author Kirby Kuehl <kkuehl@gmail.com>
*
* SMBv2 parser/decoder
*/
#include "suricata-common.h"
#include "debug.h"
#include "decode.h"
#include "threads.h"
#include "util-print.h"
#include "util-pool.h"
#include "stream-tcp-private.h"
#include "stream-tcp-reassemble.h"
#include "stream-tcp.h"
#include "stream.h"
#include "app-layer.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "util-spm.h"
#include "util-unittest.h"
#include "util-debug.h"
#include "util-memcmp.h"
#include "app-layer-smb2.h"
enum {
SMB2_FIELD_NONE = 0,
SMB2_PARSE_NBSS_HEADER,
SMB2_PARSE_SMB_HEADER,
/* must be last */
SMB_FIELD_MAX,
};
static uint32_t NBSSParseHeader(void *smb2_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len)
{
SCEnter();
SMB2State *sstate = (SMB2State *) smb2_state;
uint8_t *p = input;
if (input_len && sstate->bytesprocessed < NBSS_HDR_LEN - 1) {
switch (sstate->bytesprocessed) {
case 0:
/* Initialize */
if (input_len >= NBSS_HDR_LEN) {
sstate->nbss.type = *p;
sstate->nbss.length = (*(p + 1) & 0x01) << 16;
sstate->nbss.length |= *(p + 2) << 8;
sstate->nbss.length |= *(p + 3);
sstate->bytesprocessed += NBSS_HDR_LEN;
SCReturnUInt(4U);
} else {
sstate->nbss.type = *(p++);
if (!(--input_len))
break;
}
/* fall through */
case 1:
sstate->nbss.length = (*(p++) & 0x01) << 16;
if (!(--input_len))
break;
/* fall through */
case 2:
sstate->nbss.length |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 3:
sstate->nbss.length |= *(p++);
--input_len;
break;
}
sstate->bytesprocessed += (p - input);
}
SCReturnUInt((uint32_t)(p - input));
}
static uint32_t SMB2ParseHeader(void *smb2_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len)
{
SCEnter();
SMB2State *sstate = (SMB2State *) smb2_state;
uint8_t *p = input;
if (input_len) {
switch (sstate->bytesprocessed) {
case 4:
// fallthrough
/* above statement to prevent coverity FPs from the switch
* fall through */
if (input_len >= SMB2_HDR_LEN) {
if (SCMemcmp(p, "\xfe\x53\x4d\x42", 4) != 0) {
//printf("SMB2 Header did not validate\n");
return 0;
}
sstate->smb2.StructureSize = *(p + 4);
sstate->smb2.StructureSize |= *(p + 5) << 8;
sstate->smb2.CreditCharge = *(p + 6);
sstate->smb2.CreditCharge |= *(p + 7) << 8;
sstate->smb2.Status = *(p + 8);
sstate->smb2.Status |= *(p + 9) << 8;
sstate->smb2.Status |= *(p + 10) << 16;
sstate->smb2.Status |= *(p + 11) << 24;
sstate->smb2.Command = *(p + 12);
sstate->smb2.Command |= *(p + 13) << 8;
sstate->smb2.CreditRequestResponse = *(p + 14);
sstate->smb2.CreditRequestResponse |= *(p + 15) << 8;
sstate->smb2.Flags = *(p + 16);
sstate->smb2.Flags |= *(p + 17) << 8;
sstate->smb2.Flags |= *(p + 18) << 16;
sstate->smb2.Flags |= *(p + 19) << 24;
sstate->smb2.NextCommand = *(p + 20);
sstate->smb2.NextCommand |= *(p + 21) << 8;
sstate->smb2.NextCommand |= *(p + 22) << 16;
sstate->smb2.NextCommand |= *(p + 23) << 24;
sstate->smb2.MessageId = *(p + 24);
sstate->smb2.MessageId |= *(p + 25) << 8;
sstate->smb2.MessageId |= *(p + 26) << 16;
sstate->smb2.MessageId |= (uint64_t) *(p + 27) << 24;
sstate->smb2.MessageId |= (uint64_t) *(p + 28) << 32;
sstate->smb2.MessageId |= (uint64_t) *(p + 29) << 40;
sstate->smb2.MessageId |= (uint64_t) *(p + 30) << 48;
sstate->smb2.MessageId |= (uint64_t) *(p + 31) << 56;
sstate->smb2.ProcessId = *(p + 32);
sstate->smb2.ProcessId |= *(p + 33) << 8;
sstate->smb2.ProcessId |= *(p + 34) << 16;
sstate->smb2.ProcessId |= *(p + 35) << 24;
sstate->smb2.TreeId = *(p + 36);
sstate->smb2.TreeId |= *(p + 37) << 8;
sstate->smb2.TreeId |= *(p + 38) << 16;
sstate->smb2.TreeId |= *(p + 39) << 24;
sstate->smb2.SessionId = *(p + 40);
sstate->smb2.SessionId |= *(p + 41) << 8;
sstate->smb2.SessionId |= *(p + 42) << 16;
sstate->smb2.SessionId |= (uint64_t) *(p + 43) << 24;
sstate->smb2.SessionId |= (uint64_t) *(p + 44) << 32;
sstate->smb2.SessionId |= (uint64_t) *(p + 45) << 40;
sstate->smb2.SessionId |= (uint64_t) *(p + 46) << 48;
sstate->smb2.SessionId |= (uint64_t) *(p + 47) << 56;
sstate->smb2.Signature[0] = *(p + 48);
sstate->smb2.Signature[1] = *(p + 49);
sstate->smb2.Signature[2] = *(p + 50);
sstate->smb2.Signature[3] = *(p + 51);
sstate->smb2.Signature[4] = *(p + 52);
sstate->smb2.Signature[5] = *(p + 53);
sstate->smb2.Signature[6] = *(p + 54);
sstate->smb2.Signature[7] = *(p + 55);
sstate->smb2.Signature[8] = *(p + 56);
sstate->smb2.Signature[9] = *(p + 57);
sstate->smb2.Signature[10] = *(p + 58);
sstate->smb2.Signature[11] = *(p + 59);
sstate->smb2.Signature[12] = *(p + 60);
sstate->smb2.Signature[13] = *(p + 61);
sstate->smb2.Signature[14] = *(p + 62);
sstate->smb2.Signature[15] = *(p + 63);
sstate->bytesprocessed += SMB2_HDR_LEN;
SCReturnUInt(64U);
break;
} else {
//sstate->smb2.protocol[0] = *(p++);
if (*(p++) != 0xfe)
return 0;
if (!(--input_len))
break;
/* We fall through to the next case if we still have input.
* Same applies for other cases as well */
}
/* fall through */
case 5:
//sstate->smb2.protocol[1] = *(p++);
if (*(p++) != 'S')
return 0;
if (!(--input_len))
break;
/* fall through */
case 6:
//sstate->smb2.protocol[2] = *(p++);
if (*(p++) != 'M')
return 0;
if (!(--input_len))
break;
/* fall through */
case 7:
//sstate->smb2.protocol[3] = *(p++);
if (*(p++) != 'B')
return 0;
if (!(--input_len))
break;
/* fall through */
case 8:
sstate->smb2.StructureSize = *(p++);
if (!(--input_len))
break;
/* fall through */
case 9:
sstate->smb2.StructureSize |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 10:
sstate->smb2.CreditCharge = *(p++);
if (!(--input_len))
break;
/* fall through */
case 11:
sstate->smb2.CreditCharge |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 12:
sstate->smb2.Status = *(p++);
if (!(--input_len))
break;
/* fall through */
case 13:
sstate->smb2.Status |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 14:
sstate->smb2.Status |= *(p++) << 16;
if (!(--input_len))
break;
/* fall through */
case 15:
sstate->smb2.Status |= *(p++) << 24;
if (!(--input_len))
break;
/* fall through */
case 16:
sstate->smb2.Command = *(p++);
if (!(--input_len))
break;
/* fall through */
case 17:
sstate->smb2.Command |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 18:
sstate->smb2.CreditRequestResponse = *(p++);
if (!(--input_len))
break;
/* fall through */
case 19:
sstate->smb2.CreditRequestResponse |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 20:
sstate->smb2.Flags = *(p++);
if (!(--input_len))
break;
/* fall through */
case 21:
sstate->smb2.Flags |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 22:
sstate->smb2.Flags |= *(p++) << 16;
if (!(--input_len))
break;
/* fall through */
case 23:
sstate->smb2.Flags |= *(p++) << 24;
if (!(--input_len))
break;
/* fall through */
case 24:
sstate->smb2.NextCommand = *(p++);
if (!(--input_len))
break;
/* fall through */
case 25:
sstate->smb2.NextCommand |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 26:
sstate->smb2.NextCommand |= *(p++) << 16;
if (!(--input_len))
break;
/* fall through */
case 27:
sstate->smb2.NextCommand |= *(p++) << 24;
if (!(--input_len))
break;
/* fall through */
case 28:
sstate->smb2.MessageId = *(p++);
if (!(--input_len))
break;
/* fall through */
case 29:
sstate->smb2.MessageId = *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 30:
sstate->smb2.MessageId = *(p++) << 16;
if (!(--input_len))
break;
/* fall through */
case 31:
sstate->smb2.MessageId = (uint64_t) *(p++) << 24;
if (!(--input_len))
break;
/* fall through */
case 32:
sstate->smb2.MessageId = (uint64_t) *(p++) << 32;
if (!(--input_len))
break;
/* fall through */
case 33:
sstate->smb2.MessageId = (uint64_t) *(p++) << 40;
if (!(--input_len))
break;
/* fall through */
case 34:
sstate->smb2.MessageId = (uint64_t) *(p++) << 48;
if (!(--input_len))
break;
/* fall through */
case 35:
sstate->smb2.MessageId = (uint64_t) *(p++) << 56;
if (!(--input_len))
break;
/* fall through */
case 36:
sstate->smb2.ProcessId = *(p++);
if (!(--input_len))
break;
/* fall through */
case 37:
sstate->smb2.ProcessId |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 38:
sstate->smb2.ProcessId |= *(p++) << 16;
if (!(--input_len))
break;
/* fall through */
case 39:
sstate->smb2.ProcessId |= *(p++) << 24;
if (!(--input_len))
break;
/* fall through */
case 40:
sstate->smb2.TreeId = *(p++);
if (!(--input_len))
break;
/* fall through */
case 41:
sstate->smb2.TreeId |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 42:
sstate->smb2.TreeId |= *(p++) << 16;
if (!(--input_len))
break;
/* fall through */
case 43:
sstate->smb2.TreeId |= *(p++) << 24;
if (!(--input_len))
break;
/* fall through */
case 44:
sstate->smb2.SessionId = *(p++);
if (!(--input_len))
break;
/* fall through */
case 45:
sstate->smb2.SessionId |= *(p++) << 8;
if (!(--input_len))
break;
/* fall through */
case 46:
sstate->smb2.SessionId |= *(p++) << 16;
if (!(--input_len))
break;
/* fall through */
case 47:
sstate->smb2.SessionId |= (uint64_t) *(p++) << 24;
if (!(--input_len))
break;
/* fall through */
case 48:
sstate->smb2.SessionId |= (uint64_t) *(p++) << 32;
if (!(--input_len))
break;
/* fall through */
case 49:
sstate->smb2.SessionId |= (uint64_t) *(p++) << 40;
if (!(--input_len))
break;
/* fall through */
case 50:
sstate->smb2.SessionId |= (uint64_t) *(p++) << 48;
if (!(--input_len))
break;
/* fall through */
case 51:
sstate->smb2.SessionId |= (uint64_t) *(p++) << 56;
if (!(--input_len))
break;
/* fall through */
case 52:
sstate->smb2.Signature[0] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 53:
sstate->smb2.Signature[1] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 54:
sstate->smb2.Signature[2] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 55:
sstate->smb2.Signature[3] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 56:
sstate->smb2.Signature[4] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 57:
sstate->smb2.Signature[5] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 58:
sstate->smb2.Signature[6] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 59:
sstate->smb2.Signature[7] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 60:
sstate->smb2.Signature[8] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 61:
sstate->smb2.Signature[9] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 62:
sstate->smb2.Signature[10] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 63:
sstate->smb2.Signature[11] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 64:
sstate->smb2.Signature[12] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 65:
sstate->smb2.Signature[13] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 66:
sstate->smb2.Signature[14] = *(p++);
if (!(--input_len))
break;
/* fall through */
case 67:
sstate->smb2.Signature[15] = *(p++);
--input_len;
break;
/* fall through */
}
}
sstate->bytesprocessed += (p - input);
SCReturnUInt((uint32_t)(p - input));
}
static int SMB2Parse(Flow *f, void *smb2_state, AppLayerParserState *pstate,
uint8_t *input, uint32_t input_len,
void *local_data, const uint8_t flags)
{
SCEnter();
SMB2State *sstate = (SMB2State *) smb2_state;
uint32_t retval = 0;
uint32_t parsed = 0;
if (pstate == NULL)
return -1;
if (input == NULL && AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF)) {
SCReturnInt(1);
} else if (input == NULL || input_len == 0) {
SCReturnInt(-1);
}
while (sstate->bytesprocessed < NBSS_HDR_LEN && input_len) {
retval = NBSSParseHeader(smb2_state, pstate, input, input_len);
if (retval <= input_len) {
parsed += retval;
input_len -= retval;
} else {
return -1;
}
SCLogDebug("NBSS Header (%u/%u) Type 0x%02x Length 0x%04x parsed %u input_len %u",
sstate->bytesprocessed, NBSS_HDR_LEN, sstate->nbss.type,
sstate->nbss.length, parsed, input_len);
}
switch(sstate->nbss.type) {
case NBSS_SESSION_MESSAGE:
while (input_len && (sstate->bytesprocessed >= NBSS_HDR_LEN &&
sstate->bytesprocessed < NBSS_HDR_LEN + SMB2_HDR_LEN)) {
retval = SMB2ParseHeader(smb2_state, pstate, input + parsed, input_len);
if (retval <= input_len) {
parsed += retval;
input_len -= retval;
} else {
return -1;
}
SCLogDebug("SMB2 Header (%u/%u) Command 0x%04x parsed %u input_len %u",
sstate->bytesprocessed, NBSS_HDR_LEN + SMB2_HDR_LEN,
sstate->smb2.Command, parsed, input_len);
}
break;
default:
break;
}
SCReturnInt(1);
}
static void *SMB2StateAlloc(void)
{
void *s = SCMalloc(sizeof(SMB2State));
if (unlikely(s == NULL))
return NULL;
memset(s, 0, sizeof(SMB2State));
return s;
}
static void SMB2StateFree(void *s)
{
if (s) {
SCFree(s);
s = NULL;
}
}
void RegisterSMB2Parsers(void)
{
/** SMB2 */
const char *proto_name = "smb2";
if (AppLayerProtoDetectConfProtoDetectionEnabled("tcp", proto_name)) {
AppLayerParserRegisterParser(IPPROTO_TCP, ALPROTO_SMB2, STREAM_TOSERVER, SMB2Parse);
AppLayerParserRegisterParser(IPPROTO_TCP, ALPROTO_SMB2, STREAM_TOCLIENT, SMB2Parse);
AppLayerParserRegisterStateFuncs(IPPROTO_TCP, ALPROTO_SMB2, SMB2StateAlloc, SMB2StateFree);
} else {
SCLogInfo("Parsed disabled for %s protocol. Protocol detection"
"still on.", proto_name);
}
#ifdef UNITTESTS
AppLayerParserRegisterProtocolUnittests(IPPROTO_TCP, ALPROTO_SMB2, SMB2ParserRegisterTests);
#endif
return;
}
/* UNITTESTS */
#ifdef UNITTESTS
static int SMB2ParserTest01(void)
{
int result = 1;
Flow f;
uint8_t smb2buf[] =
"\x00\x00\x00\x66" // NBSS
"\xfe\x53\x4d\x42\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00" // SMB2
"\x3f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
"\x24\x00\x01\x00x00\x00\x00\x00\x00\x00\x0\x00\x00\x00\x00\x00\x00\x00\x00"
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x02";
uint32_t smb2len = sizeof(smb2buf) - 1;
TcpSession ssn;
AppLayerParserThreadCtx *alp_tctx = AppLayerParserThreadCtxAlloc();
memset(&f, 0, sizeof(f));
memset(&ssn, 0, sizeof(ssn));
f.protoctx = (void *)&ssn;
StreamTcpInitConfig(TRUE);
FLOWLOCK_WRLOCK(&f);
int r = AppLayerParserParse(NULL, alp_tctx, &f, ALPROTO_SMB2,
STREAM_TOSERVER | STREAM_EOF, smb2buf,
smb2len);
if (r != 0) {
printf("smb2 header check returned %" PRId32 ", expected 0: ", r);
result = 0;
FLOWLOCK_UNLOCK(&f);
goto end;
}
FLOWLOCK_UNLOCK(&f);
SMB2State *smb2_state = f.alstate;
if (smb2_state == NULL) {
printf("no smb2 state: ");
result = 0;
goto end;
}
if (smb2_state->nbss.type != NBSS_SESSION_MESSAGE) {
printf("expected nbss type 0x%02x , got 0x%02x : ", NBSS_SESSION_MESSAGE, smb2_state->nbss.type);
result = 0;
goto end;
}
if (smb2_state->nbss.length != 102) {
printf("expected nbss length 0x%02x , got 0x%02x : ", 102, smb2_state->nbss.length);
result = 0;
goto end;
}
if (smb2_state->smb2.Command != SMB2_NEGOTIATE) {
printf("expected SMB2 command 0x%04x , got 0x%04x : ", SMB2_NEGOTIATE, smb2_state->smb2.Command);
result = 0;
goto end;
}
end:
if (alp_tctx != NULL)
AppLayerParserThreadCtxFree(alp_tctx);
StreamTcpFreeConfig(TRUE);
return result;
}
void SMB2ParserRegisterTests(void)
{
UtRegisterTest("SMB2ParserTest01", SMB2ParserTest01);
}
#endif

@ -1,83 +0,0 @@
/* Copyright (C) 2007-2010 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
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author Kirby Kuehl <kkuehl@gmail.com>
*/
#ifndef __APP_LAYER_SMB2_H__
#define __APP_LAYER_SMB2_H__
#include "suricata-common.h"
#include "app-layer-protos.h"
#include "app-layer-parser.h"
#include "app-layer-nbss.h"
#include "flow.h"
#include "stream.h"
typedef struct SMB2Hdr {
uint32_t Protocol; /**< Contains 0xFE,'SMB' */
uint16_t StructureSize;
uint16_t CreditCharge;
uint32_t Status;
uint16_t Command;
uint16_t CreditRequestResponse;
uint32_t Flags;
uint32_t NextCommand;
uint64_t MessageId;
uint32_t ProcessId;
uint32_t TreeId;
uint64_t SessionId;
uint8_t Signature[16];
} SMB2Hdr;
#define SMB2_HDR_LEN 64
typedef struct SMB2State_ {
NBSSHdr nbss;
SMB2Hdr smb2;
uint16_t bytesprocessed;
} SMB2State;
/** from http://msdn.microsoft.com/en-us/library/cc246528(PROT.13).aspx */
#define SMB2_NEGOTIATE 0x0000
#define SMB2_SESSION_SETUP 0x0001
#define SMB2_LOGOFF 0x0002
#define SMB2_TREE_CONNECT 0x0003
#define SMB2_TREE_DISCONNECT 0x0004
#define SMB2_CREATE 0x0005
#define SMB2_CLOSE 0x0006
#define SMB2_FLUSH 0x0007
#define SMB2_READ 0x0008
#define SMB2_WRITE 0x0009
#define SMB2_LOCK 0x000A
#define SMB2_IOCTL 0x000B
#define SMB2_CANCEL 0x000C
#define SMB2_ECHO 0x000D
#define SMB2_QUERY_DIRECTORY 0x000E
#define SMB2_CHANGE_NOTIFY 0x000F
#define SMB2_QUERY_INFO 0x0010
#define SMB2_SET_INFO 0x0011
#define SMB2_OPLOCK_BREAK 0x0012
void RegisterSMB2Parsers(void);
void SMB2ParserRegisterTests(void);
#endif /* __APP_LAYER_SMB2_H__ */

@ -246,26 +246,9 @@ static DetectDceIfaceData *DetectDceIfaceArgParse(const char *arg)
return NULL;
}
#include "app-layer-smb.h"
DCERPCState *DetectDceGetState(AppProto alproto, void *alstate)
{
#ifdef HAVE_RUST
return alstate;
#else
switch (alproto) {
case ALPROTO_DCERPC:
return alstate;
case ALPROTO_SMB: {
SMBState *smb_state = (SMBState *)alstate;
return &smb_state->ds;
}
case ALPROTO_SMB2:
// not implemented
return NULL;
}
return NULL;
#endif
}
/**

@ -42,7 +42,6 @@
#include "app-layer-parser.h"
#include "app-layer-protos.h"
#include "app-layer-htp.h"
#include "app-layer-smb.h"
#include "app-layer-dcerpc-common.h"
#include "app-layer-dcerpc.h"
#include "app-layer-smtp.h"

@ -56,7 +56,6 @@
#include "app-layer-parser.h"
#include "app-layer-protos.h"
#include "app-layer-htp.h"
#include "app-layer-smb.h"
#include "app-layer-dcerpc-common.h"
#include "app-layer-dcerpc.h"
#include "app-layer-dns-common.h"

@ -812,8 +812,8 @@ static inline void DetectRulePacketRules(
if (likely(sflags & SIG_FLAG_APPLAYER)) {
if (s->alproto != ALPROTO_UNKNOWN && s->alproto != scratch->alproto) {
if (s->alproto == ALPROTO_DCERPC) {
if (scratch->alproto != ALPROTO_SMB && scratch->alproto != ALPROTO_SMB2) {
SCLogDebug("DCERPC sig, alproto not SMB or SMB2");
if (scratch->alproto != ALPROTO_SMB) {
SCLogDebug("DCERPC sig, alproto not SMB");
goto next;
}
} else {

@ -58,7 +58,6 @@
#include "app-layer-detect-proto.h"
#include "app-layer-parser.h"
#include "app-layer.h"
#include "app-layer-smb.h"
#include "app-layer-dcerpc.h"
#include "app-layer-dcerpc-udp.h"
#include "app-layer-htp.h"

@ -123,7 +123,6 @@
#include "app-layer-ssh.h"
#include "app-layer-ftp.h"
#include "app-layer-smtp.h"
#include "app-layer-smb.h"
#include "app-layer-modbus.h"
#include "app-layer-enip.h"
#include "app-layer-dnp3.h"

Loading…
Cancel
Save