From 383855dded0adff81d0ac8bfd9762426bce33839 Mon Sep 17 00:00:00 2001 From: Renaud Holcombe Date: Sat, 15 Jul 2017 18:12:33 -0400 Subject: [PATCH] Add logic to handle password field behavior. --- .../files/usr/local/www/snort/snort_barnyard.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_barnyard.php b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_barnyard.php index 6942e29a98df..cd2e5a5b457a 100644 --- a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_barnyard.php +++ b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_barnyard.php @@ -178,7 +178,14 @@ if ($_POST['barnyard_dbhost']) $natent['barnyard_dbhost'] = $_POST['barnyard_dbhost']; else unset($natent['barnyard_dbhost']); if ($_POST['barnyard_dbname']) $natent['barnyard_dbname'] = $_POST['barnyard_dbname']; else unset($natent['barnyard_dbname']); if ($_POST['barnyard_dbuser']) $natent['barnyard_dbuser'] = $_POST['barnyard_dbuser']; else unset($natent['barnyard_dbuser']); - if ($_POST['barnyard_dbpwd']) $natent['barnyard_dbpwd'] = base64_encode($_POST['barnyard_dbpwd']); else unset($natent['barnyard_dbpwd']); + + // The password field will return '********' if no changes are made and needs to be escaped. + if ($_POST['barnyard_dbpwd'] && ($_POST['barnyard_dbpwd'] != DMYPWD)) $natent['barnyard_dbpwd'] = base64_encode($_POST['barnyard_dbpwd']); + else + // Because of the base64 encoding/decoding, in the case of a valid value that hasn't changed, it needs to be re-encoded to base64. + if ($_POST['barnyard_dbpwd'] != DMYPWD) unset($natent['barnyard_dbpwd']); + else $natent['barnyard_dbpwd'] = base64_encode($natent['barnyard_dbpwd']); + if ($_POST['barnyard_syslog_rhost']) $natent['barnyard_syslog_rhost'] = $_POST['barnyard_syslog_rhost']; else unset($natent['barnyard_syslog_rhost']); if ($_POST['barnyard_syslog_dport']) $natent['barnyard_syslog_dport'] = $_POST['barnyard_syslog_dport']; else $natent['barnyard_syslog_dport'] = '514'; if ($_POST['barnyard_syslog_facility']) $natent['barnyard_syslog_facility'] = $_POST['barnyard_syslog_facility']; else $natent['barnyard_syslog_facility'] = 'LOG_USER';