Added SMBv1 over NetBIOS detection

1 files changed, 113 insertions, 96 deletions

diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c
index 19cffeb82..edc9f755f 100644
--- a/src/lib/protocols/netbios.c
+++ b/src/lib/protocols/netbios.c
@@ -1,8 +1,8 @@
 /*
  * netbios.c
  *
- * Copyright (C) 2009-2011 by ipoque GmbH
  * Copyright (C) 2011-20 - ntop.org
+ * Copyright (C) 2009-2011 by ipoque GmbH
  *
  * This file is part of nDPI, an open source deep packet inspection
  * library based on the OpenDPI and PACE technology by ipoque GmbH
@@ -29,11 +29,14 @@
 
 #include "ndpi_api.h"
 
+/* ****************************************************************** */
 
 struct netbios_header {
   u_int16_t transaction_id, flags, questions, answer_rrs, authority_rrs, additional_rrs;
 };
 
+/* ****************************************************************** */
+
 /* The function below has been inherited by tcpdump */
 int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
   int ret = 0, len;
@@ -69,18 +72,24 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
   return(ret);
 }
 
+/* ****************************************************************** */
 
-static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct
-					    *ndpi_struct, struct ndpi_flow_struct *flow) { 
+static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
+					    struct ndpi_flow_struct *flow,
+					    u_int16_t sub_protocol) { 
   char name[64];
   u_int off = flow->packet.payload[12] == 0x20 ? 12 : 14;
   
   if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], name, sizeof(name)) > 0)
     snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name);    
-  
-  ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN);
+
+  if(sub_protocol == NDPI_PROTOCOL_UNKNOWN)
+    ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN);
+  else
+    ndpi_set_detected_protocol(ndpi_struct, flow, sub_protocol, NDPI_PROTOCOL_NETBIOS);
 }
 
