WebSVN – ALCASAR – Path Comparison – / – /scripts/alcasar-activity_report.sh Rev 2188 and /scripts/alcasar-activity

Ignore whitespace Rev 2188 → Rev 2189

 /scripts/alcasar-activity_report.sh
 ,3 → 1,6
+#!/bin/bash
+# $Id$
+#
 # 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
 ,38 → 53,38
 if [ -e $TMP_BL ]
 then
-        rm $TMP_BL
+        rm $TMP_BL
 fi
 if [ -e $TMP_BL_WEEK ]
 then
-        rm $TMP_BL_WEEK
+        rm $TMP_BL_WEEK
 fi
 if [ -e $TMP_BL_WEEK_CAT ]
 then
-        rm $TMP_BL_WEEK_CAT
+        rm $TMP_BL_WEEK_CAT
 fi
 if [ -e $HTML_REPORT ]
 then
-        rm $HTML_REPORT
+        rm $HTML_REPORT
 fi
 echo "<!doctype html>" >> $HTML_REPORT
 echo "<html>" >> $HTML_REPORT
 echo "<head>" >> $HTML_REPORT
-echo "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>" >> $HTML_REPORT
+echo "<meta charset=\"utf-8\">" >> $HTML_REPORT
 echo "<title>ALCASAR report</title>" >> $HTML_REPORT
-echo "<link rel='stylesheet' type='text/css' href='../../../css/bootstrap.min.css'>" >> $HTML_REPORT
-echo "<link rel='stylesheet' type='text/css' href='../../../css/report.css'>" >> $HTML_REPORT
-echo "<script src='../../../js/Chart.bundle.js'></script>" >> $HTML_REPORT
-echo "<script src='../../../js/jquery.min.js'></script>" >> $HTML_REPORT
+echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../../css/bootstrap.min.css\">" >> $HTML_REPORT
+echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../../css/report.css\">" >> $HTML_REPORT
+echo "<script src=\"../../../js/Chart.bundle.js\"></script>" >> $HTML_REPORT
+echo "<script src=\"../../../js/jquery.min.js\"></script>" >> $HTML_REPORT
 echo "</head>" >> $HTML_REPORT
 echo "<body>" >> $HTML_REPORT
 echo "<h1><center>Rapport d'activité de l'ALCASAR-$(cat /usr/local/etc/alcasar.conf | grep ORGANISM | cut -d'=' -f2)</center></h1>" >> $HTML_REPORT
-echo "<i><p style='text-align: right;'>Date de création $(date +%F)</p></i>" >> $HTML_REPORT
-echo "<font size='1'>" >> $HTML_REPORT
+echo "<i><p style=\"text-align: right;\">Date de création $(date +%F)</p></i>" >> $HTML_REPORT
+echo "<font size=\"1\">" >> $HTML_REPORT
 ######################TABINFO######################
 echo "Create information about system and ALCASAR"
 ,8 → 96,8
 if [ $(echo $LINE_HTML | grep 'XXORGXX' | wc -l) -eq 1 ]
 then
         VALUE=$(cat /usr/local/etc/alcasar.conf | grep ORGANISM | cut -d'=' -f2)
-        echo ${LINE_HTML/XXORGXX/$VALUE} >> $HTML_REPORT
+        echo ${LINE_HTML/XXORGXX/$VALUE} >> $HTML_REPORT
 elif [ $(echo $LINE_HTML | grep 'XXINSTALLXX' | wc -l) -eq 1 ]
 then
         VALUE=$(cat /usr/local/etc/alcasar.conf | grep INSTALL_DATE | cut -d'=' -f2)
 ,7 → 179,7
                         echo "</tr>" >> $HTML_REPORT
                 done
         else
-                echo "<tr><td colspan=3>Pas de RPM mis à jour cette semaine</td></tr>" >> $HTML_REPORT
+                echo "<tr><td colspan=\"3\">Pas de RPM mis à jour cette semaine</td></tr>" >> $HTML_REPORT
         fi
 else
         echo $LINE_HTML >> $HTML_REPORT
 ,13 → 207,13
                         website_bl=$(echo $LOG_BL | cut -d' ' -f6)
                         #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-)
