Updated snort to current stable, This is a large changeset.

Updated snort and daq. Snort detection engine is changed and some preprocessors have been updated.

config/rootfiles/common/snort

@@ -80,6 +80,7 @@ usr/sbin/snort
 #usr/share/doc/snort/README.pcap_readmode
 #usr/share/doc/snort/README.ppm
 #usr/share/doc/snort/README.reload
+#usr/share/doc/snort/README.rzb_saac
 #usr/share/doc/snort/README.sensitive_data
 #usr/share/doc/snort/README.sfportscan
 #usr/share/doc/snort/README.ssh

config/snort/snort.conf

@@ -15,6 +15,8 @@
 #  5) Configure preprocessors
 #  6) Configure output plugins
 #  7) Customize your rule set
+#  8) Customize preprocessor and decoder rule set
+#  9) Customize shared object rule set
 ###################################################
 
 ###################################################
@@ -46,18 +48,19 @@ var SQL_SERVERS $HOME_NET
 # List of telnet servers on your network
 var TELNET_SERVERS $HOME_NET
 
-# List of ports you run web servers on
+# List of ssh servers on your network
-portvar HTTP_PORTS  [80,2301,3128,7777,7779,8000,8008,8028,8080,8180,8888,9999]
+var SSH_SERVERS $HOME_NET
 
-# List of ssh ports
+# List of ports you run web servers on
-portvar SSH_PORTS  [22,222]
+portvar HTTP_PORTS  [80,311,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,5250,7001,7777,7779,8000,8008,8028,8080,8088,8118,8123,8180,8243,8280,8888,9090,9091,9443,9999,11371]
 
 # List of ports you want to look for SHELLCODE on.
 portvar SHELLCODE_PORTS !80
 
 # List of ports you might see oracle attacks on
-portvar ORACLE_PORTS 1521
+portvar ORACLE_PORTS 1024:
-
+# List of ssh ports
+portvar SSH_PORTS  [22,222]
 # other variables, these should not be modified
 var AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.161.0/24,64.12.163.0/24,64.12.200.0/24,205.188.3.0/24,205.188.5.0/24,205.188.7.0/24,205.188.9.0/24,205.188.153.0/24,205.188.179.0/24,205.188.248.0/24]
 
@@ -68,7 +71,6 @@ var RULE_PATH /etc/snort/rules
 var SO_RULE_PATH /etc/snort/so_rules
 var PREPROC_RULE_PATH /etc/snort/preproc_rules
 
-
 ###################################################
 # Step #2: Configure the decoder.  For more information, see README.decode
 ###################################################
@@ -107,25 +109,46 @@ config checksum_mode: all
 # config ignore_ports: tcp 21 6667:6671 1356
 # config ignore_ports: udp 1:17 53
 
-
+# Configure active response for non inline operation. For more information, see REAMDE.active
+# config response: eth0 attempts 2
 ###################################################
 # Step #3: Configure the base detection engine.  For more information, see  README.decode
 ###################################################
 
 # Configure PCRE match limitations
-config pcre_match_limit: 1500
+config pcre_match_limit: 3500
 config pcre_match_limit_recursion: 1500
 
 # Configure the detection engine  See the Snort Manual, Configuring Snort - Includes - Config
-config detection: search-method ac-bnfa max_queue_events 5
+config detection: search-method ac-split search-optimize max-pattern-len 20
 
 # Configure the event queue.  For more information, see README.event_queue
 config event_queue: max_queue 8 log 3 order_events content_length
 
-# Configure Inline Resets.  See README.INLINE
+###################################################
-# config layer2resets: 00:06:76:DD:5F:E3
+# Per packet and rule latency enforcement
+# For more information see README.ppm
+###################################################
 
+# Per Packet latency configuration
+#config ppm: max-pkt-time 250, \
+#   fastpath-expensive-packets, \
+#   pkt-log
 
