diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-07-14 00:42:07 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-07-14 00:42:07 +0000 |
| commit | b4525bfee8035d372d238aa4a252bbc0113d17cb (patch) | |
| tree | ba55655d8b4a09a6a5db8341f707b627d38d985f /usr | |
| parent | 50ff254c689683a3a3c6e0492b830bfb8a121aa1 (diff) | |
| download | pfsense-b4525bfee8035d372d238aa4a252bbc0113d17cb.zip pfsense-b4525bfee8035d372d238aa4a252bbc0113d17cb.tar.gz | |
* Add invalid characters for description input error
* Do not save the data when input_errors are set
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/vpn_openvpn_certs_create.php | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/usr/local/www/vpn_openvpn_certs_create.php b/usr/local/www/vpn_openvpn_certs_create.php index 1763652..eabaebc 100644 --- a/usr/local/www/vpn_openvpn_certs_create.php +++ b/usr/local/www/vpn_openvpn_certs_create.php @@ -63,7 +63,9 @@ if ($_GET['ca']) { } if ($_POST) { - $descr = str_replace($_POST['descr'], " ", ""); // spaces can be deadly + if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['descr'])) + $input_errors[] = "Description contains invalid characters."; + $descr = $_POST['descr']; $cakeysize = $_POST['cakeysize']; $caexpire = $_POST['caexpire']; $cakeyexpire = $_POST['cakeyexpire']; @@ -198,26 +200,28 @@ if ($_POST) { </table></td></tr> </table> <?php - execute_command_return_output("/bin/tcsh $ovpncapath/RUNME_FIRST", "r"); - conf_mount_ro(); - /* vars */ - $ovpnkeys[$caname]['existing'] = "no"; - $ovpnkeys[$caname]['descr'] = $descr; - $ovpnkeys[$caname]['auth_method'] = "pki"; - $ovpnkeys[$caname]['keysize'] = $cakeysize; - $ovpnkeys[$caname]['keyexpire'] = $cakeyexpire; - $ovpnkeys[$caname]['caexpire'] = $caexpire; - $ovpnkeys[$caname]['keycountry'] = $countrycode; - $ovpnkeys[$caname]['keyprovince'] = $stateorprovince; - $ovpnkeys[$caname]['keycity'] = $cityname; - $ovpnkeys[$caname]['keyorg'] = $orginizationname; - $ovpnkeys[$caname]['keyemail'] = $email; - /* ciphers */ - $ovpnkeys[$caname]['ca.key'] = file_get_contents("$ovpncapath/$caname/ca.key"); - $ovpnkeys[$caname]['ca.crt'] = file_get_contents("$ovpncapath/$caname/ca.crt"); + if(!$input_errors) { + execute_command_return_output("/bin/tcsh $ovpncapath/RUNME_FIRST", "r"); + conf_mount_ro(); + /* vars */ + $ovpnkeys[$caname]['existing'] = "no"; + $ovpnkeys[$caname]['descr'] = $descr; + $ovpnkeys[$caname]['auth_method'] = "pki"; + $ovpnkeys[$caname]['keysize'] = $cakeysize; + $ovpnkeys[$caname]['keyexpire'] = $cakeyexpire; + $ovpnkeys[$caname]['caexpire'] = $caexpire; + $ovpnkeys[$caname]['keycountry'] = $countrycode; + $ovpnkeys[$caname]['keyprovince'] = $stateorprovince; + $ovpnkeys[$caname]['keycity'] = $cityname; + $ovpnkeys[$caname]['keyorg'] = $orginizationname; + $ovpnkeys[$caname]['keyemail'] = $email; + /* ciphers */ + $ovpnkeys[$caname]['ca.key'] = file_get_contents("$ovpncapath/$caname/ca.key"); + $ovpnkeys[$caname]['ca.crt'] = file_get_contents("$ovpncapath/$caname/ca.crt"); - /* save it */ - write_config(); + /* save it */ + write_config(); + } } else { ?> <tr><td> <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> |
