X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Ffwui.php;h=bb2fc8e7b935e4d32d69d888f66744bf7b22ae5e;hp=4bcfed5513ae07cc14624e34daac0a8e76ef4963;hb=482faf0546015989a57b68640fd9a1ff5e8666f2;hpb=c6a0d901040bc483d89d8596661dcf0d5a48ffb2

diff --git a/libcbfwr/fwui.php b/libcbfwr/fwui.php
index 4bcfed5..bb2fc8e 100644
--- a/libcbfwr/fwui.php
+++ b/libcbfwr/fwui.php
@@ -58,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;
 				
@@ -74,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;
 				
@@ -122,6 +110,28 @@ function CBFWZonesEditPage($urls)
 	echo "</form>";
 }
 
+function addWebUserChange($change)
+{
+	$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();
@@ -140,13 +150,20 @@ function getWebUserConfig()
 	}
 	
 	// it did not, do a new merge and cache
-	$config = $myconf->mergeConfig($comms->getConfig(), $conf2);
+	// 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 $config;
+	return $reconfig;
 }
 
 function CBFWZonesPageDisplay()
@@ -229,9 +246,16 @@ function CBFWInterfacesPageDisplay()
 	global $BASE_URL, $MENU_ITEMS;
 	$comms = new Comms();
 	
-	$config = $comms->getConfig(0);
+	$config = getWebUserConfig();
 	$boot_config = $comms->getConfig(1);
 	
+	// at the top, we put in the creation bits
+	echo "<h2>Create Interface</h2>";
+	echo "<li><a href=\"$BASE_URL/interfaces/create/bond\">Link Aggregation Group (bonded/teamed interfaces)</a><br>";
+	echo "<li><a href=\"$BASE_URL/interfaces/create/vlan\">VLAN Tagged Sub Interfaces</a><br>";
+	echo "<li><a href=\"$BASE_URL/interfaces/create/bridge\">Bridged Interfaces</a><br>";
+	echo "<hr>";
+	
 	// now build an interface table
 	$table = array();
 	foreach($boot_config["hardware"]["netdev"] as $key=>$val) {
@@ -249,96 +273,207 @@ function CBFWInterfacesPageDisplay()
 		
 		// current mtu
 		if(isset($val["mtu"])) $table[$key]["mtu"] = $val["mtu"];
-	}
-	
-	foreach($config["hardware"]["netdev"] as $key=>$val) {
-		$ename = $key;
-		if(isset($config["interface"]["$key"]["name"])) $table[$key]["name"] = $config["interface"]["$key"]["name"];
-		$table[$key]["address4"] = null;
-		$table[$key]["address6"] = null;
-		
-		if(isset($config["interface"][$table[$key]["name"]]["address4"])) {
-			$table[$key]["address4"] = $config["interface"][$table[$key]["name"]]["address4"];
-		}
 		
-		if(isset($config["interface"][$table[$key]["name"]]["address6"])) {
-			$table[$key]["address6"] = $config["interface"][$table[$key]["name"]]["address6"];
-		}
-		
-		if(isset($config["interface"][$table[$key]["name"]]["mtu"])) {
-			$table[$key]["mtu"] = $config["interface"][$table[$key]["name"]]["mtu"];
-		} else {
-			$table[$key]["mtu"] = "1500"; // TODO: this needs to actually come from somewhere
-		}
+		// speed
+		if(isset($val["speed"])) $table[$key]["speed"] = $val["speed"];
+		else $table[$key]["speed"] = "default";
 		
-		if(isset($config["interface"][$table[$key]["name"]]["speed"])) {
-			$table[$key]["speed"] = $config["interface"][$table[$key]["name"]]["speed"];
-		} else {
-			$table[$key]["speed"] = null;
-		}
-
-		if(isset($config["interface"][$table[$key]["name"]]["duplex"])) {
-			$table[$key]["duplex"] = $config["interface"][$table[$key]["name"]]["duplex"];
-		} else {
-			$table[$key]["duplex"] = null;
-		}
-		
-		if(isset($config["interface"][$table[$key]["name"]]["zone"])) {
-			$table[$key]["zone"] = $config["interface"][$table[$key]["name"]]["zone"];
-		} else {
-			$table[$key]["zone"] = null;
-		}
+		// duplex
+		if(isset($val["duplex"])) $table[$key]["duplex"] = $val["duplex"];
+		else $table[$key]["duplex"] = "default";
 	}
 	
