Update Snort package to latest 2.9.6.2 binary and fix some GUI bugs.

1 files changed, 95 insertions, 1 deletions

diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php
index d524e9f3..49ab95d5 100644
--- a/config/snort/snort_migrate_config.php
+++ b/config/snort/snort_migrate_config.php
@@ -357,6 +357,100 @@ foreach ($rule as &$r) {
 		$updated_cfg = true;
 	}
 
+	// Migrate new POP3 preprocessor parameter settings
+	if (empty($pconfig['pop_memcap'])) {
+		$pconfig['pop_memcap'] = "838860";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['pop_b64_decode_depth']) && $pconfig['pop_b64_decode_depth'] != '0') {
+		$pconfig['pop_b64_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['pop_qp_decode_depth']) && $pconfig['pop_qp_decode_depth'] != '0') {
+		$pconfig['pop_qp_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['pop_bitenc_decode_depth']) && $pconfig['pop_bitenc_decode_depth'] != '0') {
+		$pconfig['pop_bitenc_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['pop_uu_decode_depth']) && $pconfig['pop_uu_decode_depth'] != '0') {
+		$pconfig['pop_uu_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+
+	// Migrate new IMAP preprocessor parameter settings
+	if (empty($pconfig['imap_memcap'])) {
+		$pconfig['imap_memcap'] = "838860";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['imap_b64_decode_depth']) && $pconfig['imap_b64_decode_depth'] != '0') {
+		$pconfig['imap_b64_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['imap_qp_decode_depth']) && $pconfig['imap_qp_decode_depth'] != '0') {
+		$pconfig['imap_qp_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['imap_bitenc_decode_depth']) && $pconfig['imap_bitenc_decode_depth'] != '0') {
+		$pconfig['imap_bitenc_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['imap_uu_decode_depth']) && $pconfig['imap_uu_decode_depth'] != '0') {
+		$pconfig['imap_uu_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+
+	// Migrate new SMTP preprocessor parameter settings
+	if (empty($pconfig['smtp_memcap'])) {
+		$pconfig['smtp_memcap'] = "838860";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_max_mime_mem'])) {
+		$pconfig['smtp_max_mime_mem'] = "838860";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_b64_decode_depth'])) {
+		$pconfig['smtp_b64_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_qp_decode_depth'])) {
+		$pconfig['smtp_qp_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_bitenc_decode_depth'])) {
+		$pconfig['smtp_bitenc_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_uu_decode_depth'])) {
+		$pconfig['smtp_uu_decode_depth'] = "0";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_email_hdrs_log_depth']) && $pconfig['smtp_email_hdrs_log_depth'] != '0') {
+		$pconfig['smtp_email_hdrs_log_depth'] = "1464";
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_ignore_tls_data'])) {
+		$pconfig['smtp_ignore_tls_data'] = 'on';
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_log_mail_from'])) {
+		$pconfig['smtp_log_mail_from'] = 'on';
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_log_rcpt_to'])) {
+		$pconfig['smtp_log_rcpt_to'] = 'on';
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_log_filename'])) {
+		$pconfig['smtp_log_filename'] = 'on';
+		$updated_cfg = true;
+	}
+	if (empty($pconfig['smtp_log_email_hdrs'])) {
+		$pconfig['smtp_log_email_hdrs'] = 'on';
+		$updated_cfg = true;
+	}
+
 	// Save the new configuration data into the $config array pointer
 	$r = $pconfig;
 }
@@ -365,7 +459,7 @@ unset($r);
 
 // Write out the new configuration to disk if we changed anything
 if ($updated_cfg) {
-	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.13";
+	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1";
 	log_error("[Snort] Saving configuration settings in new format...");
 	write_config("Snort pkg: migrate existing settings to new format as part of package upgrade.");
 	log_error("[Snort] Settings successfully migrated to new configuration format...");