Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1912 → Rev 1913

/alcasar.sh
1623,11 → 1623,12
# Bing - add 'adlt=strict'
#"(^http://[0-9a-z]+\.bing\.[a-z]+[-/%.0-9a-z]*\?)(.*)"->"\1\2&adlt=strict"
EOF
# change the the google safesearch ("safe=strict" instead of "safe=vss")
# change the google safesearch ("safe=strict" instead of "safe=vss")
$SED "s?safe=vss?safe=strict?g" $DIR_DG/lists/urlregexplist
# adapt the Toulouse BL to ALCASAR architecture. Enable the default categories
# adapt the Toulouse BL to ALCASAR architecture
if [ "$mode" != "update" ]; then
$DIR_DEST_BIN/alcasar-bl.sh --adapt
# enable the default categories
$DIR_DEST_BIN/alcasar-bl.sh --cat_choice
# creation of the custom BL and WL categorie named "ossi" (for domain names & ip only)
touch $DIR_DEST_SHARE/dnsmasq-bl/ossi.conf
/scripts/alcasar-bl.sh
45,9 → 45,7
 
# enable/disable the BL & WL categories
function cat_choice (){
# saving ossi category
mkdir $DIR_tmp
cp $DIR_IP_BL/ossi $DIR_tmp
#ip BL ENABLE
if [ -d $DIR_IP_BL_ENABLED ]
then
57,11 → 55,10
done
else
mkdir $DIR_IP_BL_ENABLED
chown dansguardian:apache $DIR_IP_BL_ENABLED
chmod g+w $DIR_IP_BL_ENABLED
chown root:apache $DIR_IP_BL_ENABLED
chmod 770 $DIR_IP_BL_ENABLED
fi
 
#dns BL ENABLED
if [ -d $DIR_DNS_BL_ENABLED ]
then
71,23 → 68,21
done
else
mkdir $DIR_DNS_BL_ENABLED
chown dansguardian:apache $DIR_DNS_BL_ENABLED
chmod g+w $DIR_DNS_BL_ENABLED
chown root:apache $DIR_DNS_BL_ENABLED
chmod 770 $DIR_DNS_BL_ENABLED
fi
#ip WL ENABLE
if [ -d $DIR_IP_WL ]
#dns BL ossi.conf
if [ ! -e $DIR_DNS_BL/ossi.conf ]
then
for file in `ls -1 $DIR_IP_WL | grep -v "^ossi*"`
do
rm -f $DIR_IP_WL/$file
done
else
mkdir $DIR_IP_WL
chown dansguardian:apache $DIR_IP_WL
chmod g+w $DIR_IP_WL
touch $DIR_DNS_BL/ossi.conf
chown root:apache $DIR_DNS_BL/ossi.conf
chmod g+w $DIR_DNS_BL/ossi.conf
if [ ! -e $DIR_DNS_BL_ENABLED/ossi ]
then
ln -s $DIR_DNS_BL/ossi.conf $DIR_DNS_BL_ENABLED/ossi
fi
fi
 
#ip WL ENABLE
if [ -d $DIR_IP_WL_ENABLED ]
then
97,10 → 92,9
done
else
mkdir $DIR_IP_WL_ENABLED
chown dansguardian:apache $DIR_IP_WL_ENABLED
chmod g+w $DIR_IP_WL_ENABLED
touch $DIR_IP_WL_ENABLED/ossi
chown dansguardian:apache $DIR_IP_WL_ENABLED/ossi
chown -R root:apache $DIR_IP_WL_ENABLED
chmod 770 $DIR_IP_WL_ENABLED
chmod g+w $DIR_IP_WL_ENABLED/ossi
fi
 
113,19 → 107,18
done
else
mkdir $DIR_DNS_WL_ENABLED
chown dansguardian:apache $DIR_DNS_WL_ENABLED
chmod g+w $DIR_DNS_WL_ENABLED
chown root:apache $DIR_DNS_WL_ENABLED
chmod 770 $DIR_DNS_WL_ENABLED
fi
#dns WL ossi.conf
if [ ! -e $DIR_DNS_WL/ossi.conf ]
then
touch $DIR_DNS_WL/ossi.conf
chown dansguardian:apache $DIR_DNS_WL/ossi.conf
chown root:apache $DIR_DNS_WL/ossi.conf
chmod g+w $DIR_DNS_WL/ossi.conf
if [ ! -e $DIR_DNS_WL_ENABLED/ossi ]
then
ln -s $DIR_DNS_WL/ossi.conf $DIR_DNS_WL_ENABLED/ossi
ln -s $DIR_DNS_WL/ossi.conf $DIR_DNS_WL_ENABLED/ossi
fi
fi
 
202,23 → 195,26
# Adapt Toulouse University BL to ALCASAR architecture (dnsmasq + DG + iptables)
-adapt | --adapt)
echo -n "Adaptation process of Toulouse University blackList. Please wait : "
# keep custom files (ossi)
for x in $(ls -1 $DIR_IP_BL | grep "^ossi*")
do
mv $DIR_IP_BL/$x $tmp_DIR_IP_BL
done
for x in $(ls -1 $DIR_IP_WL | grep "^ossi*")
do
mv $DIR_IP_WL/$x $tmp_DIR_IP_WL
done
for x in $(ls -1 $DIR_DNS_BL | grep "^ossi*")
do
mv $DIR_DNS_BL/$x $tmp_DIR_DNS_BL
done
for x in $(ls -1 $DIR_DNS_WL | grep "^ossi*")
do
mv $DIR_DNS_WL/$x $tmp_DIR_DNS_WL
done
# keep custom files (ossi) only when updating he BL
if [ -d $DIR_IP_BL -a -d $DIR_IP_WL -a -d $DIR_DNS_BL -a -d $DIR_DNS_WL ]
then
for x in $(ls -1 $DIR_IP_BL | grep "^ossi*")
do
mv $DIR_IP_BL/$x $tmp_DIR_IP_BL
done
for x in $(ls -1 $DIR_IP_WL | grep "^ossi*")
do
mv $DIR_IP_WL/$x $tmp_DIR_IP_WL
done
for x in $(ls -1 $DIR_DNS_BL | grep "^ossi*")
do
mv $DIR_DNS_BL/$x $tmp_DIR_DNS_BL
done
for x in $(ls -1 $DIR_DNS_WL | grep "^ossi*")
do
mv $DIR_DNS_WL/$x $tmp_DIR_DNS_WL
done
fi
if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL
then
rm -rf $DIR_DG_BL $DIR_IP_BL
/web/acc/admin/bl_filter.php
195,6 → 195,7
$dir_etc="/usr/local/etc/";
$dir_dg="/etc/dansguardian/lists/";
$dir_bl_ip="/usr/local/share/iptables-bl/";
$dir_bl_dns="/usr/local/share/dnsmasq-bl/";
$bl_categories=$dir_etc."alcasar-bl-categories";
$bl_categories_enabled=$dir_etc."alcasar-bl-categories-enabled";
$conf_file=$dir_etc."alcasar.conf";
262,7 → 263,7
fclose($pointeur);
}
else {echo "$l_error_open_file $bl_categories_enabled";}
$fichier=fopen($dir_dg."blacklists/ossi/domains","w+");
$fichier=fopen($dir_bl_dns."ossi.conf","w+");
fputs($fichier, form_filter($_POST['OSSI_bl_domains']));
fclose($fichier);
unset($_POST['OSSI_bl_domains']);
419,7 → 420,7
{
if ($cols == 1) { echo "<tr>";}
$categorie=trim(basename($ligne));
if($categorie != "ossi")
if($categorie != "ossi") // don't display ossi
{
echo "<td><a href='bl_categories_help.php?liste=bl&cat=$categorie' target='cat_help' onclick=window.open('bl_categories_help.php','cat_help','width=600,height=450,toolbar=no,scrollbars=yes,resizable=yes') title='categories help page'>$categorie</a><br>";
echo "<input type='checkbox' name='chk-$categorie'";
472,7 → 473,7
echo "<tr><td width=50% colspan=5 align=center>";
echo "<H3>$l_forbidden_dns</H3>$l_one_dns<BR>";
echo "<textarea name='OSSI_bl_domains' rows=3 cols=40>";
echo_file ($dir_dg."blacklists/ossi/domains");
echo_file ($dir_bl_dns."ossi.conf");
echo "</textarea></td>";
echo "<td width=50% colspan=5 align=center>";
echo "<H3>$l_forbidden_ip</H3>$l_forbidden_ip_explain<BR>";