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;
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;
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();
}
// 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()
}
-function CBFWInterfacesPage($urls)
+function CBFWRoutingPage($urls)
{
if(isset($urls[1])) {
switch($urls[1]) {
case "edit":
- CBFWpageBuilder(null, "CBFWInterfacesPageEdit", null, null, $urls[2]);
+ CBFWpageBuilder(null, "CBFWRoutingPageEdit", null, null, $urls[2]);
break;
case "change":
- CBFWInterfacesChange();
+ CBFWRoutingChange();
break;
default:
- CBFWpageBuilder(null, "CBFWInterfacesPageDisplay");
+ CBFWpageBuilder(null, "CBFWRoutingPageDisplay");
}
} else {
error_log("main interface page");
- CBFWpageBuilder(null, "CBFWInterfacesPageDisplay");
+ CBFWpageBuilder(null, "CBFWRoutingPageDisplay");
}
-}
-
-function CBFWInterfacesChange()
-{
- global $BASE_URL, $MENU_ITEMS;
- $comms = new Comms();
- $comms->sendMessage("interface eth0 changename poof");
- header("Location: $BASE_URL/interfaces");
}
-function CBFWInterfacesPageEdit($urls)
+function CBFWRoutingPageDisplay()
{
- global $BASE_URL, $MENU_ITEMS;
- $interface = $urls;
-
- echo "<h3>Edit Interface $interface</h3><br>";
- echo "<form method=\"post\" action=\"$BASE_URL/interfaces/change/$interface\">";
- echo "<table>";
- echo "<tr><td>Name</td><td><input type=\"text\" name=\"name\"></td></tr>";
- echo "<tr><td>HW Address</td><td><input type=\"text\" name=\"hwaddr\"></td></tr>";
- echo "<tr><td>Zone</td><td><input type=\"text\" name=\"zone\"></td></tr>";
- echo "<tr><td>IPv4 Address</td><td><input type=\"text\" name=\"ipv4addr\"></td></tr>";
- echo "<tr><td>IPv6 Address</td><td><input type=\"text\" name=\"ipv6addr\"></td></tr>";
- echo "<tr><td>Speed</td><td><input type=\"text\" name=\"speed\"></td></tr>";
- echo "<tr><td>Duplex</td><td><input type=\"text\" name=\"duplex\"></td></tr>";
- echo "</table>";
- echo "<input type=\"submit\" name=\"Change\" value=\"Change\"><br>";
- //echo "<a href=\"$BASE_URL/interfaces/\">Back</a>";
- echo "</form>";
-}
-
-function CBFWInterfacesPageDisplay()
-{
- global $BASE_URL, $MENU_ITEMS;
- $comms = new Comms();
-
- $config = $comms->getConfig(0);
- $boot_config = $comms->getConfig(1);
-
- // now build an interface table
- $table = array();
- foreach($boot_config["hardware"]["netdev"] as $key=>$val) {
- $ename = $key;
- $table[$key]["realname"] = $val["name"];
- $table[$key]["name"] = $val["name"];
-
-
- // driver
- if(isset($val["driver"])) $table[$key]["type"] = $val["driver"];
- else $table[$key]["type"] = "Unknown";
-
- // hw address
- if(isset($val["hwaddress"])) $table[$key]["hwaddress"] = $val["hwaddress"];
-
- // 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
- }
-
- 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;
- }
- }
-
-
- 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>";
- 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"];
-
- // mtu
- $mtu = $val["mtu"];
-
- // driver type
- $type = $val["type"];
-
- // hardware address
- $mac = $val["hwaddress"];
-
- // speed and duplex
- if($val["duplex"] == null) $dup = "default";
- else $dup = $val["duplex"];
-
- if($val["speed"] == null) $spd = "default";
- else $spd = $val["speed"];
-
- $spanddu = "$spd/$dup";
-
- // network address
- if($val["address4"]!=null && $val["address6"]!=null) {
- $address = $val["address4"]."<br>".$val["address6"];
- } else if($val["address4"] != null) {
- $address = $val["address4"];
- } else if($val["address6"] != null) {
- $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>";
- }
- echo "</table>";
+ echo "<h2>Routing</h2>";
}
function CBFWObjectsPage($urls)
}
+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()
{
$comms = new Comms();
<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>
+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>
projects / CBFWR.git / blobdiff