Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Regard whitespace Rev 2897 → Rev 2898

/CHANGELOG
3,10 → 3,14
********** ALCASAR CHANGELOG **********
-------------------- 3.5.2 --------------------
NEWS
-
- ALCASAR can now let the @MAC of a user authenticated during 24h (attribute "authorized its equipment (yes/no)")
- Ask the "unbound" Mageia packager to add "--enabled-ipset" for the next Mageia-8. validated : https://bugs.mageia.org/show_bug.cgi?id=27803
ACC
- Improve IoT capture system
- Manufacturer mac addresses resolution list is now embeded in ALCASAR archive
- Admin can add network addresses in blacklist
- The control of the filenames imported in the blacklist is more strict
- End of spanish translation
CHANGES
- Status page is now in HTTPS when interception is also in HTTPS
BUGS
13,7 → 17,8
- unbound-whitelist doesn't send DNS requests to the listen port of Dnsmasq (55)
- Wrong rights on file "/tmp/current_users.txt"
- fix a radius message
 
WEB
- Web site is now in HTTPS
-------------------- 3.5.1 --------------------
NEWS
- Integration of the European “WIFI4EU” system (in the exploitation doc)
/VERSION
1,0 → 0,0
3.5.1
3.5.2
/conf/letsencrypt-client/acme.sh-2.8.7.tar.gz
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/letsencrypt-client/acme.sh-2.8.8.tar.gz
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
/scripts/alcasar-bl.sh
97,8 → 97,9
$SED '/^#.*/d' $FILE_tmp # remove commented lines
$SED '/^\s*$/d' $FILE_tmp # remove empty lines
$SED '/[äâëêïîöôüû@,]/d' $FILE_tmp # remove line with "chelou" characters
# extract ip addresses for iptables.
# extract ip addresses and ip networks for iptables.
awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}$/{print "add bl_ip_blocked " $0}' $FILE_tmp > $FILE_ip_tmp
awk '/^([0-9]{1,3}\.){3}[0-9]{1,3}\/[0-9]{1,2}$/{print "add bl_ip_blocked " $0}' $FILE_tmp >> $FILE_ip_tmp
# extract domain names for unbound.
$SED -n '/^\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}/!p' $FILE_tmp
# Retrieve max Top Level Domain for domain name synthax
/scripts/alcasar-urpmi.sh
126,8 → 126,8
echo "Download the Linux kernel used by ALCASAR. Please wait ..."
fi
urpmi --auto --quiet $KERNEL
# Avoid downloading RPM which can cause some mistakes with ours
echo "/^wkhtmltopdf/" > /etc/urpmi/skip.list
# Remove some of our RPMs in order to avoid their update
urpme wkhtmltopdf
# download updated RPM in cache
if [ $Lang == "fr" ]
then
/web/acc/admin/bl_filter.php
394,7 → 394,8
}
break;
case 'MAJ_ossi_file_upload' :
$file_name = str_replace (".", "_",basename($_FILES['fichier_ip']['name']));
$bad_char = array(" ", ".");
$file_name = str_replace ($bad_char, "_",basename($_FILES['fichier_ip']['name']));
$dest_dir = $dir_blacklist."ossi-bl-".$file_name; # /etc/e2guardian/list/blacklist/ossi-bl-XXXXXXXX
if((!empty($file_name)) && (!file_exists($dest_dir)))
{
/web/acc/manager/lib/langues.php
131,128 → 131,128
$l_no="Non";
break;
case 'es':
$l_monday="monday"; $l_tuesday="tuesday"; $l_wednesday="wednesday"; $l_thursday="thursday"; $l_friday="friday"; $l_saturday="saturday"; $l_sunday="sunday";
$l_monday="lunes"; $l_tuesday="martes"; $l_wednesday="miercoles"; $l_thursday="jueves"; $l_friday="viernes"; $l_saturday="sábado"; $l_sunday="domingo";
$l_monthly="monthly";$l_weekly="weekly";$l_daily="daily";$l_by_session="by session";
$l_day = "Day";
$l_limit = "limit";
$l_daily_limit="daily limit";
$l_used_time = "Used time";
$l_last7days_status = "Last 7 days status";
$l_already_exist = "already exist";
$l_connections_number = "Connections number";
$l_download = "Downloaded data";
$l_upload = "Uploaded data";
$l_average = "average";
$l_user = "User";
$l_users_managment = "Users managment";
$l_groups_managment = "Groups managment";
$l_search_filter = "Search filter";
$l_search_criteria = "Search criteria";
$l_search = "Start search";
$l_no_user_found = "No user found";
$l_special_attribute = "Special attribute";
$l_attribute = "Attribute";
$l_value = "Value<br>(empty = all)";
$l_login = "Login";
$l_password = "Password";
$l_new_password = "New password";
$l_passwd_gen = "generate";
$l_user_create = "Create a user";
$l_nb_users = "Number of users";
$l_group_create = "Create a group";
$l_group_select = "Select a group";
$l_group = "Group";
$l_created_groups = "Already created group(s)";
$l_group_name = "Group name";
$l_group_members = "Members of group :<br>(separate by a 'space' or a 'carriage return')";
$l_group_members_remove = "Remove all members of this group";
$l_group_members_to_remove = "<b>Members to remove :</b><br>The selected members will be remove from the group.<br>Use 'shift' or 'Ctrl' for multiple selection.";
$l_group_members_to_add = "<b>Members to add :</b><br>Separate the members with a 'space' or a 'carriage return'.";
$l_manage_selected_user= "Manage the selected user";
$l_group_member = "Member of group";
$l_group_empty = "The group list is empty";
$l_main_group = "The current user group is highlighted in blue";
$l_no_group = "No group";
$l_no_open_session = "No open session";
$l_opened_sessions = "opened session(s)";
$l_active_accounting = "active accounting(s)";
$l_want_to_close ="Do you want to close them ?";
$l_yes_close ="Yes, close";
$l_status ="STATUS";
$l_personal_info ="PERSONAL INFORMATIONS";
$l_connections ="CONNECTIONS";
$l_open_sessions ="OPEN SESSIONS";
$l_members ="MEMBERS";
$l_attributes ="ATTRIBUTES";
$l_remove ="REMOVE";
$l_locked_user ="The user account is locked";
$l_user_remain_login ="The user can log in during ";
$l_user_expired ="The user account has expired";
$l_connected ="Connected from";
$l_connection_time ="Connection time";
$l_total_connections_time ="Total connections time";
$l_user_never_login ="This user has never logged in";
$l_user_not_login_yet ="This user isn't connected yet";
$l_last_login ="Last connection";
$l_remain_time ="Remain connection time";
$l_description ="Description";
$l_name = "Surname and name";
$l_email = "Email Address";
$l_homephone = "Personal phone number";
$l_telephonenumber = "Office phone number";
$l_mobile = "Mobile phone number";
$l_lang_ticket = "Voucher language";
$l_simultaneous_use = "Number of concurent login";
$l_max_all_session = "Maximum time of connection<br>(in seconds)";
$l_expire_after = "Authorized period after the first connection<br>(in seconds)";
$l_expiration = "Expiration date";
$l_session_timeout = "Maximum time for a session<br>(in seconds)";
$l_daily_timeout = "Maximum time of connection per day<br>(in seconds)";
$l_monthly_timeout = "Maximum time of connection per month<br>(in seconds)";
$l_login_time = "Weekly period";
$l_max_input_octets = "Maximum of data uploaded<br>(in octets)";
$l_max_output_octets = "Maximum of data downloaded<br>(in octets)";
$l_max_total_octets = "Maximum of data exchanged<br>(in octets)";
$l_max_total_octets_daily = "Maximum of data exchanged daily<br>(in octets)";
$l_max_total_octets_monthly = "Maximum of data exchanged monthly<br>(in octets)";
$l_max_bandwidth_up = "Maximum upload bandwidth<br>(in kbits/second)";
$l_max_bandwidth_down = "Maximum download bandwidth<br>(in kbits/second)";
$l_wispr_redirection = "Redirection URL";
$l_click_for_help = "Click to show help about this attribute";
$l_show_profile = "Show profile";
$l_are_you_sure = "Are you sure to remove";
$l_yes_remove = "Yes, remove";
$l_create = "Create";
$l_advanced_menu = "Advanced menu";
$l_simple_menu = "Simple menu";
$l_change = "Change";
$l_or = "Or";
$l_create_ticket = "Create a ticket (voucher)";
$l_create_multiple = "Create several tickets";
$l_create_multiple_comment = "<br>Note: when creating multiple tickets simultaneously :<br>
- username and password are randomly generated,<br>
- fields \"Surname and name\" and \"Email Address\" are not use.<br> ";
$l_createTicketsMSG = "Enter the number of users to create";
$l_filtering = "Antivirus & domain Filtering";
$l_filtering_none = "None";
$l_filtering_av = "WEB Antivirus";
$l_filtering_av_bl = "Blacklist + WEB antivirus";
$l_filtering_av_wl = "Whitelist + WEB antivirus";
$l_user_exists = "already exists !";
$l_created = "has been correctly created";
$l_removed = "has been removed";
$l_group_desc = "<h2>Group Attributes</h2>";
$l_user_desc = "<h2>User Attributes</h2>";
$l_proto="Network protocols filtering";
$l_proto_0="None";
$l_proto_1="Web browsing (HTTP & HTTPS)";
$l_proto_2="Web browsing + Mail + remote access";
$l_proto_3="Customized";
$l_empty="Empty";
$l_ipAddress="IP address";
$l_rule="Rule";
$l_statusOpenRequired="Authorise its equipment";
$l_yes="Yes";
$l_day = "día";
$l_limit = "límite";
$l_daily_limit="límite diario";
$l_used_time = "Tiempo usado";
$l_last7days_status = "Estado de los últimos 7 días";
$l_already_exist = "ya existen";
$l_connections_number = "Número de conexiones";
$l_download = "Datos descargados";
$l_upload = "Datos cargados";
$l_average = "promedio";
$l_user = "Usuario";
$l_users_managment = "Gestión de usuarios";
$l_groups_managment = "Gestión de grupos";
$l_search_filter = "Filtro de búsqueda";
$l_search_criteria = "Criterios de búsqueda";
$l_search = "Iniciar la búsqueda";
$l_no_user_found = "No se ha encontrado ningún usuario";
$l_special_attribute = "Atributo especial";
$l_attribute = "Atributo";
$l_value = "Valor<br>(vacío = todo)";
$l_login = "Ingresa en";
$l_password = "Contraseña";
$l_new_password = "Nueva contraseña";
$l_passwd_gen = "generar";
$l_user_create = "Crear un usuario";
$l_nb_users = "Número de usuarios";
$l_group_create = "Crear un grupo";
$l_group_select = "Seleccione un grupo";
$l_group = "Grupo";
$l_created_groups = "Grupo(s) ya creado(s)";
$l_group_name = "Nombre del grupo";
$l_group_members = "Miembros del grupo :<br>(separado por un 'espacio' o un 'retorno de carro')";
$l_group_members_remove = "Eliminar todos los miembros de este grupo";
$l_group_members_to_remove = "<b>Miembros para eliminar :</b><br>Los miembros seleccionados serán eliminados del grupo.<br>Use 'shift' o 'Ctrl' para la selección múltiple.";
$l_group_members_to_add = "<b>Miembros para añadir :</b><br>Separar los miembros con un 'espacio' o un 'retorno de carro'.";
$l_manage_selected_user= "Gestionar el usuario seleccionado";
$l_group_member = "Miembro del grupo";
$l_group_empty = "La lista de grupos está vacía";
$l_main_group = "El grupo de usuarios actual está resaltado en azul";
$l_no_group = "No hay grupo";
$l_no_open_session = "No hay sesión abierta";
$l_opened_sessions = "sesión(es) abierta(s)";
$l_active_accounting = "contabilidad(s) activa(s)";
$l_want_to_close ="¿Quieres cerrarlos?";
$l_yes_close ="Sí, cerca.";
$l_status ="ESTADO";
$l_personal_info ="INFORMACIÓN PERSONAL";
$l_connections ="CONEXIONES";
$l_open_sessions ="SESIONES ABIERTAS";
$l_members ="MIEMBROS";
$l_attributes ="ATRIBUTOS";
$l_remove ="REMOVER";
$l_locked_user ="La cuenta de usuario está bloqueada";
$l_user_remain_login ="La cuenta del usuario está bloqueadaEl usuario puede ingresar durante ";
$l_user_expired ="La cuenta de usuario ha expirado";
$l_connected ="Conectado desde";
$l_connection_time ="Tiempo de conexión";
$l_total_connections_time ="Tiempo total de conexiones";
$l_user_never_login ="Este usuario nunca se ha conectado";
$l_user_not_login_yet ="Este usuario no está conectado todavía";
$l_last_login ="La última conexión";
$l_remain_time ="Tiempo de conexión restante";
$l_description ="Descripción";
$l_name = "Nombre y apellido";
$l_email = "Dirección de correo electrónico";
$l_homephone = "Número de teléfono personal";
$l_telephonenumber = "Número de teléfono de la oficina";
$l_mobile = "Número de teléfono móvil";
$l_lang_ticket = "Idioma de los vales";
$l_simultaneous_use = "Número de accesos simultáneos";
$l_max_all_session = "Tiempo máximo de conexión<br>(en segundos)";
$l_expire_after = "Período autorizado después de la primera conexión <br>(en segundos)";
$l_expiration = "Fecha de caducidad";
$l_session_timeout = "Tiempo máximo para una sesión <br>(en segundos)";
$l_daily_timeout = "Tiempo máximo de conexión por día<br>(en segundos)";
$l_monthly_timeout = "Tiempo máximo de conexión por mes<br>(en segundos)";
$l_login_time = "Período semanal";
$l_max_input_octets = "Máximo de datos cargados<br>(en octetos)";
$l_max_output_octets = "Máximo de datos descargados<br>(en octetos)";
$l_max_total_octets = "Máximo de datos intercambiados<br>(en octetos)";
$l_max_total_octets_daily = "Máximo de datos intercambiados diariamente<br>(en octetos)";
$l_max_total_octets_monthly = "Máximo de datos intercambiados mensualmente<br>(en octetos)";
$l_max_bandwidth_up = "Máximo ancho de banda de subida<br>(en kbits/segundo)";
$l_max_bandwidth_down = "Ancho de banda máximo de descarga<br>(en kbits/segundo)";
$l_wispr_redirection = "URL de redireccionamiento";
$l_click_for_help = "Haz clic para mostrar la ayuda sobre este atributo";
$l_show_profile = "Mostrar perfil";
$l_are_you_sure = "¿Está seguro de eliminar";
$l_yes_remove = "sí, borrar";
$l_create = "Crear";
$l_advanced_menu = "Menú avanzado";
$l_simple_menu = "Menú simple";
$l_change = "Cambiar";
$l_or = "O";
$l_create_ticket = "Crear un billete (vale)";
$l_create_multiple = "Crear varios boletos";
$l_create_multiple_comment = "<br>Nota: cuando se crean varios boletos simultáneamente :<br>
- el nombre de usuario y la contraseña se generan al azar,<br>
- Los campos \"Apellido y nombre\" y \"Dirección de correo electrónico\" no se usan.<br>";
$l_createTicketsMSG = "Introduzca el número de usuarios a crear";
$l_filtering = "Antivirus y filtrado de dominio";
$l_filtering_none = "Ninguno";
$l_filtering_av = "Antivirus WEB";
$l_filtering_av_bl = "Lista negra + antivirus WEB";
$l_filtering_av_wl = "Lista blanca + antivirus WEB";
$l_user_exists = "ya existe!";
$l_created = "se ha creado correctamente";
$l_removed = "se ha eliminado";
$l_group_desc = "<h2>Atributos del grupo</h2>";
$l_user_desc = "<h2>Atributos del usuario</h2>";
$l_proto="Filtrado de protocolos de red";
$l_proto_0="Ninguno";
$l_proto_1="Navegación web (HTTP y HTTPS)";
$l_proto_2="Navegación web + Correo + acceso remoto";
$l_proto_3="Personalizado";
$l_empty="Vacío";
$l_ipAddress="Dirección IP";
$l_rule="Regla";
$l_statusOpenRequired="Autorizar su equipo";
$l_yes="sí";
$l_no="No";
break;
default :