X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Ffwui.php;h=63c6613b7530d6b285f391d152a7ef9d93d2e439;hp=fb9ef70262b34f57bb47ecb0438f0dda88894dad;hb=b571fcf2648a6d5a4893125cb97db4f3f73ee134;hpb=60673f4f00bab805471fcbb85c8816aebb3a9582

diff --git a/libcbfwr/fwui.php b/libcbfwr/fwui.php
index fb9ef70..63c6613 100644
--- a/libcbfwr/fwui.php
+++ b/libcbfwr/fwui.php
@@ -16,12 +16,14 @@ function CBFWZonesPage($urls)
 				$newname = $_REQUEST["zonename"];
 				
 				$renewname = null;
+				error_log("comparing \"$oldname\" to \"$newname\"");
 				if($oldname != $newname) {
 					$renewname = " rename $newname";
 				}
 				
-				$oldconf = $comms->getConfig(0);
+				$oldconf = getWebUserConfig();
 				$olddesc = $oldconf["zone"][$oldname]["description"];
+				error_log("Comparing \"$olddesc\" and \"$desc\"");
 				if($desc != $olddesc) {
 					$newdesc = " # $desc";
 				} else $newdesc = null;
@@ -31,6 +33,7 @@ function CBFWZonesPage($urls)
 				
 				if($renewname == null && $newdesc == null) {
 					header("Location: $BASE_URL/zones");
+					error_log("no changes?");
 					return;
 				}
 				
@@ -55,15 +58,8 @@ function CBFWZonesPage($urls)
 				
 			case "delete":
 				$zonetodelete = $urls[2];
-				
-				$conf = $comms->getConfig(3);
-				$changes = $conf["status"];
-				if($changes == "nochange") $conf["status"] = 1;
-				else $conf["status"] = $changes + 1;
-				$cnum = $conf["status"];
-				
-				$conf[$cnum]["delete"] = "zone $zonetodelete";
-				$comms->putConfig($conf, 3);
+
+				addWebUserChange("delete zone name $zonetodelete");
 				header("Location: $BASE_URL/zones");
 				break;
 				
@@ -71,21 +67,16 @@ function CBFWZonesPage($urls)
 			case "add":
 				
 				// UGLY
-				$cnum = 0;
 				$nametoadd = $_REQUEST["toadd"];
 				$desc = $_REQUEST["desc"];
+				
 				$descbit = "";
 				if($desc != "") $descbit = " # $desc";
 				if($nametoadd == "" || $nametoadd == null) {
 					return;
 				}
-				$conf = $comms->getConfig(3);
-				$changes = $conf["status"];
-				if($changes == "nochange") $conf["status"] = 1;
-				else $conf["status"] = $changes + 1;
-				$cnum = $conf["status"];
-				$conf[$cnum]["add"] = "zone $nametoadd$descbit";
-				$comms->putConfig($conf, 3);
+				
+				addWebUserChange("zone name $nametoadd $descbit");
 				header("Location: $BASE_URL/zones");
 				break;
 				
@@ -104,12 +95,7 @@ function CBFWZonesEditPage($urls)
 	
 	$zone = $urls[2];
 	
-	$comms = new Comms();
-	$myconf = new Config();
-	
-	$config = $comms->getConfig();
-	$conf2 = $comms->getConfig(3);
-	$config = $myconf->mergeConfig($config, $conf2);
+	$config = getWebUserConfig();
 	
 	
 	echo "<h2>Edit Zone $zone</h2>";
@@ -124,16 +110,67 @@ function CBFWZonesEditPage($urls)
 	echo "</form>";
 }
 
