Subversion Repositories ALCASAR

Compare Revisions

Regard whitespace Rev 1415 → Rev 1416

/scripts/alcasar-sms.sh
21,6 → 21,7
sms_t="SMS_ban_temp"
 
inb="inbox"
SMS_c="SMS_country"
 
config="/etc/gammu_smsd_conf"
logfile="/var/log/gammu-smsd/gammu-smsd.log"
97,6 → 98,23
mysql --user=$u_db --password=$p_db -B -se "$sql_remove_compte"
} # end function unlock
 
function change_country() {
# recupère le status du pays
sql_status_country="connect gammu; SELECT status FROM SMS_country WHERE name='$1'"
stat=$(mysql --user=$u_db --password=$p_db -B -se "$sql_status_country")
 
if [ $stat -eq 0 ]
then
sql_change_country="connect gammu; UPDATE $SMS_c SET status=1 WHERE name='$1'"
mysql --user=$u_db --password=$p_db -B -se "$sql_change_country"
else
sql_change_country="connect gammu; UPDATE $SMS_c SET status=0 WHERE name='$1'"
mysql --user=$u_db --password=$p_db -B -se "$sql_change_country"
fi
 
 
} # end change_country
 
function supp_acc_rad() {
# Suppression du compte dans Radcheck
sql_del_compte="connect radius; DELETE FROM $rad WHERE username='$1';"
154,6 → 172,14
if [[ $numero =~ ^\+ ]]
then
# On vérifie si le pays est bloqué
sql_select_countries="connect gammu; SELECT id FROM $SMS_c WHERE status=1"
mysql --user=$u_db --password=$p_db -B -se "$sql_select_countries" | while read result_c;
do
 
if [[ $numero =~ ^"$result_c" ]]
then
 
numero=$(echo $numero | cut -d '+' -f2)
# On vérifie que le numéro n'est pas Ban Perm
266,7 → 292,6
if [ $nb_ban_t -ge $nb_essais ]
then
supp_num_perm "$numero"
supp_num_temp "$numero"
274,13 → 299,17
expir_f=$(date '+%d %B %Y' -d "$time_ban days")
# Ajout du numero table SMS_ban_perm, 1 : flood
sql_add_ban_perm="connect gammu; INSERT INTO $sms_p (SenderNumber,Perm,Expiration) VALUES ('$numero',1,'$expir_f');"
mysql --user=$u_db --password=$p_db -B -se "$sql_add_ban_perm"
sql_add_ban_perm="connect gammu; INSERT INTO $sms_p (SenderNumber,Perm,Expiration) VALUES ('$numero',1,'$expir_f');" mysql --user=$u_db --password=$p_db -B -se "$sql_add_ban_perm"
fi
else
echo "Le ban de $numero est encore valide"
fi
break
fi
#else
#echo "Pays bloqué"
fi
done
else
echo "Numero non autorisé (ex: 36665)"
fi
399,6 → 428,35
unlock "$2"
exit 0
;;
--change_country)
# Permet de changer l'état de blocage d'un pays
a=""
for i in "$@"
do
a=$(echo "$a $i")
done
a=$(echo $a | cut -d ' ' -f2-$#)
change_country "$a"
exit
;;
--change_country_ena_all)
# Active l'ensemble des pays
sql_change_country="connect gammu; UPDATE $SMS_c SET status=1"
mysql --user=$u_db --password=$p_db -B -se "$sql_change_country"
exit
;;
--change_country_dis_all)
# Desactive l'ensemble des pays
sql_change_country="connect gammu; UPDATE $SMS_c SET status=0"
mysql --user=$u_db --password=$p_db -B -se "$sql_change_country"
exit
;;
--change_country_filter)
# Change la valeur du filtrage (FR, UE, all, perso)
sql_change_country="connect gammu; UPDATE $SMS_c SET id='$2' WHERE name='FILTRAGE'"
mysql --user=$u_db --password=$p_db -B -se "$sql_change_country"
break
;;
--new_sms)
# Appel de la fonction new_sms : filtrage du password, creation du compte et ban
new_sms
444,4 → 502,3
;;
esac
exit 0
 
/scripts/sbin/alcasar-bl.sh
51,10 → 51,20
mkdir $DIR_IP_BL_ENABLED
chown apache $DIR_IP_BL_ENABLED
fi
rm -rf $DIR_DNS_BL_ENABLED $DIR_DNS_WL_ENABLED # cleaning for dnsmasq and iptables
if [ -d $DIR_DNS_BL_ENABLED ]
then
for file in `ls -1 $DIR_DNS_BL_ENABLED | grep -v "^ossi-*"`
do
rm -f $DIR_DNS_BL_ENABLED/$file
done
else
mkdir $DIR_DNS_BL_ENABLED
chown apache $DIR_DNS_BL_ENABLED
fi
rm -rf $DIR_DNS_WL_ENABLED # cleaning for dnsmasq and iptables
$SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist # cleaning for DG
$SED "s?^[^#]?#&?g" $BL_CATEGORIES $WL_CATEGORIES # cleaning BL & WL categories file (comment all lines)
mkdir $DIR_DNS_BL_ENABLED $DIR_DNS_WL_ENABLED
mkdir $DIR_DNS_WL_ENABLED
# process the file $BL_CATEGORIES with the choice of categories
for ENABLE_CATEGORIE in `cat $BL_CATEGORIES_ENABLED`
do
85,10 → 95,10
$SED "s/^reportinglevel =.*/reportinglevel = 3/g" /etc/dansguardian/dansguardian.conf
if [ "$PARENT_SCRIPT" != "alcasar-conf.sh" ] # don't launch on install stage
then
service dansguardian restart
service dnsmasq restart
service dnsmasq-blacklist restart
service dnsmasq-whitelist restart
/bin/systemctl restart dansguardian
/bin/systemctl restart dnsmasq
/bin/systemctl restart dnsmasq-blacklist
/bin/systemctl restart dnsmasq-whitelist
/usr/local/bin/alcasar-iptables.sh
fi
}
100,10 → 110,10
$SED "s/^\*ip$/#*ip/g" $DIR_DG/bannedsitelist # remove pureip browsing
if [ "$PARENT_SCRIPT" != "alcasar-conf.sh" ] # don't launch on install stage
then
service dansguardian restart
service dnsmasq restart
service dnsmasq-blacklist restart
service dnsmasq-whitelist restart
/bin/systemctl restart dansguardian
/bin/systemctl restart dnsmasq
/bin/systemctl restart dnsmasq-blacklist
/bin/systemctl restart dnsmasq-whitelist
/usr/local/bin/alcasar-iptables.sh
fi
}