Some bug fixes and replace $_GET with $_POST in parameter passing.

1 files changed, 32 insertions, 154 deletions

diff --git a/config/suricata/suricata_os_policy_engine.php b/config/suricata/suricata_os_policy_engine.php
index ae5a9348..ea539e92 100644
--- a/config/suricata/suricata_os_policy_engine.php
+++ b/config/suricata/suricata_os_policy_engine.php
@@ -26,157 +26,41 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once("guiconfig.inc");
-require_once("/usr/local/pkg/suricata/suricata.inc");
-
-global $g;
-
-// Grab the incoming QUERY STRING or POST variables
-$id = $_GET['id'];
-$eng_id = $_GET['eng_id'];
-if (isset($_POST['id']))
-	$id = $_POST['id'];
-if (isset($_POST['eng_id']))
-	$eng_id = $_POST['eng_id'];
-
-if (is_null($id)) {
- 	header("Location: /suricata/suricata_interfaces.php");
-	exit;
-}
-if (is_null($eng_id)) {
-	header("Location: /suricata/suricata_flow_stream.php?id={$id}");
-	exit;
-}
-
-if (!is_array($config['installedpackages']['suricata']['rule']))
-	$config['installedpackages']['suricata']['rule'] = array();
-if (!is_array($config['installedpackages']['suricata']['rule'][$id]['host_os_policy']['item']))
-	$config['installedpackages']['suricata']['rule'][$id]['host_os_policy']['item'] = array();
-$a_nat = &$config['installedpackages']['suricata']['rule'][$id]['host_os_policy']['item'];
-
-$pconfig = array();
-if (empty($a_nat[$eng_id])) {
-	$def = array( "name" => "engine_{$eng_id}", "bind_to" => "", "policy" => "bsd" );
-	// See if this is initial entry and set to "default" if true
-	if ($eng_id < 1) {
-		$def['name'] = "default";
-		$def['bind_to'] = "all";
-	}
-	$pconfig = $def;
-}
-else {
-	$pconfig = $a_nat[$eng_id];
-
-	// Check for any empty values and set sensible defaults
-	if (empty($pconfig['policy']))
-		$pconfig['policy'] = "bsd";
-}
-
-if ($_POST['cancel']) {
-	header("Location: /suricata/suricata_flow_stream.php?id={$id}");
-	exit;
-}
-
-// Check for returned "selected alias" if action is import
-if ($_GET['act'] == "import") {
-	if ($_GET['varname'] == "bind_to" && !empty($_GET['varvalue']))
-		$pconfig[$_GET['varname']] = $_GET['varvalue'];
-}
-
-if ($_POST['save']) {
-
-	/* Grab all the POST values and save in new temp array */
-	$engine = array();
-	if ($_POST['policy_name']) { $engine['name'] = trim($_POST['policy_name']); } else { $engine['name'] = "default"; }
-	if ($_POST['policy_bind_to']) {
-		if (is_alias($_POST['policy_bind_to']))
-			$engine['bind_to'] = $_POST['policy_bind_to'];
-		elseif (strtolower(trim($_POST['policy_bind_to'])) == "all")
-			$engine['bind_to'] = "all";
-		else
-			$input_errors[] = gettext("You must provide a valid Alias or the reserved keyword 'all' for the 'Bind-To IP Address' value.");
-	}
-	else {
-		$input_errors[] = gettext("The 'Bind-To IP Address' value cannot be blank.  Provide a valid Alias or the reserved keyword 'all'.");
-	}
-
-	if ($_POST['policy']) { $engine['policy'] = $_POST['policy']; } else { $engine['policy'] = "bsd"; }
-
-	/* Can only have one "all" Bind_To address */
-	if ($engine['bind_to'] == "all" && $engine['name'] <> "default") {
-		$input_errors[] = gettext("Only one default OS-Policy Engine can be bound to all addresses.");
-		$pconfig = $engine;
-	}
-
-	/* if no errors, write new entry to conf */
-	if (!$input_errors) {
-		if (isset($eng_id) && $a_nat[$eng_id]) {
-			$a_nat[$eng_id] = $engine;
-		}
-		else
-			$a_nat[] = $engine;
-
-		/* Reorder the engine array to ensure the */
-		/* 'bind_to=all' entry is at the bottom   */
-		/* if it contains more than one entry.    */
-		if (count($a_nat) > 1) {
-			$i = -1;
-			foreach ($a_nat as $f => $v) {
-				if ($v['bind_to'] == "all") {
-					$i = $f;
-					break;
-				}
-			}
-			/* Only relocate the entry if we  */
-			/* found it, and it's not already */
-			/* at the end.                    */
-			if ($i > -1 && ($i < (count($a_nat) - 1))) {
-				$tmp = $a_nat[$i];
-				unset($a_nat[$i]);
-				$a_nat[] = $tmp;
-			}
-		}
-
-		/* Now write the new engine array to conf */
-		write_config();
-
-		header("Location: /suricata/suricata_flow_stream.php?id={$id}");
-		exit;
-	}
-}
-
-$if_friendly = convert_friendly_interface_to_friendly_descr($config['installedpackages']['suricata']['rule'][$id]['interface']);
-$pgtitle = gettext("Suricata: Interface {$if_friendly} Operating System Policy Engine");
-include_once("head.inc");
-
+/**************************************************************************************
+	This file contains code for adding/editing an existing Host OS Policy Engine.
+	It is included and injected inline as needed into the suricata_stream_flow.php
+	page to provide the edit functionality for Host OS Policy Engines.
+
+	The following variables are assumed to exist and must be initialized
+	as necessary in order to utilize this page.
+
+	$g --> system global variables array
+	$config --> global variable pointing to configuration information
+	$pengcfg --> array containing current Host OS Policy engine configuration
+
+	Information is returned from this page via the following form fields:
+
+	policy_name --> Unique Name for the Host OS Policy Engine
+	policy_bind_to --> Alias name representing "bind_to" IP address for engine
+	policy --> Operating system chosen for engine policy
+	select_alias --> Submit button for select alias operation
+	save_os_policy --> Submit button for save operation and exit
+	cancel_os_policy --> Submit button to cancel operation and exit
+ **************************************************************************************/
 ?>
 
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC" >
-
-<?php
-include("fbegin.inc");
-if ($input_errors) print_input_errors($input_errors);
-if ($savemsg)
-	print_info_box($savemsg);
-?>
-
-<form action="suricata_os_policy_engine.php" method="post" name="iform" id="iform">
-<input name="id" type="hidden" value="<?=$id?>">
-<input name="eng_id" type="hidden" value="<?=$eng_id?>">
-<div id="boxarea">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
 <td class="tabcont">
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
 	<tr>