+	foreach($config["interface"]["dev"] as $key => $val) {
+		// TODO construction zone
+		error_log("doing $key");
+		if(isset($val["name"])) $table[$key]["name"] = $val["name"];
+		if(isset($val["address4"])) $table[$key]["address4"] = $val["address4"];
+		if(isset($val["address6"])) $table[$key]["address6"] = $val["address6"];
+		if(isset($val["description"])) $table[$key]["description"] = $val["description"];
+		if(isset($val["zone"])) $table[$key]["zone"] = $val["zone"];
+	}
+
 	
-	echo "<table border=\"1\"><th>Device</th><th>Zone</th><th>Type</th><th>MAC Address</th><th>Address</th><th>MTU</th><th>Speed/Duplex</th><th>Control</th></tr>";
+	echo "<h2>Interfaces</h2><table border=\"1\"><th>Device</th><th>Zone</th><th>Type</th><th>MAC Address</th><th>Address</th><th>MTU</th><th>Speed/Duplex</th><th>Description</th><th>Control</th></tr>";
 	foreach($table as $key =>$val) {
 		if($val["realname"] == $val["name"]) $name = $val["name"];
 		else $name = $val["name"]." (".$val["realname"].")";
 		
 		// zone
-		if($val["zone"] == null) $zone = "-";
-		else $zone = $val["zone"];
+		if(isset($val["zone"])) {
+			if($val["zone"] == null) $zone = "-";
+			else $zone = $val["zone"];
+		} else $zone = "-";
 		
 		// mtu
-		$mtu = $val["mtu"];
+		if(isset($val["mtu"])) {
+			$mtu = $val["mtu"];
+		} else $mtu = "-";
 		
 		// driver type
-		$type = $val["type"];
+		if(isset($val["type"])) { 
+			$type = $val["type"];
+		} else $type = "-";
 		
 		// hardware address
-		$mac = $val["hwaddress"];
+		if(isset($val["hwaddress"])) {
+			$mac = $val["hwaddress"];
+		} else $mac = "-";
 		
 		// speed and duplex
-		if($val["duplex"] == null) $dup = "default";
-		else $dup = $val["duplex"];
+		if(isset($val["duplex"])) {
+			if($val["duplex"] == null) $dup = "default";
+			else $dup = $val["duplex"];
+		} //else $dup = "default"; // TODO: needs to go away in fav of hardware setting
 		
-		if($val["speed"] == null) $spd = "default";
-		else $spd = $val["speed"];
+		if(isset($val["speed"])) {
+			if($val["speed"] == null) $spd = "default";
+			else $spd = $val["speed"];
+		} //else $spd = "default"; // TODO: needs to go away inf av of hardware setting
 		
 		$spanddu = "$spd/$dup";
 		
 		// network address
-		if($val["address4"]!=null && $val["address6"]!=null) {
+		if(isset($val["address4"]) && isset($val["address6"])) {
 			$address = $val["address4"]."<br>".$val["address6"];
-		} else if($val["address4"] != null) {
+		} else if(isset($val["address4"])) {
 			$address = $val["address4"];
-		} else if($val["address6"] != null) {
+		} else if(isset($val["address6"])) {
 			$address = $val["address6"];
 		} else {
 			$address = "-";
 		}
 		
-		echo "<tr><th>$name</th><td>$zone</td><td>$type</td><td>$mac</td><td>$address</td><td>$mtu</td><td>$spanddu</td><td><a href=\"$BASE_URL/interfaces/edit/".$val["realname"]."\">Edit</a></td></tr>";
+		if(isset($val["description"])) $desc = $val["description"];
+		else $desc = "-";
+		
+		echo "<tr><th>$name</th><td>$zone</td><td>$type</td><td>$mac</td><td>$address</td><td>$mtu</td><td>$spanddu</td><td>$desc</td><td><a href=\"$BASE_URL/interfaces/edit/".$val["realname"]."\">Edit</a></td></tr>";
 	}
 	echo "</table>";
+	
+	// to test
+	echo "config: <pre>";
+	print_r($config);
+	echo "</pre>";
 }
 
-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()
@@ -348,6 +483,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 <select name="from"><option value="something">Any</option><option name="some">Intranet</option><option name="som">SomeHost</option></select><br>
+Interface <select name="interface"><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;