WebSVN – ALCASAR – Diff – /web/acc/admin/bl_filter.php

 	$l_fingerprint2="Vérifiez-là en suivant ce lien (ligne 'blacklists.tar.gz') : ";
 	$l_activate_bl="Activer la nouvelle version";
 	$l_reject_bl="Rejeter";
 	$l_warning="Temps estimé : une minute.";
 	$l_specific_filtering="Filtrage special";
-	$l_forbidden_dns="Noms de domaine filtrés";
-	$l_one_dns="Entrez un nom de domaine par ligne (exemple : .domaine.org)";
+	$l_one_dns_ip="Entrez un nom de domaine ou une adresse IP ou une adresse de réseau par ligne<br>exemple (domaine) : .domaine.org - exemple (ip) : 61.54.52.56 - exemple (réseau) : 172.16.0.0/16";
 	$l_maj_rehabilitated="Noms de domaine ou IP réhabilités";
 	$l_rehabilitated_dns="Noms de domaine réhabilités";
 	$l_rehabilitated_dns_explain="Entrez ici des noms de domaine bloqués par la liste noire <BR> que vous souhaitez réhabiliter.";
-	$l_add_to_bl="Noms de domaine ou IP ajoutés à la liste noire";
+	$l_add_to_bl="Noms de domaine ou adresses IP à ajouter à la liste noire";
-	$l_forbidden_ip="IP filtrées";
-	$l_forbidden_ip_explain="Entrez une IP par ligne (exemple : 123.123.123.123)<br/>ou une ADRESSE RESEAU (exemple : 123.123.0.0/16)";
 	$l_rehabilitated_ip="IP réhabilitées";
 	$l_rehabilitated_ip_explain="Entrez ici des IP bloquées par la liste noire <BR> que vous souhaitez réhabiliter.";
 	$l_one_ip="Entrez une IP par ligne (exemple : 123.123.123.123)";
 	$l_record="Enregistrer les modifications";
 	$l_wait="Une fois validées, 10 secondes sont nécessaires pour traiter vos modifications";
 	$l_nb_ip="Nombre d'IP";
 	$l_nb_domain_names="Nombre de noms de domaine";
 	$l_nbDomainNames="Noms de domaine :";
 	$l_nbUrl="Url :";
 	$l_nbIp="Ip :";
-	$l_update_cat="Mise a jour des catégories automatiquement?";
+	$l_update_cat="Mise a jour des catégories automatiquement toutes les 12h (seulement 'malware' actuellement)?";
-	$l_no_update_cat = "Désactiver";
-	$l_yes_update_cat = "Activer (Toutes les 12 heures)";
 	$l_disable="Désactiver";
 	$l_enable="Activer";
 	$l_file_state="Etat";
+}
 else {
 	$l_fingerprint2="Verify it with this link (line 'blacklists.tar.gz') : ";
 	$l_activate_bl="Activate the new version";
 	$l_reject_bl="Reject";
 	$l_warning="Estimated time : one minute.";
 	$l_specific_filtering="Specific filtering";
-	$l_forbidden_dns="Filtered domain names";
 	$l_allowed_dns="Allowed domain names";
-	$l_one_dns="Enter one domain name per row (example : .domain.org)";
+	$l_one_dns_ip="Enter one domain name or one IP address or one network address per row <br>example (domain): .domain.org - example (ip): 61.54.56.52 - example (network) : 172.16.0.0/16";
 	$l_maj_rehabilitated="Domain names or IP rehabilitated";
 	$l_rehabilitated_dns="Rehabilitated domain names";
 	$l_rehabilitated_dns_explain="Enter here domain names that are blocked by the blacklist <BR> and you want to rehabilitate.";
-	$l_add_to_bl="Domain names or IP to add to blacklist";
+	$l_add_to_bl="Domain names or IP addresses to add to the blacklist";
-	$l_forbidden_ip="Filtered IP";
-	$l_forbidden_ip_explain="Enter one IP per row (example : 123.123.123.123)<br/>or a NETWORK ADDRESS (example : 123.123.0.0/16)";
 	$l_rehabilitated_ip="Rehabilitated IP";
 	$l_rehabilitated_ip_explain="Enter here IP that are blocked by the blacklist <BR> and you want to rehabilitate.";
 	$l_one_ip="Enter one IP per row (example : 123.123.123.123)";
 	$l_record="Save changes";
 	$l_wait="Once validated, 10 seconds are necessary to compute your modifications";
 	$l_nb_ip="Number of IP";
 	$l_nb_domain_names="Number of domain names";
 	$l_nbDomainNames="Domain names :";
 	$l_nbUrl="Url :";
 	$l_nbIp="Ip :";
-	$l_update_cat="Mise a jour des catégories automatiquement?";
+	$l_update_cat="Update automaticly categories every 12 hours (only 'malware' for now)?";
-	$l_no_update_cat = "Disable";
-	$l_yes_update_cat = "Enable (Every 12 hours)";
 	$l_disable="Disable";
 	$l_enable="Enable";
 	$l_file_state="State";
+}
 $dir_etc="/usr/local/etc/";
 $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";