-function CBFWZonesPageDisplay()
+function addWebUserChange($change)
 {
-	global $BASE_URL, $MENU_ITEMS;
+	$comms = new Comms();
+	$myconf = new Config();
 	
+	$conf = $comms->getConfig(3);
+	
+	if(!isset($conf["status"])) {
+		$conf["status"] = "nochange";
+	}
+	
+	$changes = $conf["status"];
+	if($changes == "nochange") $conf["status"] = 1;
+	else $conf["status"] = $changes + 1;
+	$cnum = $conf["status"];
+	
+	$conf["changes"][$cnum] = "$change";
+	$comms->putConfig($conf, 3);
+	
+}
+
+// TODO: we need to really sit and think about this one
+function getWebUserConfig()
+{
 	$comms = new Comms();
 	$myconf = new Config();
 	
-	$config = $comms->getConfig();
+	
+	// check to see if pre-cache config matches change level of config change buffer
+	$config = $comms->getConfig(5);
 	$conf2 = $comms->getConfig(3);
-	$config = $myconf->mergeConfig($config, $conf2);
+	if(isset($config["status"])) {
+		if($config["status"] == $conf2["status"]) {
+			// it did, return the pre-cache
+			error_log("got pre-cache config");
+			return $config;
+		}
+	}
+	
+	// it did not, do a new merge and cache
+	// TODO: need to do this part
+	$config = $comms->getConfig();
+	$reconfig = $config;
+	$myconf->setConfig($config);
+	if(isset($conf2["changes"])) foreach($conf2["changes"] as $key => $var) {
+		error_log("Adding config line $key, $var");
+		$myconf->addConfigLine($var);
+	}
+	$reconfig = $myconf->getConfig();
+	$reconfig["status"] = $conf2["status"];
+	error_log("put pre-cache config");
+	$comms->putConfig($reconfig, 5);	
+	
+	return $reconfig;
+}
+
+function CBFWZonesPageDisplay()
+{
+	global $BASE_URL, $MENU_ITEMS;
+	
+	$config = getWebUserConfig();
 
 	echo "<h2>Zones</h2>";
 	echo "<table border=\"1\"><tr><th>Zone</th><th>Interfaces</th><th>Description</th><th>Edit</th></tr>";
@@ -314,11 +351,123 @@ function CBFWInterfacesPageDisplay()
 	echo "</table>";
 }
 
-function CBFWObjectsPage()
+function CBFWObjectsPage($urls)
 {
 	$comms = new Comms();
 	
 	$config = $comms->getConfig();
+	
+	CBFWpageBuilder(null, "CBFWObjectsDisplay");
+}
+
+function CBFWObjectsDisplay()
+{
+	global $BASE_URL, $MENU_ITEMS;
+	$config = getWebUserConfig();
+	
+	echo "<h2>Objects</h2>";
+	
+	if(isset($config["objects"])) {
+		echo "<table>";
+		echo "<tr><th>Networks</th><th>Hosts</th><th>Services</th><th>Network Groups</th><th>Host Groups</th><th>Service Groups</th></tr>";
+		echo "</table>";
+		foreach($config["objects"] as $key => $var) {
+		}
+	} else {
+		echo "No objects set\n";
+	}
+	
+	echo "<hr>";
+	echo "<table cellpadding=\"20\"><tr valign=\"top\">";
+	echo "<td>";
+	echo "<h3>Create Network</h3><br>";
+	echo "<form method=\"post\" action=\"$BASE_URL/objects/network/create\">";
+	echo "Name <input type=\"text\" name=\"objname\"><br>";
+	echo "IPv4 <input type=\"text\" name=\"addr4\">/<input type=\"text\" name=\"mask4\" maxlength=\"3\" size=\"3\"><br>";
+	echo "IPv6 <input type=\"text\" name=\"addr6\">/<input type=\"text\" name=\"mask6\" maxlength=\"3\" size=\"3\"><br>";
+	echo "<input type=\"submit\" name=\"add\" value=\"Add\">";
+	echo "</form>";
+	echo "</td>";
+	echo "<td>";
+	echo "<h3>Create Host</h3><br>";
+	echo "<form method=\"post\" action=\"$BASE_URL/objects/host/create\">";
+	echo "Name <input type=\"text\" name=\"objname\"><br>";
+	echo "IPv4 <input type=\"text\" name=\"addr4\"><br>";
+	echo "IPv6 <input type=\"text\" name=\"addr6\"><br>";
+	echo "<input type=\"submit\" name=\"add\" value=\"Add\">";
+	echo "</form>";
+	echo "</td>";
+	echo "<td>";
+	echo "<h3>Service</h3><br>";
+	echo "<form method=\"post\" action=\"$BASE_URL/objects/host/create\">";
+	echo "Name <input type=\"text\" name=\"objname\"><br>";
+	echo "Port <input type=\"text\" name=\"port\">";
+	echo "<select name=\"proto\"><option value=\"tcp\">TCP</option><option value=\"udp\">UDP</option></select><br>";
+	echo "<input type=\"submit\" name=\"add\" value=\"Add\">";
+	echo "</form>";
+	echo "</td>";
+	echo "</tr><tr>";
+	echo "<td>";
+	echo "<h3>Network Group</h3>";
+	echo "<form method=\"post\" action=\"$BASE_URL/objects/networkgroup/create\">";
+	echo "Name <input type=\"text\" name=\"objname\"><br>";
+	echo "</form>";
+	echo "</td>";
+	echo "<td>";
+	echo "<h3>Host Group</h3>";
+	echo "<form method=\"post\" action=\"$BASE_URL/objects/hostgroup/create\">";
+	echo "Name <input type=\"text\" name=\"objname\"><br>";
+	echo "</form>";
+	echo "</td>";
+	echo "<td>";
+	echo "<h3>Service Group</h3>";
+	echo "<form method=\"post\" action=\"$BASE_URL/objects/servicegroup/create\">";
+	echo "Name <input type=\"text\" name=\"objname\"><br>";
+	echo "</form>";
+	echo "</td>";
+	
+	
+	echo "</tr></table>";
+	
+}
+
+function CBFWChangesPage($urls)
+{
+	global $BASE_URL, $MENU_ITEMS;
+	
+	if(isset($urls[1])) {
+		switch($urls[1]) {
+			case "show":
+				CBFWpageBuilder(null, "CBFWChangesDisplay");
+				break;
+			case "delete":
+				$delete = $urls[2];
+				error_log("would delete change $delete");
+				header("Location: $BASE_URL/changes/show");
+				break;
+		}
+	}
+}
+
+function CBFWChangesDisplay()
+{
+	global $BASE_URL, $MENU_ITEMS;
+	$comms = new Comms();
+	
+	$config = $comms->getConfig(3);
+	
+	echo "<h2>Changes</h2>";
+	echo "This page shows the changes on the web from the currently running configuration<br>";
+	if($config["status"] == "nochange") {
+		echo "There are currently no changes from the running configuraiton.";
+	} else {
+		echo "<table border=\"1\">";
+		echo "<tr><th>Change No</th><th>Change</th><th>Control</th></tr>";
+		foreach($config["changes"] as $key => $var) {
+			echo "<tr><td>$key</td><td>$var</td><td><a href=\"$BASE_URL/changes/delete/$key\">Delete</a></td></tr>";
+		}
+		echo "</table>";
+	}
 }
 
 function CBFWRulesPage()
