diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-10 15:37:38 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-10 15:37:38 -0400 |
| commit | 7bde87a1a8f4ab631a3a3f8e0907b80f28fa6a5b (patch) | |
| tree | 728f981081527ae67d57790e11b3e2dabdd6de11 | |
| parent | 46998b31ae1a4c3c01ef2fe4f14696f12ace5308 (diff) | |
| download | pfsense-packages-7bde87a1a8f4ab631a3a3f8e0907b80f28fa6a5b.tar.gz pfsense-packages-7bde87a1a8f4ab631a3a3f8e0907b80f28fa6a5b.tar.bz2 pfsense-packages-7bde87a1a8f4ab631a3a3f8e0907b80f28fa6a5b.zip | |
Scrub CR/LF sequences that may come from copy-paste and replace with LF.
| -rw-r--r-- | config/snort/snort_barnyard.php | 2 | ||||
| -rw-r--r-- | config/snort/snort_interfaces_suppress_edit.php | 2 | ||||
| -rwxr-xr-x | config/snort/snort_rules.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php index 6d5fef75..ab77fa58 100644 --- a/config/snort/snort_barnyard.php +++ b/config/snort/snort_barnyard.php @@ -167,7 +167,7 @@ if ($_POST['save']) { if ($_POST['barnyard_syslog_priority']) $natent['barnyard_syslog_priority'] = $_POST['barnyard_syslog_priority']; else $natent['barnyard_syslog_priority'] = 'LOG_INFO'; if ($_POST['barnyard_bro_ids_rhost']) $natent['barnyard_bro_ids_rhost'] = $_POST['barnyard_bro_ids_rhost']; else unset($natent['barnyard_bro_ids_rhost']); if ($_POST['barnyard_bro_ids_dport']) $natent['barnyard_bro_ids_dport'] = $_POST['barnyard_bro_ids_dport']; else $natent['barnyard_bro_ids_dport'] = '47760'; - if ($_POST['barnconfigpassthru']) $natent['barnconfigpassthru'] = base64_encode($_POST['barnconfigpassthru']); else unset($natent['barnconfigpassthru']); + if ($_POST['barnconfigpassthru']) $natent['barnconfigpassthru'] = base64_encode(str_replace("\r\n", "\n", $_POST['barnconfigpassthru'])); else unset($natent['barnconfigpassthru']); $a_nat[$id] = $natent; write_config("Snort pkg: modified Barnyard2 settings."); diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php index 9f910b55..becfdcd7 100644 --- a/config/snort/snort_interfaces_suppress_edit.php +++ b/config/snort/snort_interfaces_suppress_edit.php @@ -121,7 +121,7 @@ if ($_POST['save']) { $s_list['descr'] = mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto"); if ($_POST['suppresspassthru']) { $s_list['suppresspassthru'] = str_replace("​", "", $s_list['suppresspassthru']); - $s_list['suppresspassthru'] = base64_encode($_POST['suppresspassthru']); + $s_list['suppresspassthru'] = base64_encode(str_replace("\r\n", "\n", $_POST['suppresspassthru'])); } if (isset($id) && $a_suppress[$id]) diff --git a/config/snort/snort_rules.php b/config/snort/snort_rules.php index 013b7d84..a459b293 100755 --- a/config/snort/snort_rules.php +++ b/config/snort/snort_rules.php @@ -389,7 +389,7 @@ elseif ($_POST['clear']) { elseif ($_POST['save']) { $pconfig['customrules'] = $_POST['customrules']; if ($_POST['customrules']) - $a_rule[$id]['customrules'] = base64_encode($_POST['customrules']); + $a_rule[$id]['customrules'] = base64_encode(str_replace("\r\n", "\n", $_POST['customrules'])); else unset($a_rule[$id]['customrules']); write_config("Snort pkg: save modified custom rules for {$a_rule[$id]['interface']}."); |