-		<td colspan="2" valign="middle" class="listtopic"><?php echo gettext("Suricata Target-Based OS Policy Engine Configuration"); ?></td>
+		<td colspan="2" align="center" class="listtopic"><?php echo gettext("Suricata Target-Based Host OS Policy Engine Configuration"); ?></td>
 	</tr>
 	<tr>
-		<td valign="top" class="vncell"><?php echo gettext("Engine Name"); ?></td>
+		<td valign="top" class="vncell"><?php echo gettext("Policy Name"); ?></td>
 		<td class="vtable">
 			<input name="policy_name" type="text" class="formfld unknown" id="policy_name" size="25" maxlength="25" 
-			value="<?=htmlspecialchars($pconfig['name']);?>"<?php if (htmlspecialchars($pconfig['name']) == "default") echo "readonly";?>>&nbsp;
-			<?php if (htmlspecialchars($pconfig['name']) <> "default") 
+			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
 					echo "<span class=\"red\">" . gettext("The name for the 'default' engine is read-only.") . "</span>";?><br/>
@@ -187,13 +71,13 @@ if ($savemsg)
 	<tr>
 		<td valign="top" class="vncell"><?php echo gettext("Bind-To IP Address Alias"); ?></td>
 		<td class="vtable">
-		<?php if ($pconfig['name'] <> "default") : ?>
+		<?php if ($pengcfg['name'] <> "default") : ?>
 			<table width="95%" border="0" cellpadding="2" cellspacing="0">
 				<tr>
 					<td class="vexpl"><input name="policy_bind_to" type="text" class="formfldalias" id="policy_bind_to" size="32" 
