diff options
| author | Matthew Grooms <mgrooms@pfsense.org> | 2008-08-27 22:05:26 +0000 |
|---|---|---|
| committer | Matthew Grooms <mgrooms@pfsense.org> | 2008-08-27 22:05:26 +0000 |
| commit | 872d919581ec033c4856006d59b3fda9bf391167 (patch) | |
| tree | fd78f71d66b8a062fca26579343ea8388f98615c /usr/local | |
| parent | 61dda8f7e7fbe6f6ae2c03d9a16f5214f9cb3cf5 (diff) | |
| download | pfsense-872d919581ec033c4856006d59b3fda9bf391167.zip pfsense-872d919581ec033c4856006d59b3fda9bf391167.tar.gz | |
Correctly validate required input fields for OpenVPN screens.
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/vpn_openvpn_client.php | 11 | ||||
| -rw-r--r-- | usr/local/www/vpn_openvpn_csc.php | 4 | ||||
| -rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 11 |
3 files changed, 16 insertions, 10 deletions
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php index 3b2a62e..b1a6be8 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -148,13 +148,16 @@ if ($_POST) { $input_errors[] = "The field 'Shared Key' does not appear to be valid"; if ($pconfig['auth_method'] == 'shared_key') { - $reqfields[] = 'shared_key'; - $reqfieldsn[] = 'Shared key'; + $reqdfields = array('shared_key'); + $reqdfieldsn = array('Shared key'); } else { - $reqfields[] = explode(" ", "caref certref"); - $reqfieldsn[] = explode(",", "Certificate Authority,Certificate");; + $reqdfields = explode(" ", "caref certref"); + $reqdfieldsn = explode(",", "Certificate Authority,Certificate");; } + $reqdfields[] = 'tunnel_network'; + $reqdfieldsn[] = 'Tunnel network'; + do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); if (!$input_errors) { diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php index 1469d4e..d016005 100644 --- a/usr/local/www/vpn_openvpn_csc.php +++ b/usr/local/www/vpn_openvpn_csc.php @@ -158,8 +158,8 @@ if ($_POST) { $input_errors[] = "The field 'NetBIOS Data Distribution Server #1' must contain a valid IP address"; } - $reqfields[] = 'common_name'; - $reqfieldsn[] = 'Common name'; + $reqdfields[] = 'common_name'; + $reqdfieldsn[] = 'Common name'; do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index 6cd2ad7..6de3ab4 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -206,13 +206,16 @@ if ($_POST) { $input_errors[] = "The field 'Concurrent connections' must be numeric."; if ($pconfig['auth_method'] == 'shared_key') { - $reqfields[] = 'shared_key'; - $reqfieldsn[] = 'Shared key'; + $reqdfields = array('shared_key'); + $reqfieldsn = array('Shared key'); } else { - $reqfields[] = explode(" ", "caref certref"); - $reqfieldsn[] = explode(",", "Certificate Authority,Certificate");; + $reqdfields = explode(" ", "caref certref"); + $reqdfieldsn = explode(",", "Certificate Authority,Certificate");; } + $reqdfields[] = 'tunnel_network'; + $reqdfieldsn[] = 'Tunnel network'; + do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); if (!$input_errors) { |
