Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 842 → Rev 843

/CHANGELOG
10,6 → 10,7
- change the order of http chain (DG --> squid --> HAVP --> Internet) more réactivity and less charge of CPU
News
- The IP addresses in the consultation network are dynamicly allocated. Static ip can be reserved in the Alcasar Control Center
- The script "alcasar-https.sh {-on|-off}" enable or disable encryption on authentication flows
- Exceptions of authentication are now managed by Radius (like other users)
---------------------- 2.5 --------------------
Bugs
/scripts/sbin/alcasar-https.sh
0,0 → 1,44
#/bin/bash
# $Id: alcasar-nf.sh 791 2012-01-13 21:31:36Z richard $
 
# alcasar-dhcp.sh
# by Rexy
# This script is distributed under the Gnu General Public License (GPL)
 
# active ou désactive le chiffrement sur les flux d'authentification
# enable or disable encryption on authentication flows
 
SED="/bin/sed -i"
CHILLI_CONF_FILE="/etc/chilli.conf"
INTERCEPT_FILE="/var/www/html/intercept.php"
 
usage="Usage: alcasar-https.sh {--on | -on} | {--off | -off}"
nb_args=$#
args=$1
if [ $nb_args -eq 0 ]
then
echo "$usage"
exit 1
fi
case $args in
-\? | -h* | --h*)
echo "$usage"
exit 0
;;
--off|-off) # disable HTTPS
$SED "/# If https not use/,/}/s?^?#?" $INTERCEPT_FILE
$SED "s?uamserver.*?uamserver\thttp://alcasar/intercept.php?" $CHILLI_CONF_FILE
/etc/init.d/chilli restart
;;
--on|-on) # enable HTTPS
$SED "/## If https not use/,/#}/s?^#??" $INTERCEPT_FILE
$SED "s?uamserver.*?uamserver\thttps://alcasar/intercept.php?" $CHILLI_CONF_FILE
/etc/init.d/chilli restart
;;
*)
echo "Argument inconnu :$1";
echo "$usage"
exit 1
;;
esac
 
Property changes:
Added: svn:eol-style
+native
\ No newline at end of property
Added: svn:executable
+*
\ No newline at end of property
/web/intercept.php
11,7 → 11,7
# notice and this permission notice is included in all copies or
# substantial portions of the software.
 
$organisme = "etrs-ssic";
$organisme = "";
# Redirects from CoovaChilli (chilli daemon) :
# Response to login:
# success : if login successful
22,7 → 22,7
# Default : it was not a form request -> client go to login form
 
# Shared secret used to encrypt challenge with radius.
$uamsecret = "E4tJqG9I";
$uamsecret = "";
 
