$ svn diff -r30:31
Index: dspam.cgi
===================================================================
--- dspam.cgi   (revision 30)
+++ dspam.cgi   (revision 31)
@@ -532,10 +532,13 @@
    foreach my $period (qw( daily weekly )) {
      my $uc_period=uc($period);
      my $hk="DATA_$uc_period";
-    my %lst=();
+    my %lst=(
+       spam => [],
+       nonspam => [],
+       title   => []
+    );
      foreach my $hr (sort {$a->{idx}$b->{idx}} (values 
%{$Stats{$period}})) {
        foreach my $type (qw( spam nonspam title )) {
-        (exists $lst{$type}) || ($lst{$type}=[]);
          push(@{$lst{$type}},$hr->{$type});
          my $totk="";
          if ($type eq "spam") { $totk="S"; }
@@ -547,9 +550,9 @@
        }
      }
      $DATA{$hk}=join("_",
-               join(",",@{$lst{spam}}),
-               join(",",@{$lst{nonspam}}),
-               join(",",@{$lst{title}}),
+               join(",",@{$lst{spam}}    || [0]),
+               join(",",@{$lst{nonspam}} || [0]),
+               join(",",@{$lst{title}}   || [0]),
         );
    }

#!/bin/bash
 
DSPAM_BINARY="/opt/dspam/bin/dspam"
 
case "$1" in
  ham)
	for i in `cat $2 |grep "X-DSPAM-Signature:" |awk {'print $2'}`
	do
		echo "Retrain: $i"
		$DSPAM_BINARY --user dspam --class=innocent --source=error --signature=$i
	done
        ;;
  spam)
	for i in `cat $2 |grep "X-DSPAM-Signature:" |awk {'print $2'}`
	do
		echo "Retrain: $i"
		$DSPAM_BINARY --user dspam --class=spam --source=error --signature=$i
	done
        ;;
  *)
	echo "This utility will retrain your DSPAM for ham or spam emails"
        echo "Usage: $0 {ham|spam} {full path to your ham/spam mailbox/folder}"
        exit 1
esac

#!/bin/sh -
#
# Simple shell script to feed DSpam with errors to retrain
#
#==========================================================
USERPATH=/tmp/dspam.users.tmp
USERLISTPATH=/tmp/dspam.liste.chemin.users
USERMAILS=/tmp/dspam.adresses.users
USERFILE=/tmp/dspam.users
DSPAM=/usr/bin/dspam
MYSQL=/usr/bin/mysql
VIRTUAL_BASE=/home/vmail/
SPAM_VIRTUAL_FOLDER=.Junk
NOSPAM_VIRTUAL_FOLDER=.NoJunk
DBUSER=dbuser
DBPASS=dbpassword
DB=dbmail
DELETESPAM=YES
DELETENOSPAM=NO
 
echo `date` Begin Spam processing
 
# On extrait toute information utile pour créer le chemin pour chaque domaine / utilisateur.
$MYSQL -u $DBUSER -p$DBPASS -e "use $DB; select name,user from virtual_users INNER JOIN virtual_domains ON virtual_users.domain_id = virtual_domains.id;" --skip-column-names > $USERPATH
# On classe les informations dans l'ordre, et on ajoute /Maildir/
while read DOMAINE UTILISATEUR;
do
echo "$DOMAINE/$UTILISATEUR/Maildir/";
done < $USERPATH > $USERLISTPATH
# On cree la liste des utilisateurs, de la forme login@domain.tld
$MYSQL -u $DBUSER -p$DBPASS -e "use $DB; select email from view_users;" --skip-column-names > $USERMAILS
# On fusionne les deux fichiers en un seul, qui sera alors traité par le script écris par info@richard5.net
paste -d "\t" $USERMAILS $USERLISTPATH > $USERFILE
 
# Pour information,
# A partir de ce point, dans $USERFILE, le premier groupe de mot avant la tabulation :
# USER doit etre de la forme : login@domaine.tld
# le second groupe de mot après la tabluation doit etre du type :
# MAILDIR doit etre de la forme : domaine.tld/login/Maildir/
#
 