-$dir_blacklist=$dir_dg."blacklist/";
+$dir_blacklist=$dir_dg."blacklists/";
 $urlregex_file=$dir_dg."urlregexplist";
 $bannedsite_file=$dir_dg."bannedsitelist";
 $dir_tmp="/tmp/blacklists";
 $upload_dir_ip = "/usr/local/share/iptables-bl-enabled/";
 $upload_dir_domain_names = "/usr/local/share/dnsmasq-bl-enabled/";
 	$nom = str_replace (".", "_",basename($_FILES['fichier_ip']['name']));
 	# Si un fichier a été choisi
 	if(!empty($nom))
+	{
 		# On l'upload
-		if(move_uploaded_file($_FILES['fichier_ip']['tmp_name'], $upload_dir_ip.$nom))
+		if(move_uploaded_file($_FILES['fichier_ip']['tmp_name'], $blacklist_dir."ossi-bl-".$nom))
+		{
 			# On extrait uniquement les ip du fichier
-			exec("grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' $upload_dir_ip$nom > $upload_dir_ip\ossi_ip");
+//			exec("grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' $upload_dir_ip$nom > $upload_dir_ip\ossi_ip");
 			# Suppression des doublons
-			exec("sort -u $upload_dir_ip\ossi_ip > $upload_dir_ip\ossi-$nom && rm -f $upload_dir_ip\ossi_ip");
+//			exec("sort -u $upload_dir_ip\ossi_ip > $upload_dir_ip\ossi-$nom && rm -f $upload_dir_ip\ossi_ip");
 			# On adapte le fichier à la sauvegarde du set
-			exec("sed -i \"s/^/add bl_ip_blocked /g\" $upload_dir_ip\ossi-$nom");
+//			exec("sed -i \"s/^/add bl_ip_blocked /g\" $upload_dir_ip\ossi-$nom");
 			# On extrait uniquement les noms de domaine
 			# max_tld() retourne le nombre max de charactere pour un top-level dns
-			exec("grep -Eo '([a-zA-Z0-9_-]+\.){1,2}[a-zA-Z]{2,".max_tld()."}' $upload_dir_ip$nom > $upload_dir_domain_names\ossi_domain_names");
+//			exec("grep -Eo '([a-zA-Z0-9_-]+\.){1,2}[a-zA-Z]{2,".max_tld()."}' $upload_dir_ip$nom > $upload_dir_domain_names\ossi_domain_names");
 			# Suppression des doublons
-			exec("sort -u $upload_dir_domain_names\ossi_domain_names > $upload_dir_domain_names\ossi-$nom && rm -f $upload_dir_domain_names\ossi_domain_names");
+//			exec("sort -u $upload_dir_domain_names\ossi_domain_names > $upload_dir_domain_names\ossi-$nom && rm -f $upload_dir_domain_names\ossi_domain_names");
 			# On adapte le fichier pour Dnsmasq
-			exec("sed -i \"s/^/address=\//g\" $upload_dir_domain_names\ossi-$nom");
+//			exec("sed -i \"s/^/address=\//g\" $upload_dir_domain_names\ossi-$nom");
-			exec("sed -i \"s/$/\/$PRIVATE_IP/g\" $upload_dir_domain_names\ossi-$nom");
+//			exec("sed -i \"s/$/\/$PRIVATE_IP/g\" $upload_dir_domain_names\ossi-$nom");
 			# Suppression du fichier
-			exec("rm -f $upload_dir_ip$nom");
+//			exec("rm -f $upload_dir_ip$nom");
+			exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
+			exec ("sudo /usr/local/bin/alcasar-iptables.sh ");
+		}
 		else
+		{
 			echo $l_error_upload;
+		}
-		exec ("sudo /usr/local/bin/alcasar-bl.sh --reload");
-		exec ("sudo /usr/local/bin/alcasar-iptables.sh ");
+	}
 	break;
+}
 ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 else $update_select[1] = "checked";
 echo "</td></tr>";
 echo "<tr><td valign='middle' align='left' colspan=10>";
 echo "<center>$l_update_cat
