From 0bd34ed65b60e6fcae3bb4ce4f4ef8a0d6b56aed Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Wed, 4 Jan 2006 01:49:33 +0000 Subject: Sync w/ m0n0wall 1.21 --- usr/local/www/services_captiveportal.php | 328 ++++++++++++++++++++++--------- 1 file changed, 239 insertions(+), 89 deletions(-) (limited to 'usr/local/www/services_captiveportal.php') diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index feeddfc..e1e7a36 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -3,7 +3,7 @@ services_captiveportal.php part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2003-2005 Manuel Kasper . + Copyright (C) 2003-2006 Manuel Kasper . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -28,6 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ +$pgtitle = "Services:Captive portal"; require("guiconfig.inc"); if (!is_array($config['captiveportal'])) { @@ -45,11 +46,15 @@ if ($_GET['act'] == "viewhtml") { } $pconfig['cinterface'] = $config['captiveportal']['interface']; +$pconfig['maxproc'] = $config['captiveportal']['maxproc']; +$pconfig['maxprocperip'] = $config['captiveportal']['maxprocperip']; $pconfig['timeout'] = $config['captiveportal']['timeout']; $pconfig['idletimeout'] = $config['captiveportal']['idletimeout']; $pconfig['enable'] = isset($config['captiveportal']['enable']); $pconfig['auth_method'] = $config['captiveportal']['auth_method']; $pconfig['radacct_enable'] = isset($config['captiveportal']['radacct_enable']); +$pconfig['radmac_enable'] = isset($config['captiveportal']['radmac_enable']); +$pconfig['radmac_secret'] = $config['captiveportal']['radmac_secret']; $pconfig['reauthenticate'] = isset($config['captiveportal']['reauthenticate']); $pconfig['reauthenticateacct'] = $config['captiveportal']['reauthenticateacct']; $pconfig['httpslogin_enable'] = isset($config['captiveportal']['httpslogin']); @@ -58,11 +63,17 @@ $pconfig['cert'] = base64_decode($config['captiveportal']['certificate']); $pconfig['key'] = base64_decode($config['captiveportal']['private-key']); $pconfig['logoutwin_enable'] = isset($config['captiveportal']['logoutwin_enable']); $pconfig['nomacfilter'] = isset($config['captiveportal']['nomacfilter']); +$pconfig['noconcurrentlogins'] = isset($config['captiveportal']['noconcurrentlogins']); $pconfig['redirurl'] = $config['captiveportal']['redirurl']; $pconfig['radiusip'] = $config['captiveportal']['radiusip']; +$pconfig['radiusip2'] = $config['captiveportal']['radiusip2']; $pconfig['radiusport'] = $config['captiveportal']['radiusport']; +$pconfig['radiusport2'] = $config['captiveportal']['radiusport2']; $pconfig['radiusacctport'] = $config['captiveportal']['radiusacctport']; $pconfig['radiuskey'] = $config['captiveportal']['radiuskey']; +$pconfig['radiuskey2'] = $config['captiveportal']['radiuskey2']; +$pconfig['radiusvendor'] = $config['captiveportal']['radiusvendor']; +$pconfig['radiussession_timeout'] = isset($config['captiveportal']['radiussession_timeout']); if ($_POST) { @@ -76,6 +87,15 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); + /* make sure no interfaces are bridged */ + for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { + $coptif = &$config['interfaces']['opt' . $i]; + if (isset($coptif['enable']) && $coptif['bridge']) { + $input_errors[] = "The captive portal cannot be used when one or more interfaces are bridged."; + break; + } + } + if ($_POST['httpslogin_enable']) { if (!$_POST['cert'] || !$_POST['key']) { $input_errors[] = "Certificate and key must be specified for HTTPS login."; @@ -101,57 +121,56 @@ if ($_POST) { if (($_POST['radiusip'] && !is_ipaddr($_POST['radiusip']))) { $input_errors[] = "A valid IP address must be specified. [".$_POST['radiusip']."]"; } + if (($_POST['radiusip2'] && !is_ipaddr($_POST['radiusip2']))) { + $input_errors[] = "A valid IP address must be specified. [".$_POST['radiusip2']."]"; + } if (($_POST['radiusport'] && !is_port($_POST['radiusport']))) { $input_errors[] = "A valid port number must be specified. [".$_POST['radiusport']."]"; } + if (($_POST['radiusport2'] && !is_port($_POST['radiusport2']))) { + $input_errors[] = "A valid port number must be specified. [".$_POST['radiusport2']."]"; + } if (($_POST['radiusacctport'] && !is_port($_POST['radiusacctport']))) { - $input_errors[] = "A valid port number must be specified. [".$_POST['radiusport']."]"; + $input_errors[] = "A valid port number must be specified. [".$_POST['radiusacctport']."]"; + } + if ($_POST['maxproc'] && (!is_numeric($_POST['maxproc']) || ($_POST['maxproc'] < 4) || ($_POST['maxproc'] > 100))) { + $input_errors[] = "The total maximum number of concurrent connections must be between 4 and 100."; + } + $mymaxproc = $_POST['maxproc'] ? $_POST['maxproc'] : 16; + if ($_POST['maxprocperip'] && (!is_numeric($_POST['maxprocperip']) || ($_POST['maxprocperip'] > $mymaxproc))) { + $input_errors[] = "The maximum number of concurrent connections per client IP address may not be larger than the global maximum."; } if (!$input_errors) { $config['captiveportal']['interface'] = $_POST['cinterface']; + $config['captiveportal']['maxproc'] = $_POST['maxproc']; + $config['captiveportal']['maxprocperip'] = $_POST['maxprocperip'] ? $_POST['maxprocperip'] : false; $config['captiveportal']['timeout'] = $_POST['timeout']; $config['captiveportal']['idletimeout'] = $_POST['idletimeout']; + $config['captiveportal']['enable'] = $_POST['enable'] ? true : false; $config['captiveportal']['auth_method'] = $_POST['auth_method']; + $config['captiveportal']['radacct_enable'] = $_POST['radacct_enable'] ? true : false; + $config['captiveportal']['reauthenticate'] = $_POST['reauthenticate'] ? true : false; + $config['captiveportal']['radmac_enable'] = $_POST['radmac_enable'] ? true : false; + $config['captiveportal']['radmac_secret'] = $_POST['radmac_secret'] ? $_POST['radmac_secret'] : false; $config['captiveportal']['reauthenticateacct'] = $_POST['reauthenticateacct']; + $config['captiveportal']['httpslogin'] = $_POST['httpslogin_enable'] ? true : false; $config['captiveportal']['httpsname'] = $_POST['httpsname']; $config['captiveportal']['certificate'] = base64_encode($_POST['cert']); $config['captiveportal']['private-key'] = base64_encode($_POST['key']); + $config['captiveportal']['logoutwin_enable'] = $_POST['logoutwin_enable'] ? true : false; + $config['captiveportal']['nomacfilter'] = $_POST['nomacfilter'] ? true : false; + $config['captiveportal']['noconcurrentlogins'] = $_POST['noconcurrentlogins'] ? true : false; $config['captiveportal']['redirurl'] = $_POST['redirurl']; $config['captiveportal']['radiusip'] = $_POST['radiusip']; + $config['captiveportal']['radiusip2'] = $_POST['radiusip2']; $config['captiveportal']['radiusport'] = $_POST['radiusport']; + $config['captiveportal']['radiusport2'] = $_POST['radiusport2']; $config['captiveportal']['radiusacctport'] = $_POST['radiusacctport']; $config['captiveportal']['radiuskey'] = $_POST['radiuskey']; - - if($_POST['radacct_enable'] == "yes") - $config['captiveportal']['radacct_enable'] = true; - else - unset($config['captiveportal']['radacct_enable']); - - if($_POST['reauthenticate'] == "yes") - $config['captiveportal']['reauthenticate'] = true; - else - unset($config['captiveportal']['reauthenticate']); - - if($_POST['enable'] == "yes") - $config['captiveportal']['enable'] = true; - else - unset($config['captiveportal']['enable']); - - if($_POST['httpslogin_enable'] == "yes") - $config['captiveportal']['httpslogin'] = true; - else - unset($config['captiveportal']['httpslogin']); - - if($_POST['logoutwin_enable'] == "yes") - $config['captiveportal']['logoutwin_enable'] = true; - else - unset($config['captiveportal']['logoutwin_enable']); - - if($_POST['nomacfilter'] == "yes") - $config['captiveportal']['nomacfilter'] = true; - else - unset($config['captiveportal']['nomacfilter']); + $config['captiveportal']['radiuskey2'] = $_POST['radiuskey2']; + $config['captiveportal']['radiusvendor'] = $_POST['radiusvendor'] ? $_POST['radiusvendor'] : false; + $config['captiveportal']['radiussession_timeout'] = $_POST['radiussession_timeout'] ? true : false; /* file upload? */ if (is_uploaded_file($_FILES['htmlfile']['tmp_name'])) @@ -162,55 +181,68 @@ if ($_POST) { write_config(); $retval = 0; - - config_lock(); - $retval = captiveportal_configure(); - config_unlock(); - + if (!file_exists($d_sysrebootreqd_path)) { + config_lock(); + $retval = captiveportal_configure(); + config_unlock(); + } $savemsg = get_std_save_message($retval); } } - -$pgtitle = "Services: Captive Portal"; include("head.inc"); - ?> - -

Services: Captive portal

+

+?>
@@ -220,9 +252,9 @@ function enable_change(enable_change) { $tab_array[] = array("Pass-through MAC", false, "services_captiveportal_mac.php"); $tab_array[] = array("Allowed IP addresses", false, "services_captiveportal_ip.php"); $tab_array[] = array("Users", false, "services_captiveportal_users.php"); + $tab_array[] = array("File Manager", true, "services_captiveportal_filemanager.php"); display_top_tabs($tab_array); -?> -
@@ -250,6 +282,21 @@ function enable_change(enable_change) { Choose which interface to run the captive portal on. + + + + + + + + + If this option is set, no attempts will be made to ensure that the MAC address of clients stays the same while they're logged in. + This is required when the MAC address of the client cannot be determined (usually because there are routers between m0n0wall and the clients). + If this is enabled, RADIUS MAC authentication cannot be used. + If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name, certificate and matching private key must also be specified below. @@ -373,7 +520,9 @@ to access after they've authenticated.
Upload an HTML file for the portal page here (leave blank to keep the current one). Make sure to include a form (POST to "$PORTAL_ACTION$") -with a submit button (name="accept") and a hidden field with name="redirurl" and value="$PORTAL_REDIRURL$". Include the "auth_user" and "auth_pass" input elements if RADIUS authentication is enabled. If RADIUS is enabled and no "auth_user" is present, authentication will always fail. If RADIUS is not enabled, you can omit both of these input elements. Example code for the form:
+with a submit button (name="accept") and a hidden field with name="redirurl" and value="$PORTAL_REDIRURL$". +Include the "auth_user" and "auth_pass" input fields if authentication is enabled, otherwise it will always fail. +Example code for the form:

<form method="post" action="$PORTAL_ACTION$">
   <input name="auth_user" type="text">
@@ -393,7 +542,8 @@ with a submit button (name="accept") and a hidden field with name=&quo

-The contents of the HTML file that you upload here are displayed when a RADIUS authentication error occurs. +The contents of the HTML file that you upload here are displayed when an authentication error occurs. +You may include "$PORTAL_MESSAGE$", which will be replaced by the error or reply messages from the RADIUS server, if any. -- cgit v1.1
Maximum concurrent connections + + + + + + + +
per client IP address (0 = no limit)
total
+This setting limits the number of concurrent connections to the captive portal HTTP(S) server. This does not set how many users can be logged in +to the captive portal, but rather how many users can load the portal page or authenticate at the same time! +Default is 4 connections per client IP address, with a total maximum of 16 connections.
Idle timeout @@ -279,69 +326,169 @@ If you provide a URL here, clients will be redirected to that URL instead of the to access after they've authenticated.
Concurrent user logins + > + Disable concurrent logins
+ If this option is set, only the most recent login per username will be active. Subsequent logins will cause machines previously logged in with the same username to be disconnected.
MAC filtering > Disable MAC filtering
- If this option is set, no attempts will be made to ensure that the MAC address of clients stays the same while they're logged in. This is required when the MAC address of cannot be determined (usually because there are routers between pfSense and the clients).
Authentication - - - - - - - - - - - - - - - - - - - - - - - - -
> + > No authentication
> + > Local user manager
> + > RADIUS authentication
   
IP address:
Port:
Shared secret:  
Accounting:  > - send RADIUS accounting packets
Accounting port:  
Reauthentication:  > - reauthenticate connected users every minute

- > no accounting updates
- > stop/start accounting
- > interim update
-
- When using RADIUS authentication, enter the IP address and port of the RADIUS server which users of the captive portal have to authenticate against. Leave port number blank to use the default port (1812). Leave the RADIUS shared secret blank to not use a RADIUS shared secret. RADIUS accounting packets will also be sent to the RADIUS server if accounting is enabled (default port is 1813). -

If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Primary RADIUS server
IP address
+ Enter the IP address of the RADIUS server which users of the captive portal have to authenticate against.
Port
+ Leave this field blank to use the default port (1812).
Shared secret  
+ Leave this field blank to not use a RADIUS shared secret (not recommended).
Secondary RADIUS server
IP address
+ If you have a second RADIUS server, you can activate it by entering its IP address here.
Port
Shared secret  
Accounting
 > + send RADIUS accounting packets
+ If this is enabled, RADIUS accounting packets will be sent to the primary RADIUS server.
Accounting port
+ Leave blank to use the default port (1813).
Reauthentication
 > + Reauthenticate connected users every minute
+ If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is + logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately.
Accounting updates + > no accounting updates
+ > stop/start accounting
+ > interim update +
RADIUS MAC authentication
  + >Enable RADIUS MAC authentication
+ If this option is enabled, the captive portal will try to authenticate users by sending their MAC address as the username and the password + entered below to the RADIUS server.
Shared secret
RADIUS options
Session-Timeout>Use RADIUS Session-Timeout attributes
+ When this is enabled, clients will be disconnected after the amount of time retrieved from the RADIUS Session-Timeout attribute.
Type
+ If RADIUS type is set to Cisco, in Access-Requests the value of Calling-Station-Id will be set to the client's IP address and + the Called-Station-Id to the client's MAC address. Default behaviour is Calling-Station-Id = client's MAC address and Called-Station-Id = m0n0wall's WAN IP address.
HTTPS login > Enable HTTPS login
- If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. This option only applies when RADIUS authentication is used. A server name, certificate and matching private key must also be specified below.
HTTPS server name