[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 89f3d66c24acadc30c72c97fc8012e9f995e7eee
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 89f3d66c24acadc30c72c97fc8012e9f995e7eee (commit) via 429dc4a2fc3068273733e1661a3a56896739cf27 (commit) via 00175664f300a55257228d86aa1871700591a508 (commit) via 7fcfb2dae9110d35da769da4916fbade463434dc (commit) from 3797305ec02cb8bc374813b1a15aea5fb9b70a48 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 89f3d66c24acadc30c72c97fc8012e9f995e7eee Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Nov 27 12:50:19 2011 +0100
snort: update to 2.9.1.2.
commit 429dc4a2fc3068273733e1661a3a56896739cf27 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Nov 27 12:40:11 2011 +0100
daq: update to 0.6.2.
commit 00175664f300a55257228d86aa1871700591a508 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Nov 24 22:49:46 2011 +0100
smartmontools: update to 5.42.
commit 7fcfb2dae9110d35da769da4916fbade463434dc Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Nov 24 21:33:19 2011 +0100
htop: update to 1.0.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/snort | 64 +++++++++++++ config/snort/snort.conf | 203 ++++++++++++++++++++++++++++++----------- html/cgi-bin/ids.cgi | 8 +- lfs/daq | 4 +- lfs/htop | 6 +- lfs/smartmontools | 4 +- lfs/snort | 4 +- src/initscripts/init.d/snort | 6 +- 8 files changed, 226 insertions(+), 73 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 090a950..e07d6b5 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -6,7 +6,50 @@ etc/snort/snort.conf etc/snort/unicode.map usr/bin/u2boat usr/bin/u2spewfoo +#usr/include/snort +#usr/include/snort/dynamic_preproc +#usr/include/snort/dynamic_preproc/bitop.h +#usr/include/snort/dynamic_preproc/cpuclock.h +#usr/include/snort/dynamic_preproc/idle_processing.h +#usr/include/snort/dynamic_preproc/ipv6_port.h +#usr/include/snort/dynamic_preproc/mempool.h +#usr/include/snort/dynamic_preproc/obfuscation.h +#usr/include/snort/dynamic_preproc/preprocids.h +#usr/include/snort/dynamic_preproc/profiler.h +#usr/include/snort/dynamic_preproc/segment_mem.h +#usr/include/snort/dynamic_preproc/sfPolicy.h +#usr/include/snort/dynamic_preproc/sfPolicyUserData.h +#usr/include/snort/dynamic_preproc/sf_decompression.h +#usr/include/snort/dynamic_preproc/sf_dynamic_common.h +#usr/include/snort/dynamic_preproc/sf_dynamic_define.h +#usr/include/snort/dynamic_preproc/sf_dynamic_engine.h +#usr/include/snort/dynamic_preproc/sf_dynamic_meta.h +#usr/include/snort/dynamic_preproc/sf_dynamic_preproc_lib.h +#usr/include/snort/dynamic_preproc/sf_dynamic_preprocessor.h +#usr/include/snort/dynamic_preproc/sf_ip.h +#usr/include/snort/dynamic_preproc/sf_preproc_info.h +#usr/include/snort/dynamic_preproc/sf_protocols.h +#usr/include/snort/dynamic_preproc/sf_sdlist_types.h +#usr/include/snort/dynamic_preproc/sf_snort_packet.h +#usr/include/snort/dynamic_preproc/sf_snort_plugin_api.h +#usr/include/snort/dynamic_preproc/sfcommon.h +#usr/include/snort/dynamic_preproc/sfcontrol.h +#usr/include/snort/dynamic_preproc/sfrt.h +#usr/include/snort/dynamic_preproc/sfrt_dir.h +#usr/include/snort/dynamic_preproc/sfrt_flat.h +#usr/include/snort/dynamic_preproc/sfrt_flat_dir.h +#usr/include/snort/dynamic_preproc/sfrt_trie.h +#usr/include/snort/dynamic_preproc/snort_bounds.h +#usr/include/snort/dynamic_preproc/snort_debug.h +#usr/include/snort/dynamic_preproc/ssl.h +#usr/include/snort/dynamic_preproc/str_search.h +#usr/include/snort/dynamic_preproc/stream_api.h usr/lib/pkgconfig/snort.pc +usr/lib/pkgconfig/snort_preproc.pc +#usr/lib/snort +usr/lib/snort/dynamic_preproc +#usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.a +#usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.la usr/lib/snort_dynamicengine #usr/lib/snort_dynamicengine/libsf_engine.la #usr/lib/snort_dynamicengine/libsf_engine.so @@ -25,10 +68,26 @@ usr/lib/snort_dynamicpreprocessor #usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so #usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0 #usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0 +#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.la +#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so +#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so.0 +#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so.0.0.0 +#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.la +#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so +#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so.0 +#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so.0.0.0 +#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.la +#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so +#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so.0 +#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so.0.0.0 #usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.la #usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so #usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so.0 #usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so.0.0.0 +#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.la +#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so +#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so.0 +#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so.0.0.0 #usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.la #usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so #usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.0 @@ -59,6 +118,7 @@ usr/sbin/snort #usr/share/doc/snort/README.active #usr/share/doc/snort/README.alert_order #usr/share/doc/snort/README.asn1 +#usr/share/doc/snort/README.counts #usr/share/doc/snort/README.csv #usr/share/doc/snort/README.daq #usr/share/doc/snort/README.database @@ -73,16 +133,20 @@ usr/sbin/snort #usr/share/doc/snort/README.ftptelnet #usr/share/doc/snort/README.gre #usr/share/doc/snort/README.http_inspect +#usr/share/doc/snort/README.imap #usr/share/doc/snort/README.ipip #usr/share/doc/snort/README.ipv6 #usr/share/doc/snort/README.multipleconfigs #usr/share/doc/snort/README.normalize #usr/share/doc/snort/README.pcap_readmode +#usr/share/doc/snort/README.pop #usr/share/doc/snort/README.ppm #usr/share/doc/snort/README.reload +#usr/share/doc/snort/README.reputation #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.sip #usr/share/doc/snort/README.ssh #usr/share/doc/snort/README.ssl #usr/share/doc/snort/README.stream5 diff --git a/config/snort/snort.conf b/config/snort/snort.conf index 3afa6f1..0ce0140 100644 --- a/config/snort/snort.conf +++ b/config/snort/snort.conf @@ -1,68 +1,66 @@ -#-------------------------------------------------- -# http://www.snort.org Snort Ruleset -# Contact: snort-sigs@lists.sourceforge.net -#-------------------------------------------------- -# $Id$ -# ################################################### -# This file contains a sample snort configuration. -# You should take the following steps to create your own custom configuration: +# IPFire snort.conf # -# 1) Set the network variables. -# 2) Configure the decoder -# 3) Configure the base detection engine -# 4) Configure dynamic loaded libraries -# 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 +# some parts of this file are changed/updated by the webif ################################################### +# VERSIONS : 2.9.1.1 + +include /etc/snort/vars
################################################### # Step #1: Set the network variables. For more information, see README.variables ###################################################
-include /etc/snort/vars - -# Setup the network addresses you are protecting # taken from /etc/snort vars -#var HOME_NET any +#ipvar HOME_NET any
-# Set up the external network addresses. A good start may be "any" -var EXTERNAL_NET any +# Set up the external network addresses. Leave as "any" in most situations +ipvar EXTERNAL_NET any
# List of DNS servers on your network -# taken from /etc/snort vars -#var DNS_SERVERS $HOME_NET +#ipvar DNS_SERVERS $HOME_NET
# List of SMTP servers on your network -var SMTP_SERVERS $HOME_NET +ipvar SMTP_SERVERS $HOME_NET
# List of web servers on your network -var HTTP_SERVERS $HOME_NET +ipvar HTTP_SERVERS $HOME_NET
# List of sql servers on your network -var SQL_SERVERS $HOME_NET +ipvar SQL_SERVERS $HOME_NET
# List of telnet servers on your network -var TELNET_SERVERS $HOME_NET +ipvar TELNET_SERVERS $HOME_NET
# List of ssh servers on your network -var SSH_SERVERS $HOME_NET +ipvar SSH_SERVERS $HOME_NET + +# List of ftp servers on your network +ipvar FTP_SERVERS $HOME_NET + +# List of sip servers on your network +ipvar SIP_SERVERS $HOME_NET
# List of ports you run web servers on -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] +portvar HTTP_PORTS [80,81,311,444,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,5250,7001,7777,7779,8000,8008,8028,8080,8088,8118,8123,8180,8181,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 1024: -# List of ssh ports -portvar SSH_PORTS [22,222] + +# List of ports you want to look for SSH connections on: +portvar SSH_PORTS [22,222] + +# List of ports you run ftp servers on +portvar FTP_PORTS [21,2100,3535] + +# List of ports you run SIP servers on +portvar SIP_PORTS [5060,5061,5600] + # 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] +ipvar 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]
# Path to your rules files (this can be a relative path) # Note for Windows users: You are advised to make this an absolute path, @@ -71,6 +69,7 @@ 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 ################################################### @@ -85,13 +84,13 @@ config disable_tcpopt_experimental_alerts config disable_tcpopt_obsolete_alerts
# Stop Alerts on T/TCP alerts -#config disable_tcpopt_ttcp_alerts +# config disable_tcpopt_ttcp_alerts
# Stop Alerts on all other TCPOption type events: config disable_tcpopt_alerts
# Stop Alerts on invalid ip options -#config disable_ipopt_alerts +# config disable_ipopt_alerts
# Alert if value in length field (IP, TCP, UDP) is greater th elength of the packet # config enable_decode_oversized_alerts @@ -111,6 +110,39 @@ config checksum_mode: all
# Configure active response for non inline operation. For more information, see REAMDE.active # config response: eth0 attempts 2 + +# Configure DAQ related options for inline operation. For more information, see README.daq +# +# config daq: <type> +# config daq_dir: <dir> +# config daq_mode: <mode> +# config daq_var: <var> +# +# <type> ::= pcap | afpacket | dump | nfq | ipq | ipfw +# <mode> ::= read-file | passive | inline +# <var> ::= arbitrary <name>=<value passed to DAQ +# <dir> ::= path as to where to look for DAQ module so's + +# Configure specific UID and GID to run snort as after dropping privs. For more information see snort -h command line options +# +# config set_gid: +# config set_uid: + +# Configure default snaplen. Snort defaults to MTU of in use interface. For more information see README +# +# config snaplen: +# + +# Configure default bpf_file to use for filtering what traffic reaches snort. For more information see snort -h command line options (-F) +# +# config bpf_file: +# + +# Configure default log directory for snort to log to. For more information see snort -h command line options (-l) +# +# config logdir: + + ################################################### # Step #3: Configure the base detection engine. For more information, see README.decode ################################################### @@ -149,6 +181,7 @@ config event_queue: max_queue 8 log 3 order_events content_length
#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 @@ -161,7 +194,7 @@ dynamicpreprocessor directory /usr/lib/snort_dynamicpreprocessor/ dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so
# path to dynamic rules libraries -# dynamicdetection directory /usr/lib/snort_dynamicrules +# dynamicdetection directory /usr/local/lib/snort_dynamicrules
################################################### # Step #5: Configure preprocessors @@ -173,20 +206,27 @@ dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so 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 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 yes, track_icmp no max_active_responses 2 min_response_seconds 5 - +preprocessor stream5_global: track_tcp yes, \ + track_udp yes, \ + track_icmp no, \ + max_tcp 262144, \ + max_udp 131072, \ + max_active_responses 2, \ + min_response_seconds 5 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 \ + 7000 8181 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, \ + ports both 80 81 311 443 465 563 591 593 636 901 989 992 993 994 995 1220 1414 1830 2301 2381 2809 3128 3702 5250 7907 7001 7802 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 @@ -195,8 +235,7 @@ preprocessor stream5_udp: timeout 180 # 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 compress_depth 20480 decompress_depth 20480 - +preprocessor http_inspect: global iis_unicode_map unicode.map 1252 compress_depth 65535 decompress_depth 65535 preprocessor http_inspect_server: server default \ chunk_length 500000 \ server_flow_depth 0 \ @@ -205,7 +244,7 @@ preprocessor http_inspect_server: server default \ 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 } \ + ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 5250 7001 7777 7779 8000 8008 8028 8080 8088 8118 8123 8180 8181 8243 8280 8888 9090 9091 9443 9999 11371 } \ non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \ enable_cookie \ extended_response_inspection \ @@ -215,14 +254,13 @@ preprocessor http_inspect_server: server default \ apache_whitespace no \ ascii no \ bare_byte no \ - base36 no \ directory no \ double_decode no \ iis_backslash no \ iis_delimiter no \ iis_unicode no \ multi_slash no \ - utf_8 no \ + utf_8 no \ u_encode yes \ webroot no
@@ -234,12 +272,10 @@ preprocessor bo
# FTP / Telnet normalization and anomaly detection. For more information, see README.ftptelnet 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 3535 } \ @@ -277,18 +313,24 @@ preprocessor ftp_telnet_protocol: ftp server default \ 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 \ ignore_telnet_erase_cmds yes \ telnet_cmds yes
+ # SMTP normalization and anomaly detection. For more information, see README.SMTP preprocessor smtp: ports { 25 465 587 691 } \ inspection_type stateful \ - enable_mime_decoding \ - max_mime_depth 20480 \ + b64_decode_depth 0 \ + qp_decode_depth 0 \ + bitenc_decode_depth 0 \ + uu_decode_depth 0 \ + log_mailfrom \ + log_rcptto \ + log_filename \ + log_email_hdrs \ normalize cmds \ normalize_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \ normalize_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \ @@ -316,7 +358,7 @@ preprocessor sfportscan: proto { all } memcap { 10000000 } sense_level { medium # preprocessor arpspoof_detect_host: 192.168.40.1 f0:0f:00:f0:0f:00
# SSH anomaly detection. For more information, see README.ssh -preprocessor ssh: server_ports { 22 222 } \ +preprocessor ssh: server_ports { 22,222 } \ autodetect \ max_client_bytes 19600 \ max_encrypted_packets 20 \ @@ -329,17 +371,66 @@ preprocessor dcerpc2: memcap 102400, events [co ] preprocessor dcerpc2_server: default, policy WinXP, \ detect [smb [139,445], tcp 135, udp 135, rpc-over-http-server 593], \ autodetect [tcp 1025:, udp 1025:, rpc-over-http-server 1025:], \ - smb_max_chain 3 + smb_max_chain 3, smb_invalid_shares ["C$", "D$", "ADMIN$"]
# DNS anomaly detection. For more information, see README.dns 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 +preprocessor ssl: ports { 443 444 465 563 636 989 992 993 994 995 7801 7802 7900 7901 7902 7903 7904 7905 7906 7907 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
+# SIP Session Initiation Protocol preprocessor. For more information see README.sip +preprocessor sip: max_sessions 10000, \ + ports { 5060 5061 5600 }, \ + methods { invite \ + cancel \ + ack \ + bye \ + register \ + options \ + refer \ + subscribe \ + update \ + join \ + info \ + message \ + notify \ + benotify \ + do \ + qauth \ + sprack \ + publish \ + service \ + unsubscribe \ + prack }, \ + max_uri_len 512, \ + max_call_id_len 80, \ + max_requestName_len 20, \ + max_from_len 256, \ + max_to_len 256, \ + max_via_len 1024, \ + max_contact_len 512, \ + max_content_len 1024 + +# IMAP preprocessor. For more information see README.imap +preprocessor imap: \ + ports { 143 } \ + b64_decode_depth 0 \ + qp_decode_depth 0 \ + bitenc_decode_depth 0 \ + uu_decode_depth 0 + +# POP preprocessor. For more information see README.pop +preprocessor pop: \ + ports { 110 } \ + b64_decode_depth 0 \ + qp_decode_depth 0 \ + bitenc_decode_depth 0 \ + uu_decode_depth 0 + ################################################### # Step #6: Configure output plugins # For more information, see Snort Manual, Configuring Snort - Output Modules @@ -352,6 +443,7 @@ preprocessor sensitive_data: alert_threshold 25 # 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
@@ -375,5 +467,6 @@ include /etc/snort/rules/reference.config # For more information, see Snort Manual, Writing Snort Rules ###################################################
+# # site specific rules - +# diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 220bad0..31b8730 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,13 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control #################################
if ($snortsettings{'RULES'} eq 'subscripted') { - #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$sn..."; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904_s.tar.gz/$snortsetti..."; - #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings%7B%27OINKCODE%27%..."; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2912_s.tar.gz/$snortsetti..."; } elsif ($snortsettings{'RULES'} eq 'registered') { - #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snor..."; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2904.tar.gz/$snortsetting..."; - #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings%7B%27OINKCODE%27%..."; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2912.tar.gz/$snortsetting..."; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } diff --git a/lfs/daq b/lfs/daq index 47e404c..df35661 100644 --- a/lfs/daq +++ b/lfs/daq @@ -24,7 +24,7 @@
include Config
-VER = 0.5 +VER = 0.6.2
THISAPP = daq-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ea9d8147f39c44ce00dd2d7eb19ce0ea +$(DL_FILE)_MD5 = 6ea8aaa6f067f8b8ef6de45b95d55875
install : $(TARGET)
diff --git a/lfs/htop b/lfs/htop index 0f65426..967fc8a 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,7 +24,7 @@
include Config
-VER = 0.9 +VER = 1.0
THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 4 +PAK_VER = 5
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7c5507f35f363f3f40183a2ba3c561f8 +$(DL_FILE)_MD5 = 325112ca7947ea1f6d6441f631e00384
install : $(TARGET)
diff --git a/lfs/smartmontools b/lfs/smartmontools index 3f92cb7..63e51f2 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -24,7 +24,7 @@
include Config
-VER = 5.41 +VER = 5.42
THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692 +$(DL_FILE)_MD5 = 4460bf9a79a1252ff5c00ba52cf76b2a
install : $(TARGET)
diff --git a/lfs/snort b/lfs/snort index ebffada..8b69397 100644 --- a/lfs/snort +++ b/lfs/snort @@ -24,7 +24,7 @@
include Config
-VER = 2.9.0.4 +VER = 2.9.1.2
THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 09b2a2d47d3de8106d0b625f7d8070c5 +$(DL_FILE)_MD5 = 9e94f20b934566469c239966e1b41eba
install : $(TARGET)
diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index b157b80..42968d8 100644 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -61,15 +61,15 @@ case "$1" in fi fi HOMENET+="127.0.0.1" - echo "var HOME_NET [$HOMENET]" > /etc/snort/vars + echo "ipvar HOME_NET [$HOMENET]" > /etc/snort/vars
DNS1=`cat /var/ipfire/red/dns1 2>/dev/null` DNS2=`cat /var/ipfire/red/dns2 2>/dev/null`
if [ "$DNS2" ]; then - echo "var DNS_SERVERS [$DNS1,$DNS2]" >> /etc/snort/vars + echo "ipvar DNS_SERVERS [$DNS1,$DNS2]" >> /etc/snort/vars else - echo "var DNS_SERVERS $DNS1" >> /etc/snort/vars + echo "ipvar DNS_SERVERS $DNS1" >> /etc/snort/vars fi
for DEVICE in $DEVICES; do
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org