while read USER MAILDIR
do
  echo `date` Processing $USER in $VIRTUAL_BASE$MAILDIR
  # taking care of false negatives !
  # check if the user has a .Junk folder
  if [ -d $VIRTUAL_BASE$MAILDIR$SPAM_VIRTUAL_FOLDER ]; then
 
    # check both new and cur directories for spam !
    cd $VIRTUAL_BASE$MAILDIR$SPAM_VIRTUAL_FOLDER/new
    for j in *
    do
      # check if the file exists
      if [ -s $j ]; then
        # check if file was already identified as SPAM
        grep "X-DSPAM-Result: Spam" $j 1>/dev/null
        RESULT=$?
        if [ $RESULT = 0 ]; then
          # if wanted, delete the mail.
          if [ $DELETESPAM = "YES" ]; then
            rm -f $j
          fi
        else
          $DSPAM --user $USER --class=spam --source=error < $j
          # if wanted, delete the mail.
          if [ $DELETESPAM = "YES" ]; then
            rm -f $j
          fi
        fi
      fi
    done
    cd $VIRTUAL_BASE$MAILDIR$SPAM_VIRTUAL_FOLDER/cur
    for j in *
    do
      # check if the file exists
      if [ -s $j ]; then
        # check if file was already identified as SPAM
        grep "X-DSPAM-Result: Spam" $j 1>/dev/null
        RESULT=$?
        if [ $RESULT = 0 ]; then
          # if wanted, delete the mail.
          if [ $DELETESPAM = "YES" ]; then
            rm -f $j
          fi
        else
         $DSPAM --user $USER --class=spam --source=error < $j
          # if wanted, delete the mail.
          if [ $DELETESPAM = "YES" ]; then
            rm -f $j
          fi
        fi
      fi
    done
  fi
 
  #taking care of false positives
  echo `date` Processing False Positives as Clean
  # check if the user has a .NotSpam folder
  if [ -d $VIRTUAL_BASE$MAILDIR$NOSPAM_VIRTUAL_FOLDER ]; then
    # check both new and cur directories for nospam !
    cd $VIRTUAL_BASE$MAILDIR$NOSPAM_VIRTUAL_FOLDER/new
    for j in *
    do
      # check if the file exists
      if [ -s $j ]; then
        # check if file was identified as SPAM if not then ignore it !
        grep "X-DSPAM-Result: Spam" $j 1>/dev/null
        RESULT=$?
        if [ $RESULT = 0 ]; then
          $DSPAM --user $USER --class=innocent --source=error < $j
          if [ $DELETENOSPAM = "YES" ]; then
            rm -f $j
          fi
        else
          # not identified as spam, if needed delete the mail.
          if [ $DELETENOSPAM = "YES" ]; then
            rm -f $j
          fi
        fi
      fi
    done
    cd $VIRTUAL_BASE$MAILDIR$NOSPAM_VIRTUAL_FOLDER/cur
    for j in *
    do
      # check if the file exists
      if [ -s $j ]; then
        # check if file was identified as SPAM if not then ignore it !
        grep "X-DSPAM-Result: Spam" $j 1>/dev/null
        RESULT=$?
        if [ $RESULT = 0 ]; then
          $DSPAM --user $USER --class=innocent --source=error < $j
          if [ $DELETENOSPAM = "YES" ]; then
           rm -f $j
          fi
        else
          # not identified as spam, if needed delete the mail.
          if [ $DELETENOSPAM = "YES" ]; then
            rm -f $j
          fi
        fi
      fi
    done
  fi
 
done < $USERFILE
 
# clean up action..
rm -f $USERFILE
rm -f $USERLISTPATH
rm -f $USERMAILS
rm -f $USERPATH
 
echo `date` End AutoSpam processing
echo

#!/bin/bash
# age_spam_quarantine - Remove quarantined messages older than a specified number of days.
#    Steve Pellegrin (spellegrin at convoglio dot com)
#
# History:
#    1.0   2005-January-1    Original code
#    1.1   2005-February-3   Works with large, domain or standard
#
# Usage:
#    age_spam_quarantine
 
DAYS=14                                 # Messages left in quarantine older 
                                        # than this many days will be deleted.
DATA=/var/spool/dspam/data/                        # DSpam data directory
ARCHIVEMAIL="/usr/bin/archivemail"      # Path to utility
 
# For each user mailbox...
for mbox in `find ${DATA} -follow -name *mbox`
do
    if [ -s $mbox ]; then
        # Tell archivemail to remove the messages.
        ${ARCHIVEMAIL} --days=${DAYS} --delete --include-flagged --quiet $mbox
    fi;
done

#!/bin/sh
#
# Optimize the DSPAM mysql database
 
DSPAMCONF=/etc/dspam/dspam.conf
MYSQLCONF=/etc/dspam/dspam.d/mysql.conf
 
if grep -q "^StorageDriver.*mysql_drv.so" $DSPAMCONF; then
  if [ -x /usr/bin/mysql ]; then
    MYSQL_USER="`grep "^MySQLUser" $MYSQLCONF | awk '{print $2}'`"
    MYSQL_PASS="`grep "^MySQLPass" $MYSQLCONF | awk '{print $2}'`"
    MYSQL_DB="`grep "^MySQLDb" $MYSQLCONF | awk '{print $2}'`"
    MYSQL_HOST="`grep "^MySQLServer" $MYSQLCONF | awk '{print $2}'`"
 
    # If host is empty or starting with a / assume it's localhost.
    if [ -z "$MYSQL_HOST" ] || [ "${MYSQL_HOST:0:1}" = "/" ]; then
	echo "OPTIMIZE LOCAL TABLE dspam_preferences, dspam_signature_data, dspam_stats, dspam_token_data, dspam_virtual_uids;" | /usr/bin/mysql --user=$MYSQL_USER --password=$MYSQL_PASS $MYSQL_DB
    else
	if echo "$MYSQL_HOST" | grep "^/" > /dev/null 2>&1 ; then
	    # Assume it's a socket:
	    echo "OPTIMIZE LOCAL TABLE dspam_preferences, dspam_signature_data, dspam_stats, dspam_token_data, dspam_virtual_uids;" | /usr/bin/mysql --user=$MYSQL_USER --password=$MYSQL_PASS $MYSQL_DB
	else
	    echo "OPTIMIZE LOCAL TABLE dspam_preferences, dspam_signature_data, dspam_stats, dspam_token_data, dspam_virtual_uids;" | /usr/bin/mysql --user=$MYSQL_USER --password=$MYSQL_PASS $MYSQL_DB
	fi
    fi
  fi
fi
 
exit 0

Catégorie: Linux