Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1560 → Rev 1561

/CHANGELOG
17,7 → 17,7
- BL/WL/Antivirus filtering now works with MAC authentication
ACC
- simplify the user registration menu
- import a file containing a list of blacklist ip addresses (ie : CERT)
- import a file containing a list of blacklist ip addresses or DNS names (ie : CERT)
------------------------2.8.1 -----------------------
BUG - a security hole has been patch (EDB-ID: 34595 - OSVDB-ID: 111026)
- In the intercept page, fix the behaviour (loop) when the user writes "logout" as url
/conf/rpms/i586/coova-chilli-1.3.0-0.mga2.i586.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/conf/rpms/i586/coova-chilli-1.3.0-1.mga4.i586.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/conf/rpms/rpm-build-howto
18,12 → 18,12
- all is in the /usr/local". Remove the instaled files ("make uninstall") and the binaries ("make clean").
- Compress the directory (ie : coova-chilli-1.3.0.tar.gz). Copy this tarball in the directory ~/rpmbuild/SOURCES/.
- copy the SPEC file from the ALCASAR archive to the directory ~/rpmbuild/SPEC
- change to the directory ~/pmbuild/SPEC and run the RPM build process excluding 'ssl' (rpmbuild -ba coova-chilli.spec --without ssl)
 
- copier et adapter le .spec utilisé précédement. Les modifs ont été les suivantes :
INFO : .spec modifications since Redhat RPM :
- ajouter en première ligne "%define _disable_ld_no_undefined 1"
- pour la version 64b, ajouter 2 lignes intégrant le répertoire "lib64" lors de la suppression des binaires statiques (rm -rf $RPM_BUILD_ROOT/usr/lib/*.la)
- exclure de l'archive les fichiers inutiles pour ALCASAR (wpad.dat, wwwdir, etc. via la directive '%exclude')
- se positionner dans rpmbuild/SPEC et lancer la génération du RPM en supprimant le support ssl (rpmbuild -ba coova-chilli.spec --without ssl)
 
**** HAVP ****
- récupérer le tarball de la dernière version d'HAVP. Le décompresser dans un répertoire et tester la compilation traditionnelle (./configure + make)
/scripts/sbin/alcasar-uninstall.sh
14,7 → 14,9
echo "** Uninstall/Update ALCASAR **"
echo "-----------------------------------------------------------------------------"
echo
#services_stop
# logout all logged users
/usr/local/sbin/alcasar-logout.sh all
# services_stop
/usr/local/bin/alcasar-sms.sh --stop
 
for i in alcasar-load_balancing freshclam ntpd dansguardian httpd radiusd mysqld dnsmasq dnsmasq-blacklist dnsmasq-whitelist dnsmasq-blackhole tinyproxy havp nfsen chilli fail2ban iptables ulogd-ext-access ulogd-ssh ulogd-traceability vnstat
26,7 → 28,7
 
#init
echo -en "\n- init(1) : "
#les fichiers situés dans /usr/local/ seront supprimés à la fin car encore utiles ici
# les fichiers situés dans /usr/local/ seront supprimés à la fin car encore utiles ici
rm -f /root/ALCASAR* && echo -n "1"
sleep 1
 
/web/acc/manager/htdocs/import_user.php
19,7 → 19,6
$l_text_import = "Importer à partir d'un fichier texte ('.txt')";
$l_text_import_help = "Ce fichier ne doit contenir que des noms d'usagers écrits les uns sous les autres.";
$l_file = "Fichier";
$l_users_service = "Définissez leur service (facultatif)";
$l_users_group = "Définissez leur groupe (conseillé)";
$l_send = "Envoyer";
$l_imported_files = "Fichiers des identifiants/mot_de_passe importés durant les dernières 24h :";
41,7 → 40,6
$l_text_import = "Import from a text file ('.txt')";
$l_text_import_help = "In this file, you must write only the user login one below the other.";
$l_file = "File";
$l_users_service = "Define their service (optional)";
$l_users_group = "Define their group (advisable)";
$l_send = "Send";
$l_imported_files = "Logins/passwords file imported during the last 24h :";
120,6 → 118,7
else { $choix = ''; }
if ($choix == "raz")
{
exec ("sudo /usr/local/sbin/alcasar-logout.sh all");
exec ("sudo /usr/local/sbin/alcasar-mysql.sh --raz");
}
// a file is downloaded
126,11 → 125,9
if(isset($_FILES['import-users']) && ($_FILES['import-users']['name'] !=""))
{
unset($result);
if (isset ($_POST['service'])) $service = $_POST['service'];
if (isset ($_POST['groupe'])) $group = $_POST ['groupe'];
$destination = '/tmp/import_file.txt';
list($file_name , $extension) = explode("." , $_FILES['import-users']['name']);
echo "choix = ".$choix.", service = ".$service.", groupe = ".$group.", file_name = ".$file_name.", extension = ".$extension;
if ($choix == "csv") // import of a txt file
{
if (($extension != 'csv') && ($extension != 'txt')) $result = $l_error_ext_txt;
177,7 → 174,6
{
// create the user informations file
fputs($RS_out,"$l_out_title\r\n\r\n");
if ($service != "" ) { fputs($RS_out,"Service : $service\r\n\r\n");}
fputs($RS_out,"$l_out_login $login | $l_out_passwd $password\r\n\r\n");
fputs($RS_out,"$l_out_mind\r\n\r\n");
fputs($RS_out,"--------------------------------------------------------------------------------\r\n\r\n");
190,7 → 186,7
{
if (!@da_sql_num_rows($res,$config))
{
$res = @da_sql_query($link,$config,"INSERT INTO $config[sql_user_info_table] (username,department) VALUES ('$login','$service');");
$res = @da_sql_query($link,$config,"INSERT INTO $config[sql_user_info_table] (username) VALUES ('$login');");
if (!$res || !@da_sql_affected_rows($link,$res,$config))
echo "<b>Could not add user information in user info table: " . da_sql_error($link,$config) . "</b><br>\n";
}
265,7 → 261,6
echo "<tr><td valign=\"middle\" align=\"left\">";
echo "<br><FORM action='$_SERVER[PHP_SELF]' method=POST ENCTYPE=\"multipart/form-data\">";
echo "$l_file (.txt) : <input type=\"file\" name=\"import-users\"><br>";
echo "$l_users_service : <input type=\"input\" name=\"service\" value=\"\"><br>";
echo "$l_users_group : ";
require("../lib/defaults.php");
include_once("../lib/$config[general_lib_type]/group_info.php");