+# Per Rule latency configuration
+#config ppm: max-rule-time 200, \
+#   threshold 3, \
+#   suspend-expensive-rules, \
+#   suspend-timeout 20, \
+#   rule-log alert
+
+###################################################
+# Configure Perf Profiling for debugging
+# For more information see README.PerfProfiling
+###################################################
+
+#config profile_rules: print all, sort avg_ticks
+#config profile_preprocs: print all, sort avg_ticks
 ###################################################
 # Step #4: Configure dynamic loaded libraries.  
 # For more information, see Snort Manual, Configuring Snort - Dynamic Modules
@@ -137,15 +160,6 @@ dynamicpreprocessor directory /usr/lib/snort_dynamicpreprocessor/
 # path to base preprocessor engine
 dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so
 
-
-
-
-
-
-
-
-
-
 # path to dynamic rules libraries
 # dynamicdetection directory /usr/lib/snort_dynamicrules
 
@@ -154,39 +168,65 @@ dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so
 # For more information, see the Snort Manual, Configuring Snort - Preprocessors
 ###################################################
 
+# Inline packet normalization. For more information, see README.normalize
+# Does nothing in IDS mode
+preprocessor normalize_ip4
+preprocessor normalize_tcp: ips ecn stream
+preprocessor normalize_icmp4
+preprocessor normalize_ip6
+preprocessor normalize_icmp6
+
 # Target-based IP defragmentation.  For more inforation, see README.frag3
 preprocessor frag3_global: max_frags 65536
-preprocessor frag3_engine: policy windows timeout 180
+preprocessor frag3_engine: policy windows detect_anomalies overlap_limit 10 min_fragment_length 100 timeout 180
 
 # Target-Based stateful inspection/stream reassembly.  For more inforation, see README.stream5
-preprocessor stream5_global: max_tcp 8192, track_tcp yes, track_udp no
+preprocessor stream5_global: max_tcp 8192, track_tcp yes, track_udp yes, track_icmp no max_active_responses 2 min_response_seconds 5
-preprocessor stream5_tcp: policy windows, use_static_footprint_sizes, ports client 21 22 23 25 42 53 79 80 109 110 111 113 119 135 136 137 139 143 110 111 161 445 513 514 691 1433 1521 2100 2301 3128 3306 6665 6666 6667 6668 6669 7000 8000 8080 8180 8888 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, ports both 443 465 563 636 989 992 993 994 995 7801 7702 7900 7901 7902 7903 7904 7905 7906 6907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920
+
-# preprocessor stream5_udp: ignore_any_rules
+preprocessor stream5_tcp: policy windows, detect_anomalies, require_3whs 180, \
+   overlap_limit 10, small_segments 3 bytes 150, timeout 180, \
+    ports client 21 22 23 25 42 53 79 109 110 111 113 119 135 136 137 139 143 \
+        161 445 513 514 587 593 691 1433 1521 2100 3306 6070 6665 6666 6667 6668 6669 \
+        7000 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, \
+    ports both 80 311 443 465 563 591 593 636 901 989 992 993 994 995 1220 1414 1830 2301 2381 2809 3128 3702 5250 6907 7001 7702 7777 7779 \
+        7801 7900 7901 7902 7903 7904 7905 7906 7908 7909 7910 7911 7912 7913 7914 7915 7916 \
+        7917 7918 7919 7920 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371
+preprocessor stream5_udp: timeout 180
 
 # performance statistics.  For more information, see the Snort Manual, Configuring Snort - Preprocessors - Performance Monitor
 # preprocessor perfmonitor: time 300 file /var/snort/snort.stats pktcnt 10000
 
 # HTTP normalization and anomaly detection.  For more information, see README.http_inspect
-preprocessor http_inspect: global iis_unicode_map unicode.map 1252 
+preprocessor http_inspect: global iis_unicode_map unicode.map 1252 compress_depth 20480 decompress_depth 20480
 
 preprocessor http_inspect_server: server default \
+    chunk_length 500000 \
+    server_flow_depth 0 \
+    client_flow_depth 0 \
+    post_depth 65495 \
+    oversize_dir_length 500 \
+    max_header_length 750 \
+    max_headers 100 \
+    ports { 80 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 5250 7001 7777 7779 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371 } \
+    non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \
+    enable_cookie \
+    extended_response_inspection \
+    inspect_gzip \
+    normalize_utf \
+    unlimited_decompress \
     apache_whitespace no \
     ascii no \