-	<input type='radio' name='update_cat' value=0 $update_select[0]> $l_no_update_cat
+	<input type='radio' name='update_cat' value=0 $update_select[0]> $l_disable
-	<input type='radio' name='update_cat' value=1 $update_select[1]> $l_yes_update_cat
+	<input type='radio' name='update_cat' value=1 $update_select[1]> $l_enable
 	<input type='submit' value='$l_record'></center>";
 echo "</td></tr>";
 echo "<tr><td valign='middle' align='left' colspan=10>";
 echo "<center><b>$l_maj_rehabilitated</b></center></td></tr>";
 echo "<tr><td width=50% colspan=5 align=center>";
 echo "<textarea name='BL_rehabilited_ip' rows=3 cols=40>";
 echo_file ($dir_dg."exceptioniplist");
 echo "</textarea></td></tr><tr><td width=50% colspan=10>";
 echo "<tr><td valign='middle' align='left' colspan=10>";
 echo "<center><b>$l_add_to_bl</b></center></td></tr>";
-echo "<tr><td width=50% colspan=5 align=center>";
+echo "<tr><td width=100% colspan=10 align=center>";
-echo "<H3>$l_forbidden_dns</H3>$l_one_dns<BR>";
+echo "$l_one_dns_ip<BR>";
 echo "<textarea name='OSSI_bl_domains' rows=3 cols=40>";
-echo_file ($dir_bl_dns."ossi.conf");
+echo_file ($dir_blacklist."ossi-bl/domain");
 echo "</textarea></td>";
-echo "<td width=50% colspan=5 align=center>";
+//echo "<td width=50% colspan=5 align=center>";
-echo "<H3>$l_forbidden_ip</H3>$l_forbidden_ip_explain<BR>";
+//echo "<H3>$l_forbidden_ip</H3>$l_forbidden_ip_explain<BR>";
-echo "<textarea name='OSSI_bl_ip' rows=3 cols=40>";
+//echo "<textarea name='OSSI_bl_ip' rows=3 cols=40>";
-echo_ip_file ($dir_bl_ip."ossi");
+//echo_ip_file ($dir_blacklist."ossi");
+//echo "</textarea></td></tr>;
-echo "</textarea></td></tr><tr><td colspan=10>";
+echo "</tr><tr><td colspan=10>";
 echo "<input type='submit' onClick=\"this.disabled=true; this.value='$l_load';\" value='$l_record'>";
 echo "</form> ($l_wait)";
 echo "</td></tr></table><br/>";
 ?>
 echo "<tr><td width=50% colspan=5 align=center>";
 echo "<H3>$l_file_list</H3>";
 echo "<table cellspacing=2 cellpadding=3 border=1><tr><th>$l_file_name<th>$l_nb_ip<th>$l_nb_domain_names<th>$l_file_state<th>$l_file_remove</tr>";
 //liste des fichiers activés
-$fichiersIp = array_diff(scandir($upload_dir_ip), array('ossi','ossi-ip-safesearch','..','.'));
+$fichiersbl = array_diff(scandir($dir_blacklist), array('..','.'));
-$fichiersIp = preg_grep("/^ossi-/",$fichiersIp);
+$fichiersbl = preg_grep("/^ossi-bl",$fichiersbl);
-foreach($fichiersIp as $fichier => $value)
+foreach($fichiersbl as $fichier => $value)
+{
 	if($value=='ossi-tor_node_ip')
 		echo "<tr><td><center><a href='bl_categories_help.php?liste=bl&cat=$value&ossi=yes&filtre=domain' target='cat_help' onclick=window.open('bl_categories_help','cat_help','width=600,height=450,toolbar=no,scrollbars=yes,resizable=yes') title='categories help page'>".exec("sed 's/^.....//g' <<< $value")."</a></center></td><td><center>".exec("wc -l $upload_dir_ip$value | awk '{print $1}'")."</center></td><td><center>".exec("wc -l $upload_dir_domain_names$value | awk '{print $1}'")."</center></td><td><center><input type='submit' name='$value' value='$l_disable'></center></td><td><center><input type='submit' name='$value' value='$l_remove' disabled></center></td></tr>";
 	else
 		echo "<tr><td><center><a href='bl_categories_help.php?liste=bl&cat=$value&ossi=yes&filtre=domain' target='cat_help' onclick=window.open('bl_categories_help','cat_help','width=600,height=450,toolbar=no,scrollbars=yes,resizable=yes') title='categories help page'>".exec("sed 's/^.....//g' <<< $value")."</a></center></td><td><center>".exec("wc -l $upload_dir_ip$value | awk '{print $1}'")."</center></td><td><center>".exec("wc -l $upload_dir_domain_names$value | awk '{print $1}'")."</center></td><td><center><input type='submit' name='$value' value='$l_disable'></center></td><td><center><input type='submit' name='$value' value='$l_remove'></center></td></tr>";

Subversion Repositories ALCASAR

(root)/web/acc/admin/bl_filter.php – Rev 1913 → 1925