@@ -328,6 +477,58 @@ function CBFWRulesPage()
 	$config = $comms->getConfig();
 }
 
+function CBFWAdminPage($urls)
+{
+	$comms = new Comms();
+	
+	$config = $comms->getConfig();
+	
+	CBFWpageBuilder(null, "CBFWAdminDisplay");
+}
+
+function CBFWAdminDisplay()
+{
+?>
+<h2>Administration</h2>
+<table cellpadding=10>
+<tr valign="top">
+<td>
+<h3>Users</h3>
+<table>
+<tr><th>Username</th><th>Description</th><th>Enabled?</th></tr>
+<tr><td>Admin</td><td>Twattle</td><td>Yes</td></tr>
+</table>
+<hr>
+<h3>Add User</h3>
+<form method="post" action="asdf">
+Username <input type="text" name="username"><br>
+Password <input type="password" name="pass"><br>
+Description <input type="text" name="desc"><br>
+<input type="submit" name="add" value="Add"><br>
+</form>
+</td>
+<td>
+<h3>Network Access</h3>
+<table>
+<tr><th>From</th><th>Interface</th><th>Type</th></tr>
+<tr><td>Any</td><td>twaddle</td><td>http,https,ssh</td></tr>
+</table>
+<hr>
+<h3>Add Access</h3>
+<form method="post" action="asdf">
+From <input type="text" name="from"> <i>either "any", an address (1.2.3.4) or a network (1.2.3.4/23)</i><br>
+Interface <select><option value="something">twad</option><option name="some">craw</option></select>
+Protocols <input type="checkbox" name="http">HTTP <input type="checkbox" name="http">HTTPS <input type="checkbox" name="http">SSH<br> 
+<input type="submit" name="add" value="Add"><br>
+</form>
+</td>
+</tr>
+</table>
+<?php 
+}
+
+
+
 function findUrl($url_s)
 {
 	global $URL_HANDLERS;