-                        fi
+                        if [ $(grep -o '\.' <<< "$website_bl" | wc -l) -ge "2" ]
+                        then
+                                        website_bl=$(echo $website_bl | cut -d'.' -f2-)
+                        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)
+                        categorie_bl=$(grep -R "$website_bl/" /usr/local/share/dnsmasq-bl-enabled/ | cut -d':' -f1 | cut -d'/' -f6 | cut -d' ' -f1)
                         if [ $(echo $categorie_bl | wc -w) -gt 1 ]
                         then
                                 categorie_bl=$(grep -R "/$website_bl/" /usr/local/share/dnsmasq-bl-enabled/ | cut -d':' -f1 | cut -d'/' -f6 | cut -d' ' -f1 | head -1)
 ,7 → 222,7
                         #Calculate its timestamp
                         Y=$(date -R | cut -d' ' -f4)
                         M=$(echo $LOG_BL | cut -d' ' -f1)
-                        D=$(echo $LOG_BL | cut -d' ' -f2)
+                        D=$(echo $LOG_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
 ,7 → 345,7
         #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)
         do
-                echo "$CAT:$(grep -o ":$CAT:" <<< "$(cat $TMP_BL_WEEK)" | wc -l):" >> $TMP_BL_WEEK_CAT
+                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
 ,18 → 356,17
                 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)',"
+                        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 ]
-        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
+        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
         #create chart pie in html file with javascript (chartjs.com)
         NAME_BL='chart_bl'
 ,7 → 375,7
         echo "<canvas id='$NAME_BL' width='450' height='450' ></canvas>" >> $HTML_REPORT
         echo "</center>" >> $HTML_REPORT
         echo "<script>" >> $HTML_REPORT
         cat $MODEL_CHARTJS | while read LINE_JS
         do
                 #variable name
 ,7 → 389,7
                 #graph title
                 elif [ $(echo $LINE_JS | grep 'XXTITLEXX' | wc -l) -eq 1 ]
                 then
-                        echo ${LINE_JS/XXTITLEXX/"Sites bloqués cette semaine"} >> $HTML_REPORT
+                        echo ${LINE_JS/XXTITLEXX/"Sites bloqués cette semaine"} >> $HTML_REPORT
                 #chart data
                 elif [ $(echo $LINE_JS | grep 'XXDATAXX' | wc -l) -eq 1 ]
                 then
 ,11 → 407,11
                 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
 ,18 → 454,16
         do
                 DATE_1=$TS
                 DATE_2=$((TS-$STEP_TS))
-                COUNT_AV=0
+                COUNT_AV=0
                 for TS_FILE in $(cat $TMP_AV)
                 do
                         if [ "$TS_FILE" -le "$DATE_1" -a "$TS_FILE" -ge "$DATE_2" ]
-                        then
+                        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
 ,41 → 481,41
         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 ]
                 then
-                        echo ${LINE_JS/XXTITLEXX/"Menaces bloqués par l\'antivirus"} >> $HTML_REPORT
+                        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
 ,73 → 527,7
         echo "<h3>Aucune menace virale.</h3>" >> $HTML_REPORT
 fi
