WebSVN – ALCASAR – Diff – /scripts/alcasar-activity_report.sh

 #!/bin/bash
-# $Id: alcasar-activity_report.sh 2644 2018-10-29 14:09:33Z lucas.echard $
+# $Id: alcasar-activity_report.sh 2688 2019-01-18 23:15:49Z lucas.echard $
+#
 # Create an activity report for ALCASAR every week (sunday at 5.35 pm --> see cron.d).
 # We read configuration files and logs to create cool charts.
 # Written by Raphaël PION, Rexy & Tom HOUDAYER
 echo "Create information about system and ALCASAR"
 #contain every information about ALCASAR configuration, system and last update
 cat $MODEL_TABINFO | while read LINE_HTML
 do
+	if [ "$(echo $LINE_HTML | grep 'XXORGXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(grep ^ORGANISM= $CONF_FILE | cut -d'=' -f2-)
+		echo ${LINE_HTML/XXORGXX/$VALUE} >> $HTML_REPORT
-if [ $(echo $LINE_HTML | grep 'XXORGXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(grep ^ORGANISM= $CONF_FILE | cut -d'=' -f2-)
-	echo ${LINE_HTML/XXORGXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXINSTALLXX' | wc -l) -eq 1 ]
+	elif [ "$(echo $LINE_HTML | grep 'XXINSTALLXX' | wc -l)" -eq 1 ]
-then
-	VALUE=$(grep ^INSTALL_DATE= $CONF_FILE | cut -d'=' -f2)
-	echo ${LINE_HTML/XXINSTALLXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXAVERSIONXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(grep ^VERSION= $CONF_FILE | cut -d'=' -f2)
-	echo ${LINE_HTML/XXAVERSIONXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXIP_PUBLICXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(grep ^PUBLIC_IP= $CONF_FILE | cut -d'=' -f2)
-	echo ${LINE_HTML/XXIP_PUBLICXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXIP_PRIVEXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(grep ^PRIVATE_IP= $CONF_FILE | cut -d'=' -f2)
-	echo ${LINE_HTML/XXIP_PRIVEXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXGWXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(grep ^GW= $CONF_FILE | cut -d'=' -f2)
-	echo ${LINE_HTML/XXGWXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXDNS1XX' | wc -l) -eq 1 ]
-then
-	VALUE=$(grep ^DNS1= $CONF_FILE | cut -d'=' -f2)
-	echo ${LINE_HTML/XXDNS1XX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXDNS2XX' | wc -l) -eq 1 ]
-then
-	VALUE=$(grep ^DNS2= $CONF_FILE | cut -d'=' -f2)
-	echo ${LINE_HTML/XXDNS2XX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXHOSTXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(hostname)
-	echo ${LINE_HTML/XXHOSTXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXOS_VERSIONXX' | wc -l) -eq 1 ]
-then
-	VALUE=$( echo $(uname -r) [ $(uname -m) ] )
-	echo ${LINE_HTML/XXOS_VERSIONXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXREBOOTXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(echo $(who -b | cut -d' ' -f12-))
-	echo ${LINE_HTML/XXREBOOTXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXMAJCLAMAVXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(date -d @$(rpm -qa --queryformat "%{installtime} %{name}\n" | grep -E "clamav-db" | cut -d' ' -f1 ) "+%Y-%m-%d %H:%M:%S")
-	echo ${LINE_HTML/XXMAJCLAMAVXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXMAJBLXX' | wc -l) -eq 1 ]
-then
-	VALUE=$(cat /etc/e2guardian/lists/blacklists/README | grep 'Last version' | cut -d' ' -f4-6)
-	echo ${LINE_HTML/XXMAJBLXX/$VALUE} >> $HTML_REPORT
-elif [ $(echo $LINE_HTML | grep 'XXRPMXX' | wc -l) -eq 1 ]
-then
-	#show every ALCASAR RPM updated since X day ago
-	#get timestamp of X day ago. Then we get every packets chich have been updated since this date.
-	if [ $(rpm -qa --queryformat '%{installtime} %{name} %{version}\n' | awk -v seuil="$SECS_AGO" '$1 > seuil' | sort -n | grep -E "$PACKAGE" | wc -l) -gt 1 ]
 	then
+		VALUE=$(grep ^INSTALL_DATE= $CONF_FILE | cut -d'=' -f2)
+		echo ${LINE_HTML/XXINSTALLXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXAVERSIONXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(grep ^VERSION= $CONF_FILE | cut -d'=' -f2)
+		echo ${LINE_HTML/XXAVERSIONXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXIP_PUBLICXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(grep ^PUBLIC_IP= $CONF_FILE | cut -d'=' -f2)
+		echo ${LINE_HTML/XXIP_PUBLICXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXIP_PRIVEXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(grep ^PRIVATE_IP= $CONF_FILE | cut -d'=' -f2)
+		echo ${LINE_HTML/XXIP_PRIVEXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXGWXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(grep ^GW= $CONF_FILE | cut -d'=' -f2)
+		echo ${LINE_HTML/XXGWXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXDNS1XX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(grep ^DNS1= $CONF_FILE | cut -d'=' -f2)
+		echo ${LINE_HTML/XXDNS1XX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXDNS2XX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(grep ^DNS2= $CONF_FILE | cut -d'=' -f2)
+		echo ${LINE_HTML/XXDNS2XX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXHOSTXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(hostname)
+		echo ${LINE_HTML/XXHOSTXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXOS_VERSIONXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(echo "$(uname -r) [ $(uname -m) ]")
+		echo ${LINE_HTML/XXOS_VERSIONXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXREBOOTXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(who -b | cut -d' ' -f12-)
+		echo ${LINE_HTML/XXREBOOTXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXMAJCLAMAVXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(date -d "@$(rpm -qa --queryformat "%{installtime} %{name}\n" | grep -E "clamav-db" | cut -d' ' -f1 )" "+%Y-%m-%d %H:%M:%S")
+		echo ${LINE_HTML/XXMAJCLAMAVXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXMAJBLXX' | wc -l)" -eq 1 ]
+	then
+		VALUE=$(cat /etc/e2guardian/lists/blacklists/README | grep 'Last version' | cut -d' ' -f4-6)
+		echo ${LINE_HTML/XXMAJBLXX/$VALUE} >> $HTML_REPORT
+	elif [ "$(echo $LINE_HTML | grep 'XXRPMXX' | wc -l)" -eq 1 ]
+	then
+		#show every ALCASAR RPM updated since X day ago
+		#get timestamp of X day ago. Then we get every packets chich have been updated since this date.
+		if [ "$(rpm -qa --queryformat '%{installtime} %{name} %{version}\n' | awk -v seuil="$SECS_AGO" '$1 > seuil' | sort -n | grep -E "$PACKAGE" | wc -l)" -gt 1 ]
+		then
-		PACKAGE='php|lighttpd|iptables|dnsmasq|radius|tinyproxy|nfdump|e2guardian|clamav|ulogd|chilli|fail2ban|openssh|havp|ipt-netflow|wget'
+			PACKAGE='php|lighttpd|iptables|dnsmasq|unbound|radius|tinyproxy|nfdump|e2guardian|clamav|ulogd|chilli|fail2ban|openssh|havp|ipt-netflow|wget'
-		rpm -qa --queryformat '%{installtime} %{name} %{version}\n' | awk -v seuil="$SECS_AGO" '$1 > seuil' | sort -n | grep -E "$PACKAGE" | while read RPM_ALCASAR
+			rpm -qa --queryformat '%{installtime} %{name} %{version}\n' | awk -v seuil="$SECS_AGO" '$1 > seuil' | sort -n | grep -E "$PACKAGE" | while read RPM_ALCASAR
-		do
+			do
-			RPM_TIMESTAMP=$(echo $RPM_ALCASAR | cut -d' ' -f1)
+				RPM_TIMESTAMP=$(echo $RPM_ALCASAR | cut -d' ' -f1)
-			RPM_DATE=$(date -d @$(echo $RPM_TIMESTAMP) "+%Y-%m-%d %H:%M:%S")
+				RPM_DATE=$(date -d "@$(echo $RPM_TIMESTAMP)" "+%Y-%m-%d %H:%M:%S")
-			RPM_NAME=$(echo $RPM_ALCASAR | cut -d' ' -f2)
+				RPM_NAME=$(echo $RPM_ALCASAR | cut -d' ' -f2)
-			RPM_VERSION=$(echo $RPM_ALCASAR | cut -d' ' -f3)
+				RPM_VERSION=$(echo $RPM_ALCASAR | cut -d' ' -f3)
-			echo "<tr>" >> $HTML_REPORT
+				echo "<tr>" >> $HTML_REPORT
-			echo "<td>$RPM_NAME</td>" >> $HTML_REPORT
+				echo "<td>$RPM_NAME</td>" >> $HTML_REPORT
-			echo "<td>$RPM_DATE</td>" >> $HTML_REPORT
+				echo "<td>$RPM_DATE</td>" >> $HTML_REPORT
-			echo "<td>$RPM_VERSION</td>" >> $HTML_REPORT
+				echo "<td>$RPM_VERSION</td>" >> $HTML_REPORT
-			echo "</tr>" >> $HTML_REPORT
+				echo "</tr>" >> $HTML_REPORT
-		done
+			done
+		else
+			echo "<tr><td colspan=\"3\">Pas de RPM mis à jour cette semaine</td></tr>" >> $HTML_REPORT
+		fi
 	else
-		echo "<tr><td colspan=\"3\">Pas de RPM mis à jour cette semaine</td></tr>" >> $HTML_REPORT
+		echo $LINE_HTML >> $HTML_REPORT
 	fi
-else
-	echo $LINE_HTML >> $HTML_REPORT
-fi
 done
 ######################BL WEBSITE SINCE INSTALLATION######################
 echo "Create BL website since the installation of ALCASAR"
 #find data
 #decompress every logs
-if [ $(ls -1 /var/log/dnsmasq/dnsmasq-blacklist.log.*.gz 2>/dev/null | wc -l) -ge 1 ]
+if [ "$(ls -1 /var/log/unbound/unbound-blacklist.log.*.gz 2>/dev/null | wc -l)" -ge 1 ]
 then
-	gunzip -d dnsmasq-blacklist.log.*.gz
+	gunzip -d unbound-blacklist.log.*.gz
 fi
 #convert logs date in timestamp and find categories of blacklisted website
+tmp_log=$(mktemp)
-for FILE in $(ls -1 /var/log/dnsmasq/ | grep 'dnsmasq-blacklist.log')
+for FILE in /var/log/unbound/unbound-blacklist.log*
 do
+	grep -E "info: [^ ]+ typetransparent $PRIVATE_IP" /var/log/unbound/unbound-blacklist.log > $tmp_log
 	while read LOG_BL
 	do
-		if [ $(echo $LOG_BL | grep config | grep $PRIVATE_IP | wc -c) -ge 1 ]
-		then
-			#find the current blacklisted category
+		# find the current blacklisted category
-			website_bl=$(echo $LOG_BL | cut -d' ' -f6)
+		website_bl=$(echo $LOG_BL | cut -d' ' -f4)
-			#we convert www.test.co.uk => test.co.uk to find the category of this website
-			if [ $(grep -o '\.' <<< "$website_bl" | wc -l) -ge "2" ]
-			then
-					website_bl=$(echo $website_bl | cut -d'.' -f2-)
+		website_bl=${website_bl%?} # remove the last character
-			fi
-			#get BL category
-			categorie_bl=$(grep -R "$website_bl/" /usr/local/share/dnsmasq-bl-enabled/ | cut -d':' -f1 | cut -d'/' -f6 | cut -d' ' -f1)
+		#we convert www.test.co.uk => test.co.uk to find the category of this website
-			if [ $(echo $categorie_bl | wc -w) -gt 1 ]
+		if [ "$(grep -o '\.' <<< "$website_bl" | wc -l)" -ge "2" ]
-			then
+		then
-				categorie_bl=$(grep -R "/$website_bl/" /usr/local/share/dnsmasq-bl-enabled/ | cut -d':' -f1 | cut -d'/' -f6 | cut -d' ' -f1 | head -1)
-			fi
-			#Calculate its timestamp
-			Y=$(date -R | cut -d' ' -f4)
-			M=$(echo $LOG_BL | cut -d' ' -f1)
-			D=$(echo $LOG_BL | cut -d' ' -f2)
+			website_bl=$(echo $website_bl | cut -d'.' -f2-)
-			H=$(echo $LOG_BL | cut -d' ' -f3)
-			CURRENT_TS=$(date -d "$M $D $Y $H" +"%s")
-			echo "$CURRENT_TS:$categorie_bl:" >> $TMP_BL
 		fi
+		#get BL category
+		categorie_bl=$(grep -Rl "$website_bl" /usr/local/share/unbound-bl-enabled/ | cut -d'/' -f6 | head -1)
+		CURRENT_TS=$(echo $LOG_BL | cut -d '[' -f2 | cut -d ']' -f1)
+		echo "$CURRENT_TS:$categorie_bl:" >> $TMP_BL
-	done < /var/log/dnsmasq/$FILE
+	done < $tmp_log
 done
+rm $tmp_log
 #if data exists, create this section in html document
 if [ -e $TMP_BL ]
 then
 	ENABLE_BL=1
 	for TS in $(seq $C_TS -$STEP_TS $DATE_END)
 	do
 		DATE_1=$TS
 		DATE_2=$((TS-$STEP_TS))
 		COUNT_BL_INSTALLATION=0
 		for LINE in $(cat $TMP_BL)
 		do
 			TS_FILE=$(echo $LINE | cut -d':' -f1)
-			if [ "$TS_FILE" -le "$DATE_1" -a "$TS_FILE" -ge "$DATE_2" ]
+			if [ "$TS_FILE" -le "$DATE_1" ] && [ "$TS_FILE" -ge "$DATE_2" ]
 			then
 				COUNT_BL_INSTALLATION=$((COUNT_BL_INSTALLATION+1))
 			fi
 		done
 		VALUE_BL_INSTALLATION_LABEL="'$(date -d @$DATE_2 "+%Y-%m-%d" )', $VALUE_BL_INSTALLATION_LABEL"
 		VALUE_BL_INSTALLATION_DATA="$COUNT_BL_INSTALLATION, $VALUE_BL_INSTALLATION_DATA"
 	done
 	#create Antivirus section in html document
 	#create chart bar in html file with javascript (chartjs.com)
 	echo "<script>" >> $HTML_REPORT
 	cat $MODEL_CHARTJS | while read LINE_JS
 	do
 		#name of variable
-		if [ $(echo $LINE_JS | grep 'XXCONFXX' | wc -l) -eq 1 ]
+		if [ "$(echo $LINE_JS | grep 'XXCONFXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXCONFXX/$CONF_BL_INSTALLATION} >> $HTML_REPORT
 		#chart type
-		elif [ $(echo $LINE_JS | grep 'XXTYPEXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXTYPEXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXTYPEXX/bar} >> $HTML_REPORT
 		#chart title
-		elif [ $(echo $LINE_JS | grep 'XXTITLEXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXTITLEXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXTITLEXX/"Sites bloqués au total"} >> $HTML_REPORT
 		#chart data
-		elif [ $(echo $LINE_JS | grep 'XXDATAXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXDATAXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXDATAXX/$VALUE_BL_INSTALLATION_DATA} >> $HTML_REPORT
 		#color
-		elif [ $(echo $LINE_JS | grep 'XXCOLORXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOLORXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXCOLORXX/$COLOR} >> $HTML_REPORT
 		#labels
-		elif [ $(echo $LINE_JS | grep 'XXLABELSXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXLABELSXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXLABELSXX/$VALUE_BL_INSTALLATION_LABEL} >> $HTML_REPORT
-		elif [ $(echo $LINE_JS | grep 'XXLEGENDXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXLEGENDXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXLEGENDXX/false} >> $HTML_REPORT
 		#display value of Y axis, only useful for chart bar
-		elif [ $(echo $LINE_JS | grep 'XXCOMMENT-BEGINXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOMMENT-BEGINXX' | wc -l)" -eq 1 ]
 		then
 			echo "" >> $HTML_REPORT
 		#display value of Y axis, only useful for chart bar
-		elif [ $(echo $LINE_JS | grep 'XXCOMMENT-ENDXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOMMENT-ENDXX' | wc -l)" -eq 1 ]
 		then
 			echo "" >> $HTML_REPORT
-		elif [ $(echo $LINE_JS | grep 'XXYLABELXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXYLABELXX' | wc -l)" -eq 1 ]
 		then
 			echo "\"Nombre de site bloqué par la blacklist\"" >> $HTML_REPORT
 		else
 			echo $LINE_JS >> $HTML_REPORT
 		fi
 	echo "<h2>Aucune activité de la Blacklist depuis l'installation.</h2>" >> $HTML_REPORT
 fi
-######################DNSMASQ BLACKLIST######################
+######################Unbound BLACKLIST######################
 echo "Create BL website since $MAX_DAY_AGO days"
 #if data exists, create BL section in html document
 if [ -e $TMP_BL ]
 then
 	for LINE in $(cat $TMP_BL)
 	do
 		TS_FILE=$(echo $LINE | cut -d':' -f1)
 		#select only elements between DATE_1 and DATE_2
-		if [ "$TS_FILE" -le "$DATE_1" -a "$TS_FILE" -ge "$DATE_2" ]
+		if [ "$TS_FILE" -le "$DATE_1" ] && [ "$TS_FILE" -ge "$DATE_2" ]
 		then
 			echo $LINE >> $TMP_BL_WEEK
 		fi
 	done
 	#then we count every occurence for each category in TMP_BL_WEEK
-	for CAT in $(ls /usr/local/share/dnsmasq-bl/ -1 | cut -d'.' -f1)
+	for CAT in $(ls /usr/local/share/unbound-bl/ -1 | cut -d'.' -f1)
 	do
 		echo "$CAT:$(grep -o ":$CAT:" <<< "$(cat $TMP_BL_WEEK)" | wc -l):" >> $TMP_BL_WEEK_CAT
 	done
 	#we sort by number of occurence and we take the top 10 BL categories
 	for LINE in $(sort -t':' -k2 -rn $TMP_BL_WEEK_CAT | head -n 10)
 	do
 		DATA=$(echo $LINE | cut -d':' -f2)
 		LABEL=$(echo $LINE | cut -d':' -f1)
 		if [ $DATA -ne 0 ]
 		then
 			VALUE_BL_DATA="$VALUE_BL_DATA $DATA, "
 			VALUE_BL_LABEL="$VALUE_BL_LABEL '$LABEL ($DATA)',"
 		fi
 	done
 	#get other categories (sum them all)
-	if [ $(cat $TMP_BL_WEEK_CAT | cut -d':' -f2 | sort -k1 -rn | tail -n+$(($(echo $VALUE_BL_DATA | wc -w)+1)) | paste -sd+ | bc) -gt 0 ]
+	if [ "$(cat $TMP_BL_WEEK_CAT | cut -d':' -f2 | sort -k1 -rn | tail -n+$(($(echo $VALUE_BL_DATA | wc -w)+1)) | paste -sd+ | bc)" -gt 0 ]
 	then
 		VALUE_BL_DATA="$VALUE_BL_DATA $(cat $TMP_BL_WEEK_CAT | cut -d':' -f2 | sort -k1 -rn | tail -n+$(($(echo $VALUE_BL_DATA | wc -w)+1)) | paste -sd+ | bc)"
 		VALUE_BL_LABEL="$VALUE_BL_LABEL 'autre ($(cat $TMP_BL_WEEK_CAT | cut -d':' -f2 | sort -k1 -rn | tail -n+$(($(echo $VALUE_BL_DATA | wc -w)+1)) | paste -sd+ | bc))'"
 	fi
 	echo "<script>" >> $HTML_REPORT
 	cat $MODEL_CHARTJS | while read LINE_JS
 	do
 		#variable name
-		if [ $(echo $LINE_JS | grep 'XXCONFXX' | wc -l) -eq 1 ]
+		if [ "$(echo $LINE_JS | grep 'XXCONFXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXCONFXX/$CONF_BL} >> $HTML_REPORT
 		#chart type
-		elif [ $(echo $LINE_JS | grep 'XXTYPEXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXTYPEXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXTYPEXX/pie} >> $HTML_REPORT
 		#graph title
-		elif [ $(echo $LINE_JS | grep 'XXTITLEXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXTITLEXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXTITLEXX/"Sites bloqués cette semaine"} >> $HTML_REPORT
 		#chart data
-		elif [ $(echo $LINE_JS | grep 'XXDATAXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXDATAXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXDATAXX/$VALUE_BL_DATA} >> $HTML_REPORT
 		#color
-		elif [ $(echo $LINE_JS | grep 'XXCOLORXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOLORXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXCOLORXX/$COLOR} >> $HTML_REPORT
 		#labels
-		elif [ $(echo $LINE_JS | grep 'XXLABELSXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXLABELSXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXLABELSXX/$VALUE_BL_LABEL} >> $HTML_REPORT
 		#display legend, only useful for chart pie
-		elif [ $(echo $LINE_JS | grep 'XXLEGENDXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXLEGENDXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXLEGENDXX/true} >> $HTML_REPORT
 		#display value of Y axis, only useful for chart bar
-		elif [ $(echo $LINE_JS | grep 'XXCOMMENT-BEGINXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOMMENT-BEGINXX' | wc -l)" -eq 1 ]
 		then
 			echo "/*" >> $HTML_REPORT
 		#display value of Y axis, only useful for chart bar
-		elif [ $(echo $LINE_JS | grep 'XXCOMMENT-ENDXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOMMENT-ENDXX' | wc -l)" -eq 1 ]
 		then
 			echo "*/" >> $HTML_REPORT
 		else
 			echo $LINE_JS >> $HTML_REPORT
 		fi
 ######################VIRUS THREAT######################
 echo "Create AV logs since the installation of ALCASAR"
 #decompress every logs, if they exist
-if [ $(ls -1 /var/log/havp/access.log.*.gz 2>/dev/null | wc -l) -ge 1 ]
+if [ "$(ls -1 /var/log/havp/access.log.*.gz 2>/dev/null | wc -l)" -ge 1 ]
 then
 	gunzip -d access.log.*.gz
 fi
-for FILE in $(ls -1 /var/log/havp/ | grep 'access.log')
+for FILE in /var/log/havp/access.log*
 do
 	while read LINE_AV
 	do
 		Y=$(echo $LINE_AV | cut -d' ' -f1)
 		M=$(echo $LINE_AV | cut -d' ' -f2)
 		D=$(echo $LINE_AV | cut -d' ' -f3)
 		H=$(echo $LINE_AV | cut -d' ' -f4)
 		CURRENT_TS=$(date -d "$M $D $Y $H" +"%s")
 		echo $CURRENT_TS >> $TMP_AV
-	done < /var/log/havp/$FILE
+	done < $FILE
 done
 if [ -e $TMP_AV ]
 then
 	ENABLE_AV=1
 		DATE_2=$((TS-$STEP_TS))
 		COUNT_AV=0
 		for TS_FILE in $(cat $TMP_AV)
 		do
-			if [ "$TS_FILE" -le "$DATE_1" -a "$TS_FILE" -ge "$DATE_2" ]
+			if [ "$TS_FILE" -le "$DATE_1" ] && [ "$TS_FILE" -ge "$DATE_2" ]
 			then
 				COUNT_AV=$((COUNT_AV+1))
 			fi
 		done
 		VALUE_AV_LABEL="'$(date -d @$DATE_2 "+%Y-%m-%d" )', $VALUE_AV_LABEL"
 		VALUE_AV_DATA="$COUNT_AV, $VALUE_AV_DATA"
 	done
 	#create Antivirus section in html document
 	NAME_AV='chart_av'
 	CONF_AV='config_av'
 	echo "<center>" >> $HTML_REPORT
 	echo "<canvas id='$NAME_AV' width='450' height='450' ></canvas>" >> $HTML_REPORT
 	#create chart bar in html file with javascript (chartjs.com)
 	echo "<script>" >> $HTML_REPORT
 	cat $MODEL_CHARTJS | while read LINE_JS
 	do
 		#name of variable
-		if [ $(echo $LINE_JS | grep 'XXCONFXX' | wc -l) -eq 1 ]
+		if [ "$(echo $LINE_JS | grep 'XXCONFXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXCONFXX/$CONF_AV} >> $HTML_REPORT
 		#chart type
-		elif [ $(echo $LINE_JS | grep 'XXTYPEXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXTYPEXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXTYPEXX/bar} >> $HTML_REPORT
 		#graph title
-		elif [ $(echo $LINE_JS | grep 'XXTITLEXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXTITLEXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXTITLEXX/"Menaces bloqués par l\'antivirus"} >> $HTML_REPORT
 		#chart data
-		elif [ $(echo $LINE_JS | grep 'XXDATAXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXDATAXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXDATAXX/$VALUE_AV_DATA} >> $HTML_REPORT
 		#color
-		elif [ $(echo $LINE_JS | grep 'XXCOLORXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOLORXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXCOLORXX/$COLOR} >> $HTML_REPORT
 		#labels
-		elif [ $(echo $LINE_JS | grep 'XXLABELSXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXLABELSXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXLABELSXX/$VALUE_AV_LABEL} >> $HTML_REPORT
-		elif [ $(echo $LINE_JS | grep 'XXLEGENDXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXLEGENDXX' | wc -l)" -eq 1 ]
 		then
 			echo ${LINE_JS/XXLEGENDXX/false} >> $HTML_REPORT
 		#display value of Y axis, only useful for chart bar
-		elif [ $(echo $LINE_JS | grep 'XXCOMMENT-BEGINXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOMMENT-BEGINXX' | wc -l)" -eq 1 ]
 		then
 			echo "" >> $HTML_REPORT
 		#display value of Y axis, only useful for chart bar
-		elif [ $(echo $LINE_JS | grep 'XXCOMMENT-ENDXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXCOMMENT-ENDXX' | wc -l)" -eq 1 ]
 		then
 			echo "" >> $HTML_REPORT
-		elif [ $(echo $LINE_JS | grep 'XXYLABELXX' | wc -l) -eq 1 ]
+		elif [ "$(echo $LINE_JS | grep 'XXYLABELXX' | wc -l)" -eq 1 ]
 		then
 			echo "\"Nombre de menaces virales bloqués par l'antivirus\"" >> $HTML_REPORT
 		else
 			echo $LINE_JS >> $HTML_REPORT
 		fi
 #create html document
 echo "<h2>Statistiques volumétrie connexions</h2>" >> $HTML_REPORT
 #create new htdigest user to consult statistique of ACC
 #if user does not exist, we create him
-if [ $(grep "$tmp_account:" $DIR_KEY/key_only_manager | wc -l) -lt 1 ]
+if [ "$(grep "$tmp_account:" $DIR_KEY/key_only_manager | wc -l)" -lt 1 ]
 then
 	(echo -n "$tmp_account:$realm:" && echo -n "$tmp_account:$realm:$password" | md5sum | awk '{print $1}' ) >> $DIR_KEY/key_only_manager
 	(echo -n "$tmp_account:$realm:" && echo -n "$tmp_account:$realm:$password" | md5sum | awk '{print $1}' ) >> $DIR_KEY/key_manager
 	(echo -n "$tmp_account:$realm:" && echo -n "$tmp_account:$realm:$password" | md5sum | awk '{print $1}' ) >> $DIR_KEY/key_all
 	chown -R root:apache $DIR_KEY
 DELIM_2="<\/td><\/tr> <\/table> <\/td><\/tr> <\/table> <\/td><\/tr> <\/table> <p>"
 cat $TMP_STATS | sed -n "/$DELIM_1/,/$DELIM_2/p" | tail -n+3 | head -n-2 >> $TMP_STATS_2
 cat $TMP_STATS_2 | sed -e 's:images/pixel.gif:../../manager/htdocs/images/pixel.gif:g' >> $HTML_REPORT
 #we delete our user if he still exists
-if [ $(grep "$tmp_account:" $DIR_KEY/key_only_manager | wc -l) -ge 1 ]
+if [ "$(grep "$tmp_account:" $DIR_KEY/key_only_manager | wc -l)" -ge 1 ]
 then
 	$SED "/^$tmp_account:/d" $DIR_KEY/key_only_manager
 	$SED "/^$tmp_account:/d" $DIR_KEY/key_manager
 	$SED "/^$tmp_account:/d" $DIR_KEY/key_all
 fi
 # Create HTML document
 echo "<h2>Connexion à l'ALCASAR Control Center (ACC)</h2>" >> $HTML_REPORT
 echo "<table class=\"table table-striped\">" >> $HTML_REPORT
 echo "<thead><tr><th>Date</th><th>Utilisateur</th><th>Adresse IP</th><th>Agent</th></tr></thead><tbody>" >> $HTML_REPORT
-echo $ROWS >> $HTML_REPORT
+echo "$ROWS" >> $HTML_REPORT
 echo "</tbody></table>" >> $HTML_REPORT
 ###################### ALCASAR : GLOBAL TRAFFIC ######################
 echo "Get Global traffic of the last 30 days"
 # Create html document
 echo "<h2>Trafic global</h2>" >> $HTML_REPORT
 echo "<table class=\"table table-striped\">" >> $HTML_REPORT
 echo "<thead><tr><th>Date</th><th>Entrant</th><th>Sortant</th><th>Total</th></tr></thead><tbody>" >> $HTML_REPORT
-echo $ROWS >> $HTML_REPORT
+echo "$ROWS" >> $HTML_REPORT
 echo "</tbody></table>" >> $HTML_REPORT
 ###################### ALCASAR : FAIL2BAN ######################
 echo "Get fail2ban log of the week"
 echo "};</script>" >> $HTML_REPORT
 echo "</body>" >> $HTML_REPORT
 echo "</html>" >> $HTML_REPORT
 #convert html document to PDF
-/usr/bin/wkhtmltopdf $HTML_REPORT $(echo $HTML_REPORT | cut -d'.' -f1).pdf
+/usr/bin/wkhtmltopdf $HTML_REPORT "$(echo $HTML_REPORT | cut -d'.' -f1).pdf"
-chown apache:apache $(echo $HTML_REPORT | cut -d'.' -f1).pdf
+chown apache:apache "$(echo $HTML_REPORT | cut -d'.' -f1).pdf"
-chmod 644 $(echo $HTML_REPORT | cut -d'.' -f1).pdf
+chmod 644 "$(echo $HTML_REPORT | cut -d'.' -f1).pdf"
-mv $(echo $HTML_REPORT | cut -d'.' -f1).pdf /var/Save/activity_report/
+mv "$(echo $HTML_REPORT | cut -d'.' -f1).pdf" /var/Save/activity_report/
 #compress every logs, if they exist
-if [ $(ls -1 /var/log/havp/access.log.* 2>/dev/null | wc -l) -ge 1 ]
+if [ "$(ls -1 /var/log/havp/access.log.* 2>/dev/null | wc -l)" -ge 1 ]
 then
 	gzip /var/log/havp/access.log.*
 fi
 #compress every logs
-if [ $(ls -1 /var/log/dnsmasq/dnsmasq-blacklist.log.* 2>/dev/null | wc -l) -ge 1 ]
+if [ "$(ls -1 /var/log/unbound/unbound-blacklist.log.* 2>/dev/null | wc -l)" -ge 1 ]
 then
-	gzip /var/log/dnsmasq/dnsmasq-blacklist.log.*
+	gzip /var/log/unbound/unbound-blacklist.log.*
 fi
 #remove our files
 rm -f $TMP_BL
 rm -f $TMP_BL_WEEK

Subversion Repositories ALCASAR

(root)/scripts/alcasar-activity_report.sh – Rev 2644 → 2688