X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fsnort;h=2e2f4f2e40cb6bf514c29bf3f1ce1e0ff4183b87;hp=7dd334cdab17422e58e80659e0a572b70ca4b4f9;hb=ce0e83b3badfd2b4048762ffffc8041c7f92cb19;hpb=83843a1c795290390938b4fa69cc774896291210

diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort
old mode 100755
new mode 100644
index 7dd334cdab..2e2f4f2e40
--- a/src/initscripts/init.d/snort
+++ b/src/initscripts/init.d/snort
@@ -15,74 +15,128 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin; export PATH
+
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/snort/settings)
 
 if [ "$ENABLE_SNORT_ORANGE" == "on" ]; then
-	HOME_NET+="$ORANGE_ADDRESS,"
-	DEVICES+="$ORANGE_DEV "
+        HOME_NET+="$ORANGE_ADDRESS,"
+        DEVICES+="$ORANGE_DEV "
 fi
 
 if [ "$ENABLE_SNORT_GREEN" == "on" ]; then
-	HOME_NET+="$GREEN_ADDRESS,"
-	DEVICES+="$GREEN_DEV "
+        HOME_NET+="$GREEN_ADDRESS,"
+        DEVICES+="$GREEN_DEV "
 fi
 
 if [ "$ENABLE_SNORT_BLUE" == "on" ]; then
-	HOME_NET+="$BLUE_ADDRESS,"
-	DEVICES+="$BLUE_DEV "
+        HOME_NET+="$BLUE_ADDRESS,"
+        DEVICES+="$BLUE_DEV "
 fi
 
 if [ "$ENABLE_SNORT" == "on" ]; then
-	LOCAL_IP=`cat /var/ipfire/red/local-ipaddress`
-	if [ "$LOCAL_IP" ]; then
-		HOME_NET+="$LOCAL_IP,"
-	else
-		exit 1 ## Add error handling here
-	fi
-	DEVICES+="`cat /var/ipfire/red/iface` "
+        LOCAL_IP=`cat /var/ipfire/red/local-ipaddress`
+        if [ "$LOCAL_IP" ]; then
+                HOME_NET+="$LOCAL_IP,"
+        else
+                exit 1 ## Add error handling here
+        fi
+        DEVICES+=`cat /var/ipfire/red/iface 2>/dev/null`
 fi
 
 COUNT=`echo $HOME_NET | wc -m`
 HOME_NET=`echo $HOME_NET | cut -c $[$COUNT - 2]`
  
-echo "var HOME_NET [$HOME_NET]" >	/etc/snort/vars
-echo "var EXTERNAL_NET ANY" >> 		/etc/snort/vars
+echo "var HOME_NET [$HOME_NET]" >       /etc/snort/vars
+echo "var EXTERNAL_NET ANY" >>          /etc/snort/vars
 
-DNS1=`cat /var/ipfire/red/dns1`
-DNS2=`cat /var/ipfire/red/dns2`
+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 "var DNS_SERVERS [$DNS1,$DNS2]" >> /etc/snort/vars
 else
-	echo "car DNS_SERVERS $DNS1" >> /etc/snort/vars
+        echo "var DNS_SERVERS $DNS1" >> /etc/snort/vars
 fi 
 
 case "$1" in
-	start)
-		for DEVICE in $DEVICES; do
-			boot_mesg "Starting Intrusion Detection System on $DEVICE..."
-			loadproc /usr/sbin/snort -c snort.conf -i $DEVICE -D -l /var/log/snort --pid-path /var/run/snort_$DEVICE.pid
-		done
-		;;
-	stop)
-		for DEVICE in $DEVICES; do
-			boot_mesg "Stopping Intrusion Detection System on $DEVICE..."
-			killproc -p /var/run/snort_$DEVICE.pid /var/run
+        start)
+		# Disable incompatible rules
+		for file in $(ls /etc/snort/rules/*.rules); do
+			sed -i 's|^alert.*!\[\$DNS_SERVERS|#&|g' $file
+			sed -i 's|^alert.*!\$SSH_PORTS|#&|g' $file
+			sed -i 's|^alert.*!\$HOME_NET|#&|g' $file
+			sed -i 's|^alert.*!\$SQL_SERVERS|#&|g' $file
 		done
-		;;
-	status)
-		statusproc /usr/sbin/snort
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-		
-	*)
-		echo "Usage: $0 {start|stop|restart|status|update}"
-		exit 1
-		;;
+
+                for DEVICE in $DEVICES; do
+                        boot_mesg "Starting Intrusion Detection System on $DEVICE..."
+                        /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --create-pidfile --nolock-pidfile --pid-path /var/run/
+                        evaluate_retval
+			sleep 1
+                        chmod 644 /var/run/snort_$DEVICE.pid
+                done
+                
+	  
+                if [ -r /var/ipfire/guardian/enable ]; then
+		              IFACE=`/bin/cat /var/ipfire/red/iface 2>/dev/null | /usr/bin/tr -d '\012'`
+	                sed -e "s/^Interface.*/Interface       ${IFACE}/" /var/ipfire/guardian/guardian.conf > temp
+	                mv temp /var/ipfire/guardian/guardian.conf
+			chown nobody.root /var/ipfire/guardian/guardian.conf
+	              
+                  boot_mesg "Starting Guardian..."
+		              loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf
+		            fi
+		    ;;
+                
+        stop)
+               DEVICES=""
+               if [ -r /var/run/snort_$BLUE_DEV.pid ]; then
+                 DEVICES+="$BLUE_DEV "
+               fi
+               
+               if [ -r /var/run/snort_$GREEN_DEV.pid ]; then
+                 DEVICES+="$GREEN_DEV "
+              fi
+             
+              if [ -r /var/run/snort_$ORANGE_DEV.pid ]; then
+                 DEVICES+="$ORANGE_DEV "
+              fi
+      
+              RED=`cat /var/ipfire/red/iface 2>/dev/null`
+              if [ -r /var/run/snort_$RED.pid ]; then
+                 DEVICES+=`cat /var/ipfire/red/iface 2>/dev/null`
+              fi
+       
+              for DEVICE in $DEVICES; do
+                 boot_mesg "Stopping Intrusion Detection System on $DEVICE..."
+                 killproc -p /var/run/snort_$DEVICE.pid /var/run
+              done
+              
+              rm /var/run/snort_* >/dev/null 2>/dev/null
+                
+              if [ -r /var/ipfire/guardian/enable ]; then
+		          boot_mesg "Stopping Guardian..."
+		          killproc /usr/local/bin/guardian.pl
+		          fi
+        ;;
+                
+        status)
+                statusproc /usr/sbin/snort
+                ;;
+                
+        restart)
+                $0 stop
+                $0 start
+                ;;
+                
+        *)
+                echo "Usage: $0 {start|stop|restart|status}"
+                exit 1
+                ;;
 esac
 
+chmod 644 /var/log/snort/* 2>/dev/null
+
 # End $rc_base/init.d/snort