Upgrade Suricata to 2.0.3 and GUI package to v2.0

1 files changed, 17 insertions, 5 deletions

diff --git a/config/suricata/suricata_libhtp_policy_engine.php b/config/suricata/suricata_libhtp_policy_engine.php
index 7e6ffd6d..248f4c74 100644
--- a/config/suricata/suricata_libhtp_policy_engine.php
+++ b/config/suricata/suricata_libhtp_policy_engine.php
@@ -60,12 +60,14 @@
 	resp_body_limit --> Response Body Limit size
 	enable_double_decode_path --> double-decode path part of URI
 	enable_double_decode_query --> double-decode query string part of URI
+	enable_uri_include_all --> inspect all of URI
 	save_libhtp_policy --> Submit button for save operation and exit
 	cancel_libhtp_policy --> Submit button to cancel operation and exit
  **************************************************************************************/
 ?>
 
 <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+	<tbody>
 	<tr>
 		<td colspan="2" valign="middle" class="listtopic"><?php echo gettext("Suricata Target-Based HTTP Server Policy Configuration"); ?></td>
 	</tr>
@@ -73,7 +75,7 @@
 		<td valign="top" class="vncell"><?php echo gettext("Engine Name"); ?></td>
 		<td class="vtable">
 			<input name="policy_name" type="text" class="formfld unknown" id="policy_name" size="25" maxlength="25" 
-			value="<?=htmlspecialchars($pengcfg['name']);?>"<?php if (htmlspecialchars($pengcfg['name']) == "default") echo "readonly";?>>&nbsp;
+			value="<?=htmlspecialchars($pengcfg['name']);?>"<?php if (htmlspecialchars($pengcfg['name']) == " default") echo " readonly";?>>&nbsp;
 			<?php if (htmlspecialchars($pengcfg['name']) <> "default") 
 					echo gettext("Name or description for this engine.  (Max 25 characters)");
 				else
@@ -87,6 +89,7 @@
 		<td class="vtable">
 		<?php if ($pengcfg['name'] <> "default") : ?>
 			<table width="95%" border="0" cellpadding="2" cellspacing="0">
+				<tbody>
 				<tr>
 					<td class="vexpl"><input name="policy_bind_to" type="text" class="formfldalias" id="policy_bind_to" size="32" 
 					value="<?=htmlspecialchars($pengcfg['bind_to']);?>" title="<?=trim(filter_expand_alias($pengcfg['bind_to']));?>" autocomplete="off">&nbsp;
@@ -97,6 +100,7 @@
 				<tr>
 					<td class="vexpl" colspan="2"><?php echo gettext("This policy will apply for packets with destination addresses contained within this IP List.");?></td>
 				</tr>
+				</tbody>
 			</table>
 			<br/><span class="red"><strong><?php echo gettext("Note: ") . "</strong></span>" . gettext("Supplied value must be a pre-configured Alias or the keyword 'all'.");?>
 		<?php else : ?>
@@ -112,7 +116,7 @@
 		<td width="78%" class="vtable">
 			<select name="personality" class="formselect" id="personality">
 			<?php
-			$profile = array( 'Apache', 'Apache_2_2', 'Generic', 'IDS', 'IIS_4_0', 'IIS_5_0', 'IIS_5_1', 'IIS_6_0', 'IIS_7_0', 'IIS_7_5', 'Minimal' );
+			$profile = array( 'Apache_2', 'Generic', 'IDS', 'IIS_4_0', 'IIS_5_0', 'IIS_5_1', 'IIS_6_0', 'IIS_7_0', 'IIS_7_5', 'Minimal' );
 			foreach ($profile as $val): ?>
 			<option value="<?=$val;?>" 
 			<?php if ($val == $pengcfg['personality']) echo "selected"; ?>>
@@ -120,7 +124,7 @@
 				<?php endforeach; ?>
 			</select>&nbsp;&nbsp;<?php echo gettext("Choose the web server personality appropriate for the protected hosts.  The default is ") . 
 			"<strong>" . gettext("IDS") . "</strong>"; ?>.<br/><br/>
-			<?php echo gettext("Available web server personality targets are:  Apache, Apache 2.2, Generic, IDS (default), IIS_4_0, IIS_5_0, IIS_5_1, IIS_6_0, IIS_7_0, IIS_7_5 and Minimal."); ?><br/>
+			<?php echo gettext("Available web server personality targets are:  Apache 2, Generic, IDS (default), IIS_4_0, IIS_5_0, IIS_5_1, IIS_6_0, IIS_7_0, IIS_7_5 and Minimal."); ?><br/>
 		</td>
 	</tr>
 	<tr>
@@ -155,15 +159,22 @@
 	</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncell"><?php echo gettext("Double-Decode Path"); ?></td>
-		<td width="78%" class="vtable"><input name="enable_double_decode_path" type="checkbox" value="yes" <?php if ($pengcfg['double-decode-path'] == "yes") echo "checked"; ?>>
+		<td width="78%" class="vtable"><input name="enable_double_decode_path" type="checkbox" value="yes" <?php if ($pengcfg['double-decode-path'] == "yes") echo " checked"; ?>>
 			<?php echo gettext("Suricata will double-decode path section of the URI.  Default is ") . "<strong>" . gettext("Not Checked") . "</strong>."; ?></td>
 	</tr>
 	<tr>
 		<td width="22%" valign="top" class="vncell"><?php echo gettext("Double-Decode Query"); ?></td>
-		<td width="78%" class="vtable"><input name="enable_double_decode_query" type="checkbox" value="yes" <?php if ($pengcfg['double-decode-query'] == "yes") echo "checked"; ?>>
+		<td width="78%" class="vtable"><input name="enable_double_decode_query" type="checkbox" value="yes" <?php if ($pengcfg['double-decode-query'] == "yes") echo " checked"; ?>>
 			<?php echo gettext("Suricata will double-decode query string section of the URI.  Default is ") . "<strong>" . gettext("Not Checked") . "</strong>."; ?></td>
 	</tr>
 	<tr>
+		<td width="22%" valign="top" class="vncell"><?php echo gettext("URI Include-All"); ?></td>
+		<td width="78%" class="vtable"><input name="enable_uri_include_all" type="checkbox" value="yes" <?php if ($pengcfg['uri-include-all'] == "yes") echo " checked"; ?>>
+			<?php echo gettext("Include all parts of the URI.  Default is ") . "<strong>" . gettext("Not Checked") . "</strong>."; ?><br/><br/>
+			<?php echo gettext("By default the 'scheme', username/password, hostname and port are excluded from inspection.  Enabling this option " . 
+			"adds all of them to the normalized uri.  This was the default in Suricata versions prior to 2.0."); ?></td>
+	</tr>
+	<tr>
 		<td width="22%" valign="bottom">&nbsp;</td>
 		<td width="78%" valign="bottom">
 			<input name="save_libhtp_policy" id="save_libhtp_policy" type="submit" class="formbtn" value=" Save " title="<?php echo 
@@ -172,6 +183,7 @@
 			<input name="cancel_libhtp_policy" id="cancel_libhtp_policy" type="submit" class="formbtn" value="Cancel" title="<?php echo 
 			gettext("Cancel changes and return to App Parsers tab"); ?>"></td>
 	</tr>
+	</tbody>
 </table>
 
 <script type="text/javascript" src="/javascript/autosuggest.js">