From c352ca07b4fbffc3efe846530bd4ae0a40cb6e0d Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 1 Oct 2015 10:37:20 -0400
Subject: Work around a potential XSS in snort_ip_list_mgmt.php, small version
 bump for snort.

---
 config/snort/snort.xml              | 2 +-
 config/snort/snort_ip_list_mgmt.php | 6 +++---
 pkg_config.10.xml                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 18e6ef20..612fbaa8 100755
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -45,7 +45,7 @@
 	</copyright>
 	<description>Snort IDS/IPS Package</description>
 	<name>Snort</name>
-	<version>3.2.8</version>
+	<version>3.2.8.1</version>
 	<title>Services: Snort IDS</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
diff --git a/config/snort/snort_ip_list_mgmt.php b/config/snort/snort_ip_list_mgmt.php
index 20d486c6..1ff25bd5 100644
--- a/config/snort/snort_ip_list_mgmt.php
+++ b/config/snort/snort_ip_list_mgmt.php
@@ -208,15 +208,15 @@ if ($savemsg)
 			</thead>
 		<?php foreach ($ipfiles as $file): ?>
 			<tr>
-				<td class="listr"><?php echo gettext($file); ?></td>
+				<td class="listr"><?php echo htmlspecialchars(gettext($file)); ?></td>
 				<td class="listr"><?=date('M-d Y g:i a', filemtime("{$iprep_path}{$file}")); ?></td>
 				<td class="listr"><?=format_bytes(filesize("{$iprep_path}{$file}")); ?> </td>
 				<td class="list"><input type="image" name="iplist_edit[]" id="iplist_edit[]" 
-				onClick="document.getElementById('iplist_fname').value='<?=$file;?>';" 
+				onClick="document.getElementById('iplist_fname').value='<?=addslashes($file);?>';"
 				src="../themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" 
 				height="17" border="0" title="<?php echo gettext('Edit this IP List');?>"/>
 				<input type="image" name="iplist_delete[]" id="iplist_delete[]" 
-				onClick="document.getElementById('iplist_fname').value='<?=$file;?>'; 
+				onClick="document.getElementById('iplist_fname').value='<?=addslashes($file);?>';
 				return confirm('<?=gettext("Are you sure you want to permanently delete this IP List file?  Click OK to continue or CANCEL to quit.");?>');" 
 				src="../themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" 
 				height="17" border="0" title="<?php echo gettext('Delete this IP List');?>"/></td>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 921820fb..c167689c 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -395,7 +395,7 @@
 		</build_pbi>
 		<build_options>barnyard2_UNSET_FORCE=ODBC PGSQL PRELUDE;barnyard2_SET_FORCE=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET_FORCE=BARNYARD PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;snort_UNSET_FORCE=PULLEDPORK FILEINSPECT HA</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file>
-		<version>3.2.8</version>
+		<version>3.2.8.1</version>
 		<required_version>2.2</required_version>
 		<status>Stable</status>
 		<configurationfile>/snort.xml</configurationfile>
-- 
cgit v1.2.3