mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
MFC 8805
Fix protocol checking so that existing input validation works use endport as startport if specified w/out startport
This commit is contained in:
parent
fd6135414d
commit
aa3400b8fb
@ -75,14 +75,17 @@ if ($_POST) {
|
||||
|
||||
if (!$_POST['endport'])
|
||||
$_POST['endport'] = $_POST['beginport'];
|
||||
/* Make beginning port end port if not defined and endport is */
|
||||
if (!$_POST['beginport'] && $_POST['endport'])
|
||||
$_POST['beginport'] = $_POST['endport'];
|
||||
|
||||
unset($input_errors);
|
||||
$pconfig = $_POST;
|
||||
|
||||
/* input validation */
|
||||
if($_POST['proto'] == "TCP" or $_POST['proto'] == "UDP" or $_POST['proto'] == "TCP/UDP") {
|
||||
if(strtoupper($_POST['proto']) == "TCP" or strtoupper($_POST['proto']) == "UDP" or strtoupper($_POST['proto']) == "TCP/UDP") {
|
||||
$reqdfields = explode(" ", "interface proto beginport localip localbeginport");
|
||||
$reqdfieldsn = explode(",", "Interface,Protocol,Start port,NAT IP,Local port");
|
||||
$reqdfieldsn = explode(",", "Interface,Protocol,Ext. start port,NAT IP,Local port");
|
||||
} else {
|
||||
$reqdfields = explode(" ", "interface proto localip");
|
||||
$reqdfieldsn = explode(",", "Interface,Protocol,NAT IP");
|
||||
@ -95,7 +98,7 @@ if ($_POST) {
|
||||
}
|
||||
|
||||
/* only validate the ports if the protocol is TCP, UDP or TCP/UDP */
|
||||
if($_POST['proto'] == "TCP" or $_POST['proto'] == "UDP" or $_POST['proto'] == "TCP/UDP") {
|
||||
if(strtoupper($_POST['proto']) == "TCP" or strtoupper($_POST['proto']) == "UDP" or strtoupper($_POST['proto']) == "TCP/UDP") {
|
||||
|
||||
if (($_POST['beginport'] && !is_ipaddroralias($_POST['beginport']) && !is_port($_POST['beginport']))) {
|
||||
$input_errors[] = "The start port must be an integer between 1 and 65535.";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user