X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Ffwui.php;h=adc95416a886aa96ab5a9c21287fe547ba1c89eb;hp=cf8056b079fac867a12b9e70da4f073e7076f050;hb=13e5ebe14a18fb0d217fdc6fc4fc786a678889da;hpb=175dadf56670772f8d889276df67471354a36f21
diff --git a/libcbfwr/fwui.php b/libcbfwr/fwui.php
index cf8056b..adc9541 100644
--- a/libcbfwr/fwui.php
+++ b/libcbfwr/fwui.php
@@ -1,24 +1,538 @@
getConfig();
+ if(isset($urls[1])) {
+ switch($urls[1]) {
+ case "modify":
+
+ if($_REQUEST["description"] != "") $desc = $_REQUEST["description"];
+ else $desc = null;
+
+ $oldname = $_REQUEST["oldname"];
+ $newname = $_REQUEST["zonename"];
+
+ $renewname = null;
+ error_log("comparing \"$oldname\" to \"$newname\"");
+ if($oldname != $newname) {
+ $renewname = " rename $newname";
+ }
+
+ $oldconf = getWebUserConfig();
+ $olddesc = $oldconf["zone"][$oldname]["description"];
+ error_log("Comparing \"$olddesc\" and \"$desc\"");
+ if($desc != $olddesc) {
+ $newdesc = " # $desc";
+ } else $newdesc = null;
+
+ //echo "confs: \"$olddesc\", \"$newdesc\", $oldname, $newname
";
+ //exit(0);
+
+ if($renewname == null && $newdesc == null) {
+ header("Location: $BASE_URL/zones");
+ error_log("no changes?");
+ return;
+ }
+
+
+ $conf = $comms->getConfig(3);
+ $changes = $conf["status"];
+ if($changes == "nochange") $conf["status"] = 1;
+ else $conf["status"] = $changes + 1;
+ $cnum = $conf["status"];
+
+ $conf[$cnum]["modify"] = "zone $oldname$renewname$newdesc";
+ $comms->putConfig($conf, 3);
+ header("Location: $BASE_URL/zones");
+
+ break;
+
+
+ case "edit":
+ CBFWpageBuilder(null, "CBFWZonesEditPage", null, null, $urls);
+ break;
+
+
+ case "delete":
+ $zonetodelete = $urls[2];
+
+ addWebUserChange("delete zone name $zonetodelete");
+ header("Location: $BASE_URL/zones");
+ break;
+
+
+ case "add":
+
+ // UGLY
+ $nametoadd = $_REQUEST["toadd"];
+ $desc = $_REQUEST["desc"];
+
+ $descbit = "";
+ if($desc != "") $descbit = " # $desc";
+ if($nametoadd == "" || $nametoadd == null) {
+ return;
+ }
+
+ addWebUserChange("zone name $nametoadd $descbit");
+ header("Location: $BASE_URL/zones");
+ break;
+
+
+ default:
+ CBFWpageBuilder(null, "CBFWZonesPageDisplay");
+ }
+ } else {
+ CBFWpageBuilder(null, "CBFWZonesPageDisplay");
+ }
+}
+
+function CBFWZonesEditPage($urls)
+{
+ global $BASE_URL, $MENU_ITEMS;
+
+ $zone = $urls[2];
+
+ $config = getWebUserConfig();
+
+
+ echo "
Edit Zone $zone
";
+ echo "";
+}
+
+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);
+
}
-function CBFWInterfacesPage()
+// TODO: we need to really sit and think about this one
+function getWebUserConfig()
{
$comms = new Comms();
+ $myconf = new Config();
+
+ // check to see if pre-cache config matches change level of config change buffer
+ $config = $comms->getConfig(5);
+ $conf2 = $comms->getConfig(3);
+ 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 CBFWObjectsPage()
+function CBFWZonesPageDisplay()
+{
+ global $BASE_URL, $MENU_ITEMS;
+
+ $config = getWebUserConfig();
+
+ echo "Zones
";
+ echo "Zone | Interfaces | Description | Edit |
";
+ foreach($config["zone"] as $key => $var) {
+ $name = $key;
+ $url = "Edit";
+ $url2 = "Delete";
+ $desc = $var["description"];
+ echo "$name | ... | $desc | $url $url2 |
";
+ }
+
+ echo "
";
+ echo "";
+
+}
+
+function CBFWRoutingPage($urls)
+{
+ if(isset($urls[1])) {
+ switch($urls[1]) {
+ case "edit":
+ CBFWpageBuilder(null, "CBFWRoutingPageEdit", null, null, $urls[2]);
+ break;
+ case "change":
+ CBFWRoutingChange();
+ break;
+ default:
+ CBFWpageBuilder(null, "CBFWRoutingPageDisplay");
+ }
+ } else {
+ error_log("main interface page");
+ CBFWpageBuilder(null, "CBFWRoutingPageDisplay");
+ }
+
+}
+
+function CBFWRoutingPageDisplay()
+{
+ echo "Routing
";
+}
+
+function CBFWInterfacesPage($urls)
+{
+ if(isset($urls[1])) {
+ switch($urls[1]) {
+ case "edit":
+ CBFWpageBuilder(null, "CBFWInterfacesPageEdit", null, null, $urls[2]);
+ break;
+ case "change":
+ CBFWInterfacesChange();
+ break;
+ default:
+ CBFWpageBuilder(null, "CBFWInterfacesPageDisplay");
+ }
+ } else {
+ error_log("main interface page");
+ CBFWpageBuilder(null, "CBFWInterfacesPageDisplay");
+ }
+}
+
+function CBFWInterfacesChange()
+{
+ global $BASE_URL, $MENU_ITEMS;
+ $comms = new Comms();
+
+ header("Location: $BASE_URL/interfaces");
+}
+
+function CBFWInterfacesPageEdit($urls)
+{
+ global $BASE_URL, $MENU_ITEMS;
+ $interface = $urls;
+
+ $comms = new Comms();
+
+ $config = getWebUserConfig();
+ $boot_config = $comms->getConfig(1);
+
+ if(isset($config["interface"]["dev"]["$interface"]["name"])) $name = $config["interface"]["dev"]["$interface"]["name"];
+ else $name = "";
+
+ $extra2 = "";
+ if(file_exists("/sys/class/net/$interface/address")) {
+ $extra2 = trim(file_get_contents("/sys/class/net/$interface/address"));
+ }
+
+ $extra = "";
+ if(isset($boot_config["hardware"]["netdev"]["$interface"]["hwaddress"])) {
+ $hwaddr = $boot_config["hardware"]["netdev"]["$interface"]["hwaddress"];
+ $extra = " Original address: $hwaddr";
+ if($hwaddr != $extra2 && $extra2 != "") {
+ $extra .= " Current Address: $hwaddr";
+ }
+ }
+ if(isset($config["interface"]["dev"]["$interface"]["hwaddress"])) $hwaddr = $config["interface"]["dev"]["$interface"]["hwaddress"];
+
+ if(isset($config["interface"]["dev"]["$interface"]["zone"])) $zone = $config["interface"]["dev"]["$interface"]["zone"];
+
+ if(isset($config["interface"]["dev"]["$interface"]["address4"])) $ip4 = $config["interface"]["dev"]["$interface"]["address4"];
+
+ if(isset($config["interface"]["dev"]["$interface"]["address6"])) $ip6 = $config["interface"]["dev"]["$interface"]["address6"];
+
+ if(isset($boot_config["hardware"]["netdev"]["$interface"]["speed"])) $speed = $boot_config["hardware"]["netdev"]["$interface"]["speed"];
+ if(isset($boot_config["hardware"]["netdev"]["$interface"]["duplex"])) $duplex = $boot_config["hardware"]["netdev"]["$interface"]["duplex"];
+ if(isset($config["interface"]["dev"]["$interface"]["speed"])) $speed = $config["interface"]["dev"]["$interface"]["speed"];
+ if(isset($config["interface"]["dev"]["$interface"]["duplex"])) $duplex = $config["interface"]["dev"]["$interface"]["duplex"];
+
+ echo "Edit Interface $interface
";
+ echo "";
+}
+
+function CBFWInterfacesPageDisplay()
+{
+ global $BASE_URL, $MENU_ITEMS;
+ $comms = new Comms();
+
+ $config = getWebUserConfig();
+ $boot_config = $comms->getConfig(1);
+
+ // at the top, we put in the creation bits
+ echo "Create Interface
";
+ echo "Link Aggregation Group (bonded/teamed interfaces)
";
+ echo "VLAN Tagged Sub Interfaces
";
+ echo "Bridged Interfaces
";
+ echo "
";
+
+ // 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"];
+
+ // speed
+ if(isset($val["speed"])) $table[$key]["speed"] = $val["speed"];
+ else $table[$key]["speed"] = "default";
+
+ // 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 "Interfaces
Device | Zone | Type | MAC Address | Address | MTU | Speed/Duplex | Description | Control | ";
+ foreach($table as $key =>$val) {
+ if($val["realname"] == $val["name"]) $name = $val["name"];
+ else $name = $val["name"]." (".$val["realname"].")";
+
+ // zone
+ if(isset($val["zone"])) {
+ if($val["zone"] == null) $zone = "-";
+ else $zone = $val["zone"];
+ } else $zone = "-";
+
+ // mtu
+ if(isset($val["mtu"])) {
+ $mtu = $val["mtu"];
+ } else $mtu = "-";
+
+ // driver type
+ if(isset($val["type"])) {
+ $type = $val["type"];
+ } else $type = "-";
+
+ // hardware address
+ if(isset($val["hwaddress"])) {
+ $mac = $val["hwaddress"];
+ } else $mac = "-";
+
+ // speed and 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(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(isset($val["address4"]) && isset($val["address6"])) {
+ $address = $val["address4"]."
".$val["address6"];
+ } else if(isset($val["address4"])) {
+ $address = $val["address4"];
+ } else if(isset($val["address6"])) {
+ $address = $val["address6"];
+ } else {
+ $address = "-";
+ }
+
+ if(isset($val["description"])) $desc = $val["description"];
+ else $desc = "-";
+
+ echo "$name | $zone | $type | $mac | $address | $mtu | $spanddu | $desc | Edit |
";
+ }
+ echo "
";
+
+ // to test
+ echo "config: ";
+ print_r($config);
+ echo "
";
+}
+
+function CBFWObjectsPage($urls)
{
$comms = new Comms();
$config = $comms->getConfig();
+
+ CBFWpageBuilder(null, "CBFWObjectsDisplay");
+}
+
+function CBFWObjectsDisplay()
+{
+ global $BASE_URL, $MENU_ITEMS;
+ $config = getWebUserConfig();
+
+ echo "Objects
";
+
+ if(isset($config["objects"])) {
+ echo "";
+ echo "Networks | Hosts | Services | Network Groups | Host Groups | Service Groups |
";
+ echo "
";
+ foreach($config["objects"] as $key => $var) {
+ }
+ } else {
+ echo "No objects set\n";
+ }
+
+ echo "
";
+ echo "";
+ echo "";
+ echo "Create Network ";
+ echo "";
+ echo " | ";
+ echo "";
+ echo "Create Host ";
+ echo "";
+ echo " | ";
+ echo "";
+ echo "Service ";
+ echo "";
+ echo " | ";
+ echo "
";
+ echo "";
+ echo "Network Group";
+ echo "";
+ echo " | ";
+ echo "";
+ echo "Host Group";
+ echo "";
+ echo " | ";
+ echo "";
+ echo "Service Group";
+ echo "";
+ echo " | ";
+
+
+ echo "
";
+
+}
+
+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 "Changes
";
+ echo "This page shows the changes on the web from the currently running configuration
";
+ if($config["status"] == "nochange") {
+ echo "There are currently no changes from the running configuraiton.";
+ } else {
+ echo "";
+ echo "Change No | Change | Control |
";
+ foreach($config["changes"] as $key => $var) {
+ echo "$key | $var | Delete |
";
+ }
+ echo "
";
+ }
}
function CBFWRulesPage()
@@ -28,6 +542,58 @@ function CBFWRulesPage()
$config = $comms->getConfig();
}
+function CBFWAdminPage($urls)
+{
+ $comms = new Comms();
+
+ $config = $comms->getConfig();
+
+ CBFWpageBuilder(null, "CBFWAdminDisplay");
+}
+
+function CBFWAdminDisplay()
+{
+?>
+Administration
+
+
+
+Users
+
+Username | Description | Enabled? |
+Admin | Twattle | Yes |
+
+
+Add User
+
+ |
+
+Network Access
+
+From | Interface | Type |
+Any | twaddle | http,https,ssh |
+
+
+Add Access
+
+ |
+
+
+