-					value="<?=htmlspecialchars($pconfig['bind_to']);?>" title="<?=trim(filter_expand_alias($pconfig['bind_to']));?>" autocomplete="off">&nbsp;
+					value="<?=htmlspecialchars($pengcfg['bind_to']);?>" title="<?=trim(filter_expand_alias($pengcfg['bind_to']));?>" autocomplete="off"/>&nbsp;
 					<?php echo gettext("IP List to bind this engine to. (Cannot be blank)"); ?></td>
-					<td class="vexpl" align="right"><input type="button" class="formbtns" value="Aliases" onclick="parent.location='suricata_select_alias.php?id=<?=$id;?>&eng_id=<?=$eng_id;?>&type=host|network&varname=bind_to&act=import&multi_ip=yes&returl=<?=urlencode($_SERVER['PHP_SELF']);?>'" 
+					<td class="vexpl" align="right"><input type="submit" class="formbtns" name="select_alias" value="Aliases" 
 					title="<?php echo gettext("Select an existing IP alias");?>"/></td>
 				</tr>
 				<tr>
@@ -204,7 +88,7 @@ if ($savemsg)
 			&nbsp;&nbsp;&nbsp;&nbsp;
 		<?php else : ?>
 			<input name="policy_bind_to" type="text" class="formfldalias" id="policy_bind_to" size="32" 
-			value="<?=htmlspecialchars($pconfig['bind_to']);?>" autocomplete="off" readonly>&nbsp;
+			value="<?=htmlspecialchars($pengcfg['bind_to']);?>" autocomplete="off" readonly>&nbsp;
 			<?php echo "<span class=\"red\">" . gettext("IP List for the default engine is read-only and must be 'all'.") . "</span>";?><br/>
 			<?php echo gettext("The default engine is required and will apply for packets with destination addresses not matching other engine IP Lists.");?><br/>
 		<?php endif ?>
@@ -218,7 +102,7 @@ if ($savemsg)
 			$profile = array( 'BSD', 'BSD-Right', 'HPUX10', 'HPUX11', 'Irix', 'Linux', 'Mac-OS', 'Old-Linux', 'Old-Solaris', 'Solaris', 'Vista', 'Windows', 'Windows2k3' );
 			foreach ($profile as $val): ?>
 			<option value="<?=strtolower($val);?>" 
-			<?php if (strtolower($val) == $pconfig['policy']) echo "selected"; ?>>
+			<?php if (strtolower($val) == $pengcfg['policy']) echo "selected"; ?>>
 				<?=gettext($val);?></option>
 				<?php endforeach; ?>
 			</select>&nbsp;&nbsp;<?php echo gettext("Choose the OS target policy appropriate for the protected hosts.  The default is ") . 
@@ -229,20 +113,15 @@ if ($savemsg)
 	<tr>
 		<td width="22%" valign="bottom">&nbsp;</td>
 		<td width="78%" valign="bottom">
-			<input name="save" id="save" type="submit" class="formbtn" value=" Save " title="<?php echo 
+			<input name="save_os_policy" id="save_os_policy" type="submit" class="formbtn" value=" Save " title="<?php echo 
 			gettext("Save OS policy engine settings and return to Flow/Stream tab"); ?>">
 			&nbsp;&nbsp;&nbsp;&nbsp;
-			<input name="cancel" id="cancel" type="submit" class="formbtn" value="Cancel" title="<?php echo 
+			<input name="cancel_os_policy" id="cancel_os_policy" type="submit" class="formbtn" value="Cancel" title="<?php echo 
 			gettext("Cancel changes and return to Flow/Stream tab"); ?>"></td>
 	</tr>
 </table>
 </td>
 </tr>
-</table>
-</div>
-</form>
-<?php include("fend.inc"); ?>
-</body>
 <script type="text/javascript" src="/javascript/autosuggest.js">
 </script>
 <script type="text/javascript" src="/javascript/suggestions.js">
@@ -262,4 +141,3 @@ setTimeout("createAutoSuggest();", 500);
 
 </script>
 
-</html>