-	bare_byte no \
+    bare_byte no \
-	chunk_length 500000 \
+    base36 no \
-	flow_depth 1460 \
+    directory no \
-	directory no \
+    double_decode no \
-	double_decode no \
+    iis_backslash no \
-	iis_backslash no \
+    iis_delimiter no \
-	iis_delimiter no \
+    iis_unicode no \
-	iis_unicode no \
+    multi_slash no \
-	multi_slash no \
+    utf_8 no \
-	non_strict \
+    u_encode yes \
-	oversize_dir_length 500 \
+    webroot no
-	ports { 80 2301 3128 7777 7779 8000 8008 8028 8080 8180 8888 9999 } \
-	u_encode yes \
-	non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \
-	webroot no
 
 # ONC-RPC normalization and anomaly detection.  For more information, see the Snort Manual, Configuring Snort - Preprocessors - RPC Decode
 preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779 no_alert_multiple_requests no_alert_large_fragments no_alert_incomplete
@@ -195,55 +235,80 @@ preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 327
 preprocessor bo
 
 # FTP / Telnet normalization and anomaly detection.  For more information, see README.ftptelnet
-preprocessor ftp_telnet: global encrypted_traffic yes check_encrypted inspection_type stateful 
+preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no
+
 preprocessor ftp_telnet_protocol: telnet \
     ayt_attack_thresh 20 \
     normalize ports { 23 } \
     detect_anomalies
+
 preprocessor ftp_telnet_protocol: ftp server default \
     def_max_param_len 100 \
-    ports { 21 2100 } \
+    ports { 21 2100 3535 } \
-    ftp_cmds { USER PASS ACCT CWD SDUP SMNT QUIT REIN PORT PASV TYPE STRU MODE } \
+    telnet_cmds yes \
-    ftp_cmds { RETR STOR STOU APPE ALLO REST RNFR RNTO ABOR DELE RMD MKD PWD } \
+    ignore_telnet_erase_cmds yes \
-    ftp_cmds { LIST NLST SITE SYST STAT HELP NOOP } \
+    ftp_cmds { ABOR ACCT ADAT ALLO APPE AUTH CCC CDUP } \
-    ftp_cmds { AUTH ADAT PROT PBSZ CONF ENC } \
+    ftp_cmds { CEL CLNT CMD CONF CWD DELE ENC EPRT } \
-    ftp_cmds { FEAT OPTS CEL CMD MACB } \
+    ftp_cmds { EPSV ESTA ESTP FEAT HELP LANG LIST LPRT } \
-    ftp_cmds { MDTM REST SIZE MLST MLSD } \
+    ftp_cmds { LPSV MACB MAIL MDTM MIC MKD MLSD MLST } \
-    ftp_cmds { XPWD XCWD XCUP XMKD XRMD TEST CLNT } \
+    ftp_cmds { MODE NLST NOOP OPTS PASS PASV PBSZ PORT } \
-    alt_max_param_len 0 { CDUP QUIT REIN PASV STOU ABOR PWD SYST NOOP } \
+    ftp_cmds { PROT PWD QUIT REIN REST RETR RMD RNFR } \
-    alt_max_param_len 100 { MDTM CEL XCWD SITE USER PASS REST DELE RMD SYST TEST STAT MACB EPSV CLNT LPRT } \
+    ftp_cmds { RNTO SDUP SITE SIZE SMNT STAT STOR STOU } \
-    alt_max_param_len 200 { XMKD NLST ALLO STOU APPE RETR STOR CMD RNFR HELP } \
+    ftp_cmds { STRU SYST TEST TYPE USER XCUP XCRC XCWD } \
-    alt_max_param_len 256 { RNTO CWD } \ 
+    ftp_cmds { XMAS XMD5 XMKD XPWD XRCP XRMD XRSQ XSEM } \
+    ftp_cmds { XSEN XSHA1 XSHA256 } \
+    alt_max_param_len 0 { ABOR CCC CDUP ESTA FEAT LPSV NOOP PASV PWD QUIT REIN STOU SYST XCUP XPWD } \
+    alt_max_param_len 200 { ALLO APPE CMD HELP NLST RETR RNFR STOR STOU XMKD } \
+    alt_max_param_len 256 { CWD RNTO } \
     alt_max_param_len 400 { PORT } \
     alt_max_param_len 512 { SIZE } \
