diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index a74fa4632..173ea37b8 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -250,7 +250,7 @@ function session_auth() if (isset($_COOKIE[session_name()])) { $secure = $config['system']['webgui']['protocol'] == "https"; - setcookie(session_name(), '', time() - 42000, '/', null, $secure, true); + setcookie(session_name(), '', time() - 42000, '/', '', $secure, true); } /* and destroy it */ @@ -352,7 +352,7 @@ function display_login_form($Login_Error) $themename = htmlspecialchars(get_current_theme()); $product = product::getInstance(); - setcookie("cookie_test", bin2hex(random_bytes(16)), time() + 3600, '/', null, $config['system']['webgui']['protocol'] == "https", true); + setcookie("cookie_test", bin2hex(random_bytes(16)), time() + 3600, '/', '', $config['system']['webgui']['protocol'] == "https", true); $have_cookies = isset($_COOKIE["cookie_test"]); ?> diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php index 6df04a690..243830b4a 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php @@ -281,11 +281,11 @@ abstract class Rule } if (isset($rule['protocol']) && in_array(strtolower($rule['protocol']), array("tcp","udp","tcp/udp"))) { $port = !empty($rule[$tag]['port']) ? str_replace('-', ':', $rule[$tag]['port']) : null; - if (strpos($port, ':any') !== false xor strpos($port, 'any:') !== false) { + if ($port == null || $port == 'any') { + $port = null; + } elseif (strpos($port, ':any') !== false xor strpos($port, 'any:') !== false) { // convert 'any' to upper or lower bound when provided in range. e.g. 80:any --> 80:65535 $port = str_replace('any', strpos($port, ':any') !== false ? '65535' : '1', $port); - } elseif ($port == 'any') { - $port = null; } if (Util::isPort($port)) { $rule[$target . "_port"] = $port; diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php index c6a8b52ee..a1ac6a69d 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php @@ -252,7 +252,7 @@ class Util */ public static function isPort($number, $allow_range = true) { - $tmp = explode(':', $number); + $tmp = $number !== null ? explode(':', $number) : []; foreach ($tmp as $port) { if ( (filter_var($port, FILTER_VALIDATE_INT, array( diff --git a/src/www/csrf.inc b/src/www/csrf.inc index afc0e7da8..712ee06e0 100644 --- a/src/www/csrf.inc +++ b/src/www/csrf.inc @@ -48,7 +48,7 @@ class LegacyCSRF ); session_start(); $secure = $config['system']['webgui']['protocol'] == 'https'; - setcookie(session_name(), session_id(), null, '/', null, $secure, true); + setcookie(session_name(), session_id(), 0, '/', '', $secure, true); } ob_start(array($this,'csrfRewriteHandler'), 5242880); }