applications/luci-ffwizard-leipzig: prepare advanced firewall config and disable...

[project/luci.git] / applications / luci-ffwizard-leipzig / luasrc / model / cbi / ffwizard.lua

diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
index 7da7655..6373c7a 100644 (file)
--- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
@@ -78,26 +78,13 @@ end
 client = f:field(Flag, "client", "WLAN-DHCP anbieten")
 client:depends("wifi", "1")
 client.rmempty = true
-function client.cfgvalue(self, section)
-       return uci:get("freifunk", "wizard", "client")
-end
-function client.write(self, section, value)
-       uci:set("freifunk", "wizard", "client", value)
-       uci:save("freifunk")
-end
 
 
 olsr = f:field(Flag, "olsr", "OLSR einrichten")
+olsr.rmempty = true
 
 share = f:field(Flag, "sharenet", "Eigenen Internetzugang freigeben")
 share.rmempty = true
-function share.cfgvalue(self, section)
-       return uci:get("freifunk", "wizard", "sharenet")
-end
-function share.write(self, section, value)
-       uci:set("freifunk", "wizard", "sharenet", value)
-       uci:save("freifunk")
-end
 
 
 
@@ -164,7 +151,7 @@ function main.write(self, section, value)
        tools.firewall_zone_remove_interface("freifunk", device)
 
        -- Tune community settings
-       if community then
+       if community and uci:get("freifunk", community) then
                uci:tset("freifunk", "community", uci:get_all("freifunk", community))
        end
 
@@ -185,7 +172,7 @@ function main.write(self, section, value)
        uci:save("wireless")
 
        -- Create firewall zone and add default rules (first time)
-       local newzone = tools.firewall_create_zone("freifunk", "DROP", "ACCEPT", "DROP", true)
+       local newzone = tools.firewall_create_zone("freifunk", "REJECT", "ACCEPT", "REJECT", true)
        if newzone then
                uci:foreach("freifunk", "fw_forwarding", function(section)
                        uci:section("firewall", "forwarding", nil, section)
@@ -200,10 +187,40 @@ function main.write(self, section, value)
                uci:foreach(external, "fw_rule", function(section)
                        uci:section("firewall", "rule", nil, section)
                end)
+       end
+
+       -- Enforce firewall include
+       local has_include = false
+       uci:foreach("firewall", "include",
+               function(section)
+                       if section.path == "/etc/firewall.freifunk" then
+                               has_include = true
+                       end
+               end)
 
-               uci:save("firewall")
+       if not has_include then
+               uci:section("firewall", "include", nil,
+                       { path = "/etc/firewall.freifunk" })
        end
 
+       -- Allow state: invalid packets
+       uci:foreach("firewall", "defaults",
+               function(section)
+                       uci:set("firewall", section[".name"], "drop_invalid", "0")
+               end)
+
+       -- Prepare advanced config
+       local has_advanced = false
+       uci:foreach("firewall", "advanced",
+               function(section) has_advanced = true end)
+
+       if not has_advanced then
+               uci:section("firewall", "advanced", nil,
+                       { tcp_ecn = "0" })
+       end
+
+       uci:save("firewall")
+
 
        -- Crate network interface
        local netconfig = uci:get_all("freifunk", "interface")
@@ -311,6 +328,17 @@ function client.write(self, section, value)
                dest_port="67",
                target="ACCEPT"
        })
+       uci:delete_all("firewall", "rule", {
+               src="freifunk",
+               proto="tcp",
+               dest_port="8082",
+       })
+       uci:section("firewall", "rule", nil, {
+               src="freifunk",
+               proto="tcp",
+               dest_port="8082",
+               target="ACCEPT"
+       })