-    chk_str_fmt { USER PASS ACCT CWD SDUP SMNT PORT TYPE STRU MODE } \
+    chk_str_fmt { ACCT ADAT ALLO APPE AUTH CEL CLNT CMD } \
-    chk_str_fmt { RETR STOR STOU APPE ALLO REST RNFR RNTO DELE RMD MKD } \
+    chk_str_fmt { CONF CWD DELE ENC EPRT EPSV ESTP HELP } \
-    chk_str_fmt { LIST NLST SITE SYST STAT HELP } \
+    chk_str_fmt { LANG LIST LPRT MACB MAIL MDTM MIC MKD } \
-    chk_str_fmt { AUTH ADAT PROT PBSZ CONF ENC } \
+    chk_str_fmt { MLSD MLST MODE NLST OPTS PASS PBSZ PORT } \
-    chk_str_fmt { FEAT OPTS CEL CMD } \
+    chk_str_fmt { PROT REST RETR RMD RNFR RNTO SDUP SITE } \
-    chk_str_fmt { MDTM REST SIZE MLST MLSD } \
+    chk_str_fmt { SIZE SMNT STAT STOR STRU TEST TYPE USER } \
-    chk_str_fmt { XPWD XCWD XCUP XMKD XRMD TEST CLNT } \
+    chk_str_fmt { XCRC XCWD XMAS XMD5 XMKD XRCP XRMD XRSQ } \ 
-    cmd_validity MODE < char ASBCZ > \
+    chk_str_fmt { XSEM XSEN XSHA1 XSHA256 } \
-    cmd_validity STRU < char FRP > \
+    cmd_validity ALLO < int [ char R int ] > \    
-    cmd_validity ALLO < int [ char R int ] > \
+    cmd_validity EPSV < [ { char 12 | char A char L char L } ] > \
-    cmd_validity TYPE < { char AE [ char NTC ] | char I | char L [ number ] } > \
+    cmd_validity MACB < string > \
     cmd_validity MDTM < [ date nnnnnnnnnnnnnn[.n[n[n]]] ] string > \
-    cmd_validity PORT < host_port >
+    cmd_validity MODE < char ASBCZ > \
+    cmd_validity PORT < host_port > \
+    cmd_validity PROT < char CSEP > \
+    cmd_validity STRU < char FRPO [ string ] > \    
+    cmd_validity TYPE < { char AE [ char NTC ] | char I | char L [ number ] } >
+
 preprocessor ftp_telnet_protocol: ftp client default \
     max_resp_len 256 \
     bounce yes \
-    telnet_cmds no
+    ignore_telnet_erase_cmds yes \
-
+    telnet_cmds yes
 
 # SMTP normalization and anomaly detection.  For more information, see README.SMTP