-######################AUTHORIZED CONNECTIONS######################
-echo "Create authorized connections since the installation of ALCASAR"
-#get number of authorized, forbidden and fail2ban connections :
-PASSWD_FILE="/root/ALCASAR-passwords.txt"
-QUERY="SELECT COUNT(acctterminatecause) FROM radacct WHERE acctterminatecause=\"User-Request\" ORDER BY acctstarttime"
-AUTHORIZED=$(mysql -D radius -u root -p$(cat $PASSWD_FILE | grep "root /" | rev | cut -d' '  -f1 | rev) -e "$QUERY" | cut -d')' -f2)
-QUERY="SELECT COUNT(acctterminatecause) FROM radacct WHERE acctterminatecause=\"Admin-Reset\" ORDER BY acctstarttime"
-FORBIDDEN=$(mysql -D radius -u root -p$(cat $PASSWD_FILE | grep "root /" | rev | cut -d' '  -f1 | rev) -e "$QUERY" | cut -d')' -f2)
-FAIL2BAN=$(strings /var/log/fail2ban.log | grep " Ban " | wc -l)
-VALUE_AUTH="$AUTHORIZED, $FORBIDDEN, $FAIL2BAN"
-LABEL_AUTH="'Autorisées ($AUTHORIZED) ', 'Interdites ($FORBIDDEN)', 'fail2ban($FAIL2BAN)'"
-#create chart pie in html file with javascript (chartjs.com)
-NAME_AUTH='chart_auth'
-CONF_AUTH='config_auth'
-echo "<center>" >> $HTML_REPORT
-echo "<canvas id='$NAME_AUTH' width='450' height='450' ></canvas>" >> $HTML_REPORT
-echo "</center>" >> $HTML_REPORT
-echo "<script>" >> $HTML_REPORT
-cat $MODEL_CHARTJS | while read LINE_JS
-do
-        #variable name
-        if [ $(echo $LINE_JS | grep 'XXCONFXX' | wc -l) -eq 1 ]
-        then
-                echo ${LINE_JS/XXCONFXX/$CONF_AUTH} >> $HTML_REPORT
-        #chart type
-        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 ]
-        then
-                echo ${LINE_JS/XXTITLEXX/"Connexions des utilisateurs"} >> $HTML_REPORT
-        #chart data
-        elif [ $(echo $LINE_JS | grep 'XXDATAXX' | wc -l) -eq 1 ]
-        then
-                echo ${LINE_JS/XXDATAXX/$VALUE_AUTH} >> $HTML_REPORT
-        #color
-        elif [ $(echo $LINE_JS | grep 'XXCOLORXX' | wc -l) -eq 1 ]
-        then
-                echo ${LINE_JS/XXCOLORXX/"'#000099','#ff6600','#ff0000'"} >> $HTML_REPORT
-        #labels
-        elif [ $(echo $LINE_JS | grep 'XXLABELSXX' | wc -l) -eq 1 ]
-        then
-                echo ${LINE_JS/XXLABELSXX/$LABEL_AUTH} >> $HTML_REPORT
-        #display legend, only useful for chart pie
-        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 ]
-        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 ]
-        then
-                echo "*/" >> $HTML_REPORT
-        else
-                echo $LINE_JS >> $HTML_REPORT
-        fi
-done
-echo "</script>" >> $HTML_REPORT
 ######################ALCASAR : DAILY USE######################
 echo "Get daily use connection of the week"
 #create html document
 ,11 → 537,11
 #if user does not exist, we create him
 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
-        chmod 640 $DIR_KEY/key_*
+        (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
+        chmod 640 $DIR_KEY/key_*
 fi
 #get stats.php from ACC
 ,9 → 556,9
 #we delete our user if he still exists
 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
+        $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
 ######################FIN HTML######################
 ,9 → 583,6
         echo "var ctx_$NAME_AV = document.getElementById('$NAME_AV').getContext('2d');" >> $HTML_REPORT
         echo "var $NAME_AV = new Chart(ctx_$NAME_AV, $CONF_AV);" >> $HTML_REPORT
 fi
-#CONNEXIONS AUTHORIZED
-echo "var ctx_$NAME_AUTH = document.getElementById('$NAME_AUTH').getContext('2d');" >> $HTML_REPORT
-echo "var $NAME_AUTH = new Chart(ctx_$NAME_AUTH, $CONF_AUTH);" >> $HTML_REPORT
 echo "};</script>" >> $HTML_REPORT
 echo "</body>" >> $HTML_REPORT
 echo "</html>" >> $HTML_REPORT
 Property changes:
 Added: svn:keywords
 +Id
 \ No newline at end of property

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2188 → Rev 2189