+/* ****************************************************************** */
 
 void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct,
 			 struct ndpi_flow_struct *flow) {
@@ -88,6 +97,7 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct,
   u_int16_t dport;
   
   NDPI_LOG_DBG(ndpi_struct, "search netbios\n");
+  
   if(packet->udp != NULL) {
     dport = ntohs(packet->udp->dest);
 
@@ -103,106 +113,106 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct,
       NDPI_LOG_DBG(ndpi_struct, "found netbios port 137 and payload_packet_len 50\n");
 
       if(h.flags == 0 &&
-	  h.questions == 1 &&
-	  h.answer_rrs == 0 &&
-	  h.authority_rrs == 0 && h.additional_rrs == 0) {
+	 h.questions == 1 &&
+	 h.answer_rrs == 0 &&
+	 h.authority_rrs == 0 && h.additional_rrs == 0) {
 
 	NDPI_LOG_INFO(ndpi_struct, "found netbios with questions = 1 and answers = 0, authority = 0  \n");
 
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
       
       if(((h.flags & 0x8710) == 0x10) &&
-	  h.questions == 1 &&
-	  h.answer_rrs == 0 &&
-	  h.authority_rrs == 0) {
+	 h.questions == 1 &&
+	 h.answer_rrs == 0 &&
+	 h.authority_rrs == 0) {
 
 	NDPI_LOG_INFO(ndpi_struct, "found netbios with questions = 1 and answers = 0, authority = 0 and broadcast \n");
 	
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
       
       if(packet->payload[2] == 0x80 &&
-	  h.questions == 1 &&
-	  h.answer_rrs == 0 &&
-	  h.authority_rrs == 0 && h.additional_rrs == 1) {
+	 h.questions == 1 &&
+	 h.answer_rrs == 0 &&
+	 h.authority_rrs == 0 && h.additional_rrs == 1) {
 
 	NDPI_LOG_INFO(ndpi_struct, "found netbios with questions = 1 and answers, authority, additional = 0  \n");
 
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
       
       if(h.flags == 0x4000 &&
-	  h.questions == 1 &&
-	  h.answer_rrs == 0 &&
-	  h.authority_rrs == 0 && h.additional_rrs == 1) {
+	 h.questions == 1 &&
+	 h.answer_rrs == 0 &&
+	 h.authority_rrs == 0 && h.additional_rrs == 1) {
 
 	NDPI_LOG_INFO(ndpi_struct, "found netbios with questions = 1 and answers = 0, authority = 0  \n");
 
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
       
       if(h.flags == 0x8400 &&
-	  h.questions == 0 &&
-	  h.answer_rrs == 1 &&
-	  h.authority_rrs == 0 && h.additional_rrs == 0) {
+	 h.questions == 0 &&
+	 h.answer_rrs == 1 &&
+	 h.authority_rrs == 0 && h.additional_rrs == 0) {
 
 	NDPI_LOG_INFO(ndpi_struct,
-		 "found netbios with flag 8400 questions = 0 and answers = 1, authority, additional = 0  \n");
+		      "found netbios with flag 8400 questions = 0 and answers = 1, authority, additional = 0  \n");
 
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
       
       if(h.flags == 0x8500 &&
-	  h.questions == 0 &&
-	  h.answer_rrs == 1 &&
-	  h.authority_rrs == 0 && h.additional_rrs == 0) {
+	 h.questions == 0 &&
+	 h.answer_rrs == 1 &&
+	 h.authority_rrs == 0 && h.additional_rrs == 0) {
 
 	NDPI_LOG_INFO(ndpi_struct,
-		 "found netbios with flag 8500 questions = 0 and answers = 1, authority, additional = 0  \n");
+		      "found netbios with flag 8500 questions = 0 and answers = 1, authority, additional = 0  \n");
 
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
       
       if(((h.flags == 0x2900) || (h.flags == 0x2910)) &&
-	  h.questions == 1 &&
-	  h.answer_rrs == 0 &&
-	  h.authority_rrs == 0 && h.additional_rrs == 1) {
+	 h.questions == 1 &&
+	 h.answer_rrs == 0 &&
+	 h.authority_rrs == 0 && h.additional_rrs == 1) {
 
 	NDPI_LOG_INFO(ndpi_struct,
-		 "found netbios with flag 2910, questions = 1 and answers, authority=0, additional = 1  \n");
+		      "found netbios with flag 2910, questions = 1 and answers, authority=0, additional = 1  \n");
 
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
       
       if(h.flags == 0xAD86 &&
-	  h.questions == 0 &&
-	  h.answer_rrs == 1 &&
-	  h.authority_rrs == 0 && h.additional_rrs == 0) {
+	 h.questions == 0 &&
+	 h.answer_rrs == 1 &&
+	 h.authority_rrs == 0 && h.additional_rrs == 0) {
 
 	NDPI_LOG_INFO(ndpi_struct,
-		 "found netbios with flag ad86 questions = 0 and answers = 1, authority, additional = 0  \n");
+		      "found netbios with flag ad86 questions = 0 and answers = 1, authority, additional = 0  \n");
 
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
       
       if(h.flags == 0x0110 &&
-	  h.questions == 1 &&
-	  h.answer_rrs == 0 &&
-	  h.authority_rrs == 0 && h.additional_rrs == 0) {
+	 h.questions == 1 &&
+	 h.answer_rrs == 0 &&
+	 h.authority_rrs == 0 && h.additional_rrs == 0) {
 
 	NDPI_LOG_INFO(ndpi_struct,
-		 "found netbios with flag 0110 questions = 1 and answers = 0, authority, additional = 0  \n");
+		      "found netbios with flag 0110 questions = 1 and answers = 0, authority, additional = 0  \n");
 
-	ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	return;
       }
 
@@ -210,111 +220,111 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct,
 	NDPI_LOG_DBG2(ndpi_struct, "possible netbios name query request\n");
 
 	if(get_u_int16_t(packet->payload, 4) == htons(1) &&
-	    get_u_int16_t(packet->payload, 6) == 0 &&
-	    get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
+	   get_u_int16_t(packet->payload, 6) == 0 &&
+	   get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
 
 	  /* name is encoded as described in rfc883 */
 	  u_int8_t name_length = packet->payload[12];
 
 	  NDPI_LOG_DBG2(ndpi_struct,
-		   "possible netbios name query request, one question\n");
+			"possible netbios name query request, one question\n");
 
 	  if(packet->payload_packet_len == 12 + 1 + name_length + 1 + 2 + 2) {
 
 	    NDPI_LOG_DBG2(ndpi_struct,
-		     "possible netbios name query request, length matches\n");
+			  "possible netbios name query request, length matches\n");
 
 	    /* null terminated? */
 	    if(packet->payload[12 + name_length + 1] == 0 &&
-		get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0020) &&
-		get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
+	       get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0020) &&
+	       get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
 
 	      NDPI_LOG_INFO(ndpi_struct,
-		       "found netbios name query request\n");
-	      ndpi_int_netbios_add_connection(ndpi_struct, flow);
+			    "found netbios name query request\n");
+	      ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	      return;
 	    }
 	  }
 	}
       } else if((h.flags & 0xf800) == 0x8000) {
 	NDPI_LOG_DBG2(ndpi_struct,
-		 "possible netbios name query response\n");
+		      "possible netbios name query response\n");
 
 	if(get_u_int16_t(packet->payload, 4) == 0 &&
-	    get_u_int16_t(packet->payload, 6) == htons(1) &&
-	    get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
+	   get_u_int16_t(packet->payload, 6) == htons(1) &&
+	   get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
 
 	  /* name is encoded as described in rfc883 */
 	  u_int8_t name_length = packet->payload[12];
 
 	  NDPI_LOG_DBG2(ndpi_struct,
-		   "possible netbios positive name query response, one answer\n");
+			"possible netbios positive name query response, one answer\n");
 
 	  if(packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
 
 	    NDPI_LOG_DBG2(ndpi_struct,
-		     "possible netbios name query response, length matches\n");
+			  "possible netbios name query response, length matches\n");
 
 	    /* null terminated? */
 	    if(packet->payload[12 + name_length + 1] == 0 &&
-		get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0020) &&
-		get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
+	       get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0020) &&
+	       get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
 
 	      NDPI_LOG_INFO(ndpi_struct,
-		       "found netbios name query response\n");
-	      ndpi_int_netbios_add_connection(ndpi_struct, flow);
+			    "found netbios name query response\n");
+	      ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	      return;
 	    }
 	  }
 	} else if(get_u_int16_t(packet->payload, 4) == 0 &&
-		   get_u_int16_t(packet->payload, 6) == 0 &&
-		   get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
+		  get_u_int16_t(packet->payload, 6) == 0 &&
+		  get_u_int16_t(packet->payload, 8) == 0 && get_u_int16_t(packet->payload, 10) == 0) {
 
 	  /* name is encoded as described in rfc883 */
 	  u_int8_t name_length = packet->payload[12];
 
 	  NDPI_LOG_DBG2(ndpi_struct,
-		   "possible netbios negative name query response, one answer\n");
+			"possible netbios negative name query response, one answer\n");
 
 	  if(packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
 
 	    NDPI_LOG_DBG2(ndpi_struct,
-		     "possible netbios name query response, length matches\n");
+			  "possible netbios name query response, length matches\n");
 
 	    /* null terminated? */
 	    if(packet->payload[12 + name_length + 1] == 0 &&
-		get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x000A) &&
-		get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
+	       get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x000A) &&
+	       get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
 
 	      NDPI_LOG_INFO(ndpi_struct,
-		       "found netbios name query response\n");
-	      ndpi_int_netbios_add_connection(ndpi_struct, flow);
+			    "found netbios name query response\n");
+	      ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	      return;
 	    }
 	  }
 	} else if(get_u_int16_t(packet->payload, 4) == 0 &&
-		   get_u_int16_t(packet->payload, 6) == 0 &&
-		   get_u_int16_t(packet->payload, 8) == htons(1) && get_u_int16_t(packet->payload, 10) == htons(1)) {
+		  get_u_int16_t(packet->payload, 6) == 0 &&
+		  get_u_int16_t(packet->payload, 8) == htons(1) && get_u_int16_t(packet->payload, 10) == htons(1)) {
 
 	  /* name is encoded as described in rfc883 */
 	  u_int8_t name_length = packet->payload[12];
 
 	  NDPI_LOG_DBG2(ndpi_struct,
-		   "possible netbios redirect name query response, one answer\n");
+			"possible netbios redirect name query response, one answer\n");
 
 	  if(packet->payload_packet_len >= 12 + 1 + name_length + 1 + 2 + 2) {
 
 	    NDPI_LOG_DBG2(ndpi_struct,
-		     "possible netbios name query response, length matches\n");
+			  "possible netbios name query response, length matches\n");
 
 	    /* null terminated? */
 	    if(packet->payload[12 + name_length + 1] == 0 &&
-		get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0002) &&
-		get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
+	       get_u_int16_t(packet->payload, 12 + name_length + 2) == htons(0x0002) &&
+	       get_u_int16_t(packet->payload, 12 + name_length + 4) == htons(0x0001)) {
 
 	      NDPI_LOG_INFO(ndpi_struct,
-		       "found netbios name query response\n");
-	      ndpi_int_netbios_add_connection(ndpi_struct, flow);
+			    "found netbios name query response\n");
+	      ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	      return;
 	    }
 	  }