-preprocessor smtp: ports { 25 587 691 } \
+reprocessor smtp: ports { 25 465 587 691 } \
-  inspection_type stateful \
+    inspection_type stateful \
-  normalize cmds \
+    enable_mime_decoding \
-  normalize_cmds { EXPN VRFY RCPT } \
+    max_mime_depth 20480 \
-  alt_max_command_line_len 260 { MAIL } \
+    normalize cmds \
-  alt_max_command_line_len 300 { RCPT } \
+    normalize_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \
-  alt_max_command_line_len 500 { HELP HELO ETRN } \
+    normalize_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \
-  alt_max_command_line_len 255 { EXPN VRFY }
+    normalize_cmds { STARTTLS TICK TIME TURN TURNME VERB VRFY X-ADAT X-DRCP X-ERCP X-EXCH50 } \
+    normalize_cmds { X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \
+    max_command_line_len 512 \
+    max_header_line_len 1000 \
+    max_response_line_len 512 \
+    alt_max_command_line_len 260 { MAIL } \
+    alt_max_command_line_len 300 { RCPT } \
+    alt_max_command_line_len 500 { HELP HELO ETRN EHLO } \
+    alt_max_command_line_len 255 { EXPN VRFY ATRN SIZE BDAT DEBUG EMAL ESAM ESND ESOM EVFY IDENT NOOP RSET } \
+    alt_max_command_line_len 246 { SEND SAML SOML AUTH TURN ETRN DATA RSET QUIT ONEX QUEU STARTTLS TICK TIME TURNME VERB X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \
+    valid_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \ 
+    valid_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \
+    valid_cmds { STARTTLS TICK TIME TURN TURNME VERB VRFY X-ADAT X-DRCP X-ERCP X-EXCH50 } \
+    valid_cmds { X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \
+    xlink2state { enabled }
 
 # Portscan detection.  For more information, see README.sfportscan
  preprocessor sfportscan: proto  { all } memcap { 10000000 } sense_level { medium }
@@ -254,8 +319,10 @@ preprocessor smtp: ports { 25 587 691 } \
 
 # SSH anomaly detection.  For more information, see README.ssh
 preprocessor ssh: server_ports { 22 222 } \
+                  autodetect \
                   max_client_bytes 19600 \
                   max_encrypted_packets 20 \
+                  max_server_version_len 100 \
                   enable_respoverflow enable_ssh1crc32 \
                   enable_srvoverflow enable_protomismatch
 
@@ -272,12 +339,21 @@ preprocessor dns: ports { 53 } enable_rdata_overflow
 # SSL anomaly detection and traffic bypass.  For more information, see README.ssl
 preprocessor ssl: ports { 443 444 465 563 636 989 992 993 994 995 7801 7702 7900 7901 7902 7903 7904 7905 7906 6907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 }, trustservers, noinspect_encrypted
 
+# SDF sensitive data preprocessor.  For more information see README.sensitive_data
+preprocessor sensitive_data: alert_threshold 25
 
 ###################################################
 # Step #6: Configure output plugins
 # For more information, see Snort Manual, Configuring Snort - Output Modules
 ###################################################
 
+# unified2 
+# Recommended for most installs
+# output unified2: filename merged.log, limit 128, nostamp, mpls_event_types, vlan_event_types
+
+# Additional configuration for specific types of installs
+# output alert_unified2: filename snort.alert, limit 128, nostamp
+# output log_unified2: filename snort.log, limit 128, nostamp 
 # syslog
 # output alert_syslog: LOG_AUTH LOG_ALERT
 
@@ -288,10 +364,6 @@ preprocessor ssl: ports { 443 444 465 563 636 989 992 993 994 995 7801 7702 7900
 # output database: alert, <db_type>, user=<username> password=<password> test dbname=<name> host=<hostname>
 # output database: log, <db_type>, user=<username> password=<password> test dbname=<name> host=<hostname>
 
-# unified 
-# output alert_unified: filename snort.alert, limit 128
-# output log_unified: filename snort.log, limit 128
-
 # prelude
 # output alert_prelude
 

html/cgi-bin/ids.cgi

@@ -264,11 +264,11 @@ if (-e "/etc/snort/snort.conf") {
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
 	#$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsettings{'OINKCODE'}";
+	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904_s.tar.gz/$snortsettings{'OINKCODE'}";
 	#$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
 	#$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
-	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettings{'OINKCODE'}";
+	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904.tar.gz/$snortsettings{'OINKCODE'}";
 	#$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz";
 } else {
 	$url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";

lfs/daq

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.4
+VER        = 0.5
 
 THISAPP    = daq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = eb48e99247f75951e1af1fcc6b2cbaa7
+$(DL_FILE)_MD5 = ea9d8147f39c44ce00dd2d7eb19ce0ea
 
 install : $(TARGET)
 

lfs/snort

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.0.3
+VER        = 2.9.0.4
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5f0c48b06453696ad32e27b9b3dd6603
+$(DL_FILE)_MD5 = 09b2a2d47d3de8106d0b625f7d8070c5
 
 install : $(TARGET)