# URL loaded after success authenticates (let blank for browser defaults)
$adminurl = "";
51,7 → 51,7
$l_wait = "Por favor, espere un momento ...";
$l_onlinetime = "Tiempo de conexión:";
$l_remainingtime = "Desconexión en:";
$l_encrypted = "La apertura debe usar conexión cifrada";
$l_encrypted = "La apertura debe usar conexión cifrada (https)";
$l_boutonO = "Autenticación";
$l_boutonF = "Cerrar";
$l_loggedin_stringl1 = "Information System Security";
82,7 → 82,7
$l_wait = "Bitte warten Sie einen Moment ...";
$l_onlinetime = "Online-Zeit:";
$l_remainingtime = "Abmelden:";
$l_encrypted = "Die Öffnung muß der Anschluß Zahlen";
$l_encrypted = "Die Öffnung muß der Anschluß Zahlen (https)";
$l_boutonO = "Authentifizierung";
$l_boutonF = "Schließen";
$l_loggedin_stringl1 = "Information System Security";
113,7 → 113,7
$l_wait = "Wacht een moment ...";
$l_onlinetime = "Sluit tijd:";
$l_remainingtime = "Verbreking in:";
$l_encrypted = "De opening moet gebruiken gecodeerde verbinding";
$l_encrypted = "De opening moet gebruiken gecodeerde verbinding (https)";
$l_boutonO = "Authenticatie";
$l_boutonF = "Sluiten";
$l_loggedin_stringl1 = "Information System Security";
144,7 → 144,7
$l_wait = "Patientez un instant ...";
$l_onlinetime = "Temps de connexion:";
$l_remainingtime = "Deconnexion dans :";
$l_encrypted = "La connexion avec le portail doit être chiffrée";
$l_encrypted = "La connexion avec le portail doit être chiffrée (https)";
$l_boutonO = "Authentification";
$l_boutonF = "Fermer";
$l_loggedin_stringl1 = "Sécurité des Systèmes d'Information";
175,7 → 175,7
$l_wait = "Please wait a moment ...";
$l_onlinetime = "Connect time:";
$l_remainingtime = "Disconnection in:";
$l_encrypted = "The opening must use encrypted connection";
$l_encrypted = "The connection with the portal must encrypted (https)";
$l_boutonO = "Authentication";
$l_boutonF = "Close";
$l_loggedin_stringl1 = "Information System Security";
/web/acc/phpsysinfo/includes/xml/portail.php
111,9 → 111,9
if (filtrageTest("/usr/local/etc/alcasar.conf", "/^PROTOCOLS_FILTERING=on/")){
$network_filter_status = $text['enable'];}
else { $network_filter_status = $text['disable'];}
if (filtrageTest("/etc/dansguardian/dansguardian.conf","/^reportinglevel = 3/")){
$web_filter_status = $text['enable'];}
else { $web_filter_status = $text['disable'];}
if (filtrageTest("/usr/local/etc/alcasar.conf","/^DNS_FILTERING=on/")){
$domain_filter_status = $text['enable'];}
else { $domain_filter_status = $text['disable'];}
if (filtrageTest("/usr/local/etc/alcasar.conf","/^WEB_ANTIVIRUS=on/")){
$web_antivir_status = $text['enable'];}
else { $web_antivir_status = $text['disable'];}
151,10 → 151,14
. " <td><font size=\"-1\">" . $network_filter_status . "</font></td>\n"
. " </tr>\n"
. " <tr>\n"
. " <td valign=\"top\"><font size=\"-1\">" . $text['web_filter'] . "</font></td>\n"
. " <td><font size=\"-1\">antivirus : " . $web_antivir_status . ", domain/url : " . $web_filter_status . "</font></td>\n"
. " <td valign=\"top\"><font size=\"-1\">" . $text['web_antivirus'] . "</font></td>\n"
. " <td><font size=\"-1\">" . $web_antivir_status . "</font></td>\n"
. " </tr>\n"
. " <tr>\n"
. " <td valign=\"top\"><font size=\"-1\">" . $text['domain_filter'] . "</font></td>\n"
. " <td><font size=\"-1\">" . $domain_filter_status . "</font></td>\n"
. " </tr>\n"
. " <tr>\n"
. " <td valign=\"top\"><font size=\"-1\">" . $text['bl-version'] . "</font></td>\n"
. " <td><font size=\"-1\">" . $VERSIONBL . "</font></td>\n"
. " </tr>\n"
/web/acc/phpsysinfo/includes/lang/fr.php
52,8 → 52,9
$text['internet_link'] = "Lien Internet";
$text['enable'] = "actif";
$text['disable'] = "inactif";
$text['web_filter'] = "Filtrage WEB";
$text['net_filter'] = "Filtrage protocoles r&eacute;seau";
$text['web_antivirus'] = "Antivirus de flux WEB";
$text['net_filter'] = "Filtre de protocoles r&eacute;seau";
$text['domain_filter'] = "Filtre de domaine et d'URL";
$text['cert_expiration_date'] = "Date d'expiration du certificat";
//
 
/web/acc/phpsysinfo/includes/lang/en.php
52,8 → 52,9
$text['internet_link'] = "Internet connexion";
$text['enable'] = "enable";
$text['disable'] = "disable";
$text['web_filter'] = "WEB filtering";
$text['net_filter'] = "Network protocols filtering";
$text['web_antivirus'] = "WEB antivirus";
$text['net_filter'] = "Network protocols filter";
$text['domain_filter'] = "Domain and URL filter";
$text['cert_expiration_date'] = "Certificate expiration date";
//