@@ -322,25 +332,30 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct,
       }
       /* TODO: extend according to rfc1002 */
     }
+    
+    /* check standard NETBIOS over udp to port 138 */
 
-    /*check standard NETBIOS over udp to port 138 */
+    /* netbios header token from http://www.protocolbase.net/protocols/protocol_NBDGM.php */
 
-    /*netbios header token from http://www.protocolbase.net/protocols/protocol_NBDGM.php */
-
-    if((dport == 138) &&
-       packet->payload_packet_len >= 14 &&
-       ntohs(get_u_int16_t(packet->payload, 10)) == packet->payload_packet_len - 14) {
+    if((dport == 138) && (packet->payload_packet_len >= 14)) {
+      u_int16_t netbios_len = ntohs(get_u_int16_t(packet->payload, 10));
       
-      NDPI_LOG_DBG2(ndpi_struct, "found netbios port 138 and payload length >= 112 \n");
+      if(netbios_len == packet->payload_packet_len - 14) {     
+	NDPI_LOG_DBG2(ndpi_struct, "found netbios port 138 and payload length >= 112 \n");
       
-      if(packet->payload[0] >= 0x10 && packet->payload[0] <= 0x16) {
-	NDPI_LOG_DBG2(ndpi_struct, "found netbios with MSG-type 0x10,0x11,0x12,0x13,0x14,0x15 or 0x16\n");
-
-	if(ntohl(get_u_int32_t(packet->payload, 4)) == ntohl(packet->iph->saddr)) {
-	  NDPI_LOG_INFO(ndpi_struct, "found netbios with checked ip-address\n");
-
-	  ndpi_int_netbios_add_connection(ndpi_struct, flow);
-	  return;
+	if(packet->payload[0] >= 0x10 && packet->payload[0] <= 0x16) {
+	  u_int32_t source_ip = ntohl(get_u_int32_t(packet->payload, 4));
+				      
+	  NDPI_LOG_DBG2(ndpi_struct, "found netbios with MSG-type 0x10,0x11,0x12,0x13,0x14,0x15 or 0x16\n");
+
+	  if(source_ip == ntohl(packet->iph->saddr)) {
+	    int16_t leftover = netbios_len - 82; /* NetBIOS len */
+	      
+	    NDPI_LOG_INFO(ndpi_struct, "found netbios with checked ip-address\n");
+
+	    ndpi_int_netbios_add_connection(ndpi_struct, flow, (leftover > 0) ? NDPI_PROTOCOL_SMBV1 : NDPI_PROTOCOL_UNKNOWN);
+	    return;
+	  }
 	}
       }
     }
@@ -359,9 +374,9 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct,
 
 	if(packet->payload[0] == 0x81 && packet->payload[1] == 0 && ntohs(get_u_int16_t(packet->payload, 2)) == 68) {
 	  NDPI_LOG_INFO(ndpi_struct,
-		   "found netbios with session request = 81, flags=0 and length od following bytes = 68. \n");
+			"found netbios with session request = 81, flags=0 and length od following bytes = 68. \n");
 
-	  ndpi_int_netbios_add_connection(ndpi_struct, flow);
+	  ndpi_int_netbios_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNKNOWN);
 	  return;
 	}
       }
@@ -372,6 +387,8 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct,
   NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }
 
+/* ****************************************************************** */
+
 void init_netbios_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
   ndpi_set_bitmask_protocol_detection("NETBIOS", ndpi_struct, detection_bitmask, *id,