diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-10-14 12:41:22 -0500 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-10-14 12:41:22 -0500 |
| commit | 69b79ff061d8b136229f6e929f195340b30abab7 (patch) | |
| tree | b382976dfe14cdf9d96cdf48959597728e6ec9de /usr | |
| parent | 5a42d9ef426a05cbd64559bbe2b75a355dc0d821 (diff) | |
| download | pfsense-69b79ff061d8b136229f6e929f195340b30abab7.zip pfsense-69b79ff061d8b136229f6e929f195340b30abab7.tar.gz | |
Fix PSK for non-ascii also here, ticket #3917
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index 4d61715..6c22f71 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -171,6 +171,7 @@ if ($_POST) { case "xauth_psk_server": $reqdfields = explode(" ", "pskey"); $reqdfieldsn = array(gettext("Pre-Shared Key")); + $validate_pskey = true; break; case "hybrid_rsa_server": case "xauth_rsa_server": @@ -186,6 +187,11 @@ if ($_POST) { do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors); + if (isset($validate_pskey) && isset($pconfig['pskey']) && !preg_match('/^[[:ascii:]]*$/', $pconfig['pskey'])) { + unset($validate_pskey); + $input_errors[] = gettext("Pre-Shared Key contains invalid characters."); + } + if (($pconfig['lifetime'] && !is_numeric($pconfig['lifetime']))) $input_errors[] = gettext("The P1 lifetime must be an integer."); |
