libs/sys: properly handle passwords with apostrophes

[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 6373c7a8075f2d9010ecff568c65b4ad102db38c..780316c4a017085d2ff2e7967df2153d0658f3ab 100644 (file)
--- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
@@ -18,6 +18,29 @@ $Id$
 local uci = require "luci.model.uci".cursor()
 local tools = require "luci.tools.ffwizard"
 local util = require "luci.util"
 local uci = require "luci.model.uci".cursor()
 local tools = require "luci.tools.ffwizard"
 local util = require "luci.util"

+local sys = require "luci.sys"
+local ip = require "luci.ip"
+
+local function mksubnet(community, meship)
+       local subnet_prefix = tonumber(uci:get("freifunk", community, "splash_prefix")) or 27
+       local pool_network = uci:get("freifunk", community, "splash_network") or "10.104.0.0/16"
+       local pool = luci.ip.IPv4(pool_network)
+
+       if pool then
+               local hosts_per_subnet = 2^(32 - subnet_prefix)
+               local number_of_subnets = (2^pool:prefix())/hosts_per_subnet
+
+               local seed1, seed2 = meship:match("(%d+)%.(%d+)$")
+               math.randomseed(seed1 * seed2)
+
+               local subnet = pool:add(hosts_per_subnet * math.random(number_of_subnets))
+
+               local subnet_ipaddr = subnet:network(subnet_prefix):add(1):string()
+               local subnet_netmask = subnet:mask(subnet_prefix):string()
+
+               return subnet_ipaddr, subnet_netmask
+       end
+end

 
 
 -------------------- View --------------------
 
 
 -------------------- View --------------------


@@ -34,11 +57,11 @@ uci:foreach("wireless", "wifi-device",
 
 main = f:field(Flag, "wifi", "Freifunkzugang einrichten")
 
 
 main = f:field(Flag, "wifi", "Freifunkzugang einrichten")
 

-net = f:field(Value, "net", "Freifunknetz", "1. Teil der IP-Adresse")
+net = f:field(Value, "net", "Freifunk Community", "Mesh Netzbereich")

 net.rmempty = true
 net:depends("wifi", "1")
 uci:foreach("freifunk", "community", function(s)
 net.rmempty = true
 net:depends("wifi", "1")
 uci:foreach("freifunk", "community", function(s)

-       net:value(s[".name"], "%s (%s)" % {s.name, s.prefix})
+       net:value(s[".name"], "%s (%s)" % {s.name, s.mesh_network or "?"})

 end)
 
 function net.cfgvalue(self, section)
 end)
 
 function net.cfgvalue(self, section)


@@ -49,44 +72,64 @@ function net.write(self, section, value)
        uci:save("freifunk")
 end
 
        uci:save("freifunk")
 end
 

-
-subnet = f:field(Value, "subnet", "Subnetz (Projekt)", "2. Teil der IP-Adresse")
-subnet.rmempty = true
-subnet:depends("wifi", "1")
-function subnet.cfgvalue(self, section)
-       return uci:get("freifunk", "wizard", "subnet")
+meship = f:field(Value, "meship", "Mesh IP Adresse", "Netzweit eindeutige Identifikation")
+meship.rmempty = true
+meship:depends("wifi", "1")
+function meship.cfgvalue(self, section)
+       return uci:get("freifunk", "wizard", "meship")

 end
 end

-function subnet.write(self, section, value)
-       uci:set("freifunk", "wizard", "subnet", value)
+function meship.write(self, section, value)
+       uci:set("freifunk", "wizard", "meship", value)

        uci:save("freifunk")
 end
        uci:save("freifunk")
 end

-
-node = f:field(Value, "node", "Knoten", "3. Teil der IP-Adresse")
-node.rmempty = true
-node:depends("wifi", "1")
-for i=1, 51 do
-       node:value(i)
-end
-function node.cfgvalue(self, section)
-       return uci:get("freifunk", "wizard", "node")
-end
-function node.write(self, section, value)
-       uci:set("freifunk", "wizard", "node", value)
-       uci:save("freifunk")
+function meship.validate(self, value)
+       local x = ip.IPv4(value)
+       return ( x and x:prefix() == 32 ) and x:string() or ""

 end
 
 client = f:field(Flag, "client", "WLAN-DHCP anbieten")
 client:depends("wifi", "1")
 end
 
 client = f:field(Flag, "client", "WLAN-DHCP anbieten")
 client:depends("wifi", "1")

-client.rmempty = true
-
+client.rmempty = false
+function client.cfgvalue(self, section)
+       return uci:get("freifunk", "wizard", "dhcp_splash") or "0"
+end

 
 olsr = f:field(Flag, "olsr", "OLSR einrichten")
 olsr.rmempty = true
 
 
 olsr = f:field(Flag, "olsr", "OLSR einrichten")
 olsr.rmempty = true
 

+lat = f:field(Value, "lat", "Latitude")
+lat:depends("olsr", "1")
+function lat.cfgvalue(self, section)
+       return uci:get("freifunk", "wizard", "latitude")
+end
+function lat.write(self, section, value)
+       uci:set("freifunk", "wizard", "latitude", value)
+       uci:save("freifunk")
+end
+
+lon = f:field(Value, "lon", "Longitude")
+lon:depends("olsr", "1")
+function lon.cfgvalue(self, section)
+       return uci:get("freifunk", "wizard", "longitude")
+end
+function lon.write(self, section, value)
+       uci:set("freifunk", "wizard", "longitude", value)
+       uci:save("freifunk")
+end
+

 share = f:field(Flag, "sharenet", "Eigenen Internetzugang freigeben")
 share.rmempty = true
 
 share = f:field(Flag, "sharenet", "Eigenen Internetzugang freigeben")
 share.rmempty = true
 

-
+wansec = f:field(Flag, "wansec", "WAN-Zugriff auf Gateway beschränken")
+wansec.rmempty = false
+wansec:depends("sharenet", "1")
+function wansec.cfgvalue(self, section)
+       return uci:get("freifunk", "wizard", "wan_security")
+end
+function wansec.write(self, section, value)
+       uci:set("freifunk", "wizard", "wan_security", value)
+       uci:save("freifunk")
+end

 
 -------------------- Control --------------------
 function f.handle(self, state, data)
 
 -------------------- Control --------------------
 function f.handle(self, state, data)


@@ -116,33 +159,26 @@ function main.write(self, section, value)
        end
 
        local device = dev:formvalue(section)
        end
 
        local device = dev:formvalue(section)

-       local community, external
+       local node_ip, external

 
        -- Collect IP-Address
 
        -- Collect IP-Address

-       local inet = net:formvalue(section)
-       local isubnet = subnet:formvalue(section)
-       local inode = node:formvalue(section)
+       local community = net:formvalue(section)

 
        -- Invalidate fields
 
        -- Invalidate fields

-       if not inet then
+       if not community then

                net.tag_missing[section] = true
        else
                net.tag_missing[section] = true
        else

-               community = inet
-               external  = uci:get("freifunk", community, "external") or ""
-               inet = uci:get("freifunk", community, "prefix") or inet
-       end
-       if not isubnet then
-               subnet.tag_missing[section] = true
-       end
-       if not inode then
-               node.tag_missing[section] = true
-       end
+               external = uci:get("freifunk", community, "external") or ""
+               network = ip.IPv4(uci:get("freifunk", community, "mesh_network") or "104.0.0.0/8")
+               node_ip = meship:formvalue(section) and ip.IPv4(meship:formvalue(section))

 
 

-       if not inet or not isubnet or not inode then
-               return
+               if not node_ip or not network or not network:contains(node_ip) then
+                       meship.tag_missing[section] = true
+                       node_ip = nil
+               end

        end
 
        end
 

-       local ip = "%s.%s.%s" % {inet, isubnet, inode}
+       if not node_ip then return end

 
 
        -- Cleanup
 
 
        -- Cleanup


@@ -216,22 +252,40 @@ function main.write(self, section, value)
 
        if not has_advanced then
                uci:section("firewall", "advanced", nil,
 
        if not has_advanced then
                uci:section("firewall", "advanced", nil,

-                       { tcp_ecn = "0" })
+                       { tcp_ecn = "0", ip_conntrack_max = "8192", tcp_westwood = "1" })

        end
 
        uci:save("firewall")
 
 
        end
 
        uci:save("firewall")
 
 

-       -- Crate network interface
+       -- Create network interface

        local netconfig = uci:get_all("freifunk", "interface")
        util.update(netconfig, uci:get_all(external, "interface") or {})
        netconfig.proto = "static"
        local netconfig = uci:get_all("freifunk", "interface")
        util.update(netconfig, uci:get_all(external, "interface") or {})
        netconfig.proto = "static"

-       netconfig.ipaddr = ip
+       netconfig.ipaddr = node_ip:string()

        uci:section("network", "interface", device, netconfig)
 
        uci:save("network")
 
        tools.firewall_zone_add_interface("freifunk", device)
        uci:section("network", "interface", device, netconfig)
 
        uci:save("network")
 
        tools.firewall_zone_add_interface("freifunk", device)

+
+
+       local new_hostname = node_ip:string():gsub("%.", "-")
+       local old_hostname = sys.hostname()
+
+       uci:foreach("system", "system",
+               function(s)
+                       -- Make crond silent
+                       uci:set("system", s['.name'], "cronloglevel", "10")
+
+                       -- Set hostname
+                       if old_hostname == "OpenWrt" or old_hostname:match("^%d+-%d+-%d+-%d+$") then
+                               uci:set("system", s['.name'], "hostname", new_hostname)
+                               sys.hostname(new_hostname)
+                       end
+               end)
+
+       uci:save("system")

 end
 
 
 end
 
 


@@ -246,6 +300,10 @@ function olsr.write(self, section, value)
        local community = net:formvalue(section)
        local external  = community and uci:get("freifunk", community, "external") or ""
 
        local community = net:formvalue(section)
        local external  = community and uci:get("freifunk", community, "external") or ""
 

+       local latval = tonumber(lat:formvalue(section))
+       local lonval = tonumber(lon:formvalue(section))
+
+

        -- Delete old interface
        uci:delete_all("olsrd", "Interface", {interface=device})
 
        -- Delete old interface
        uci:delete_all("olsrd", "Interface", {interface=device})
 


@@ -255,42 +313,104 @@ function olsr.write(self, section, value)
        olsrbase.interface = device
        olsrbase.ignore    = "0"
        uci:section("olsrd", "Interface", nil, olsrbase)
        olsrbase.interface = device
        olsrbase.ignore    = "0"
        uci:section("olsrd", "Interface", nil, olsrbase)

+
+       -- Delete old watchdog settings
+       uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_watchdog.so.0.1"})
+
+       -- Write new watchdog settings
+       uci:section("olsrd", "LoadPlugin", nil, {
+               library  = "olsrd_watchdog.so.0.1",
+               file     = "/var/run/olsrd.watchdog",
+               interval = "30"
+       })
+
+       -- Delete old nameservice settings
+       uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_nameservice.so.0.3"})
+
+       -- Write new nameservice settings
+       uci:section("olsrd", "LoadPlugin", nil, {
+               library     = "olsrd_nameservice.so.0.3",
+               suffix      = ".olsr",
+               hosts_file  = "/var/etc/hosts.olsr",
+               latlon_file = "/var/run/latlon.js",
+               lat         = latval and string.format("%.15f", latval) or "",
+               lon         = lonval and string.format("%.15f", lonval) or ""
+       })
+
+       -- Save latlon to system too
+       if latval and lonval then
+               uci:foreach("system", "system", function(s)
+                       uci:set("system", s[".name"], "latlon",
+                               string.format("%.15f %.15f", latval, lonval))
+               end)
+       else
+               uci:foreach("system", "system", function(s)
+                       uci:delete("system", s[".name"], "latlon")
+               end)
+       end
+
+       -- Import hosts
+       uci:foreach("dhcp", "dnsmasq", function(s)
+               uci:set("dhcp", s[".name"], "addnhosts", "/var/etc/hosts.olsr")
+       end)
+
+       -- Make sure that OLSR is enabled
+       sys.exec("/etc/init.d/olsrd enable")
+

        uci:save("olsrd")
        uci:save("olsrd")

+       uci:save("dhcp")

 end
 
 
 function share.write(self, section, value)
        uci:delete_all("firewall", "forwarding", {src="freifunk", dest="wan"})
 end
 
 
 function share.write(self, section, value)
        uci:delete_all("firewall", "forwarding", {src="freifunk", dest="wan"})

+       uci:delete_all("olsrd", "LoadPlugin", {library="olsrd_dyn_gw_plain.so.0.4"})
+       uci:foreach("firewall", "zone",
+               function(s)             
+                       if s.name == "wan" then
+                               uci:delete("firewall", s['.name'], "local_restrict")
+                               return false
+                       end
+               end)

 
        if value == "1" then
                uci:section("firewall", "forwarding", nil, {src="freifunk", dest="wan"})
 
        if value == "1" then
                uci:section("firewall", "forwarding", nil, {src="freifunk", dest="wan"})

+               uci:section("olsrd", "LoadPlugin", nil, {library="olsrd_dyn_gw_plain.so.0.4"})
+
+               if wansec:formvalue(section) == "1" then
+                       uci:foreach("firewall", "zone",
+                               function(s)             
+                                       if s.name == "wan" then
+                                               uci:set("firewall", s['.name'], "local_restrict", "1")
+                                               return false
+                                       end
+                               end)
+               end

        end
        end

+

        uci:save("firewall")
        uci:save("firewall")

+       uci:save("olsrd")
+       uci:save("system")

 end
 
 
 function client.write(self, section, value)
        if value == "0" then
 end
 
 
 function client.write(self, section, value)
        if value == "0" then

+               uci:delete("freifunk", "wizard", "dhcp_splash")
+               uci:save("freifunk")

                return
        end
 
        local device = dev:formvalue(section)
 
        -- Collect IP-Address
                return
        end
 
        local device = dev:formvalue(section)
 
        -- Collect IP-Address

-       local inet = net:formvalue(section)
-       local isubnet = subnet:formvalue(section)
-       local inode = node:formvalue(section)
+       local node_ip = meship:formvalue(section)

 
 

-       if not inet or not isubnet or not inode then
-               return
-       end
-       local community = inet
-       local external  = community and uci:get("freifunk", community, "external") or ""
-       inet = uci:get("freifunk", community, "prefix") or inet
+       if not node_ip then return end

 
 

-       local dhcpbeg = 48 + tonumber(inode) * 4
-       local dclient = "%s.%s.%s" % {inet:gsub("^[0-9]+", "10"), isubnet, dhcpbeg}
-       local limit = dhcpbeg < 252 and 3 or 2
+       local community = net:formvalue(section)
+       local external  = community and uci:get("freifunk", community, "external") or ""
+       local splash_ip, splash_mask = mksubnet(community, node_ip)

 
        -- Delete old alias
        uci:delete("network", device .. "dhcp")
 
        -- Delete old alias
        uci:delete("network", device .. "dhcp")


@@ -299,7 +419,8 @@ function client.write(self, section, value)
        local aliasbase = uci:get_all("freifunk", "alias")
        util.update(aliasbase, uci:get_all(external, "alias") or {})
        aliasbase.interface = device
        local aliasbase = uci:get_all("freifunk", "alias")
        util.update(aliasbase, uci:get_all(external, "alias") or {})
        aliasbase.interface = device

-       aliasbase.ipaddr = dclient
+       aliasbase.ipaddr = splash_ip
+       aliasbase.netmask = splash_mask

        aliasbase.proto = "static"
        uci:section("network", "alias", device .. "dhcp", aliasbase)
        uci:save("network")
        aliasbase.proto = "static"
        uci:section("network", "alias", device .. "dhcp", aliasbase)
        uci:save("network")


@@ -311,10 +432,22 @@ function client.write(self, section, value)
        dhcpbase.interface = device .. "dhcp"
        dhcpbase.start = dhcpbeg
        dhcpbase.limit = limit
        dhcpbase.interface = device .. "dhcp"
        dhcpbase.start = dhcpbeg
        dhcpbase.limit = limit

+       dhcpbase.force = 1

 
        uci:section("dhcp", "dhcp", device .. "dhcp", dhcpbase)
        uci:save("dhcp")
 
 
        uci:section("dhcp", "dhcp", device .. "dhcp", dhcpbase)
        uci:save("dhcp")
 

+       uci:delete_all("firewall", "rule", {
+               src="freifunk",
+               proto="udp",
+               dest_port="53"
+       })
+       uci:section("firewall", "rule", nil, {
+               src="freifunk",
+               proto="udp",
+               dest_port="53",
+               target="ACCEPT"
+       })

        uci:delete_all("firewall", "rule", {
                src="freifunk",
                proto="udp",
        uci:delete_all("firewall", "rule", {
                src="freifunk",
                proto="udp",


@@ -340,14 +473,21 @@ function client.write(self, section, value)
                target="ACCEPT"
        })
 
                target="ACCEPT"
        })
 

-
+       uci:save("firewall")

 
        -- Delete old splash
 
        -- Delete old splash

-       uci:delete_all("luci_splash", "iface", {net=device, zone="freifunk"})
+       uci:delete_all("luci_splash", "iface", {network=device.."dhcp", zone="freifunk"})

 
        -- Register splash
 
        -- Register splash

-       uci:section("luci_splash", "iface", nil, {net=device, zone="freifunk"})
+       uci:section("luci_splash", "iface", nil, {network=device.."dhcp", zone="freifunk"})

        uci:save("luci_splash")
        uci:save("luci_splash")

+       
+       -- Make sure that luci_splash is enabled
+       sys.exec("/etc/init.d/luci_splash enable")
+
+       -- Remember state
+       uci:set("freifunk", "wizard", "dhcp_splash", "1")
+       uci:save("freifunk")

 end
 
 return f
 end
 
 return f