* luci/app/coovachilly: cbi model fixes, extended scheme

4 files changed, 299 insertions, 41 deletions

diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
index 33c6efeded..eb61519968 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
+++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_auth.lua
@@ -35,7 +35,7 @@ s1:option( Value, "uamhomepage" ).optional = true
 s1:option( Value, "uamlisten" ).optional = true
 s1:option( Value, "uamport" ).optional = true
 s1:option( Value, "uamiport" ).optional = true
-s1:option( Value, "uamdomain" ).optional = true
+s1:option( DynamicList, "uamdomain" ).optional = true
 s1:option( Value, "uamlogoutip" ).optional = true
 s1:option( DynamicList, "uamallowed" ).optional = true
 s1:option( Value, "uamui" ).optional = true
diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua
index 2209a52302..e3351ab000 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua
+++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_network.lua
@@ -67,5 +67,7 @@ s2:option( Value, "lease" ).optional = true
 s2:option( Value, "dhcpstart" ).optional = true
 s2:option( Value, "dhcpend" ).optional = true
 
+s2:option( Flag, "eapolenable" )
+
 
 return m
diff --git a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
index 195a8cc87e..ee838b0864 100644
--- a/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
+++ b/applications/luci-coovachilli/luasrc/model/cbi/coovachilli_radius.lua
@@ -52,8 +52,6 @@ s1:option( Flag, "acctupdate" )
 s1:option( Value, "coaport" ).optional = true
 s1:option( Flag, "coanoipcheck" )
 
-s1:option( Flag, "eapolenable" ).optional = true
-
 
 -- radius proxy
 s2 = m:section(TypedSection, "proxy")
diff --git a/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli b/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli
index f006c76024..d6c2c2928d 100644
--- a/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli
+++ b/applications/luci-coovachilli/root/lib/uci/schema/default/coovachilli
@@ -3,158 +3,233 @@ package coovachilli
 config section
 	option name	'general'
 	option title	'Section general'
+	option description	'General CoovaChilli settings'
 	option package	'coovachilli'
 	option unique	true
 	option required	true
 
 config variable
-	option name	'debug'
-	option title	'Option debug'
-	option section	'coovachilli.general'
-	option datatype	'boolean'
-
-config variable
 	option name	'interval'
-	option title	'Option interval'
+	option title	'Config refresh interval'
+	option description	'Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. '
 	option section	'coovachilli.general'
 	option datatype	'uint'
 
 config variable
 	option name	'pidfile'
-	option title	'Option pidfile'
+	option title	'Pid file'
+	option description	'Filename to put the process id'
 	option section	'coovachilli.general'
 	option datatype	'string'
 
 config variable
 	option name	'statedir'
-	option title	'Option statedir'
+	option title	'State directory'
+	option description	'Directory of non-volatile data'
 	option section	'coovachilli.general'
 	option datatype	'directory'
 
+config variable
+	option name	'cmdsock'
+	option title	'Command socket'
+	option description	'UNIX socket used for communication with chilli_query'
+	option section	'coovachilli.general'
+	option datatype	'string'
+
 
 config section
 	option name	'tun'
 	option title	'Section tun'
+	option description	'Network/Tun configuration'
 	option package	'coovachilli'
 	option unique	true
 	option required	true
 
 config variable
+	option name	'txqlen'
+	option title	'TX queue length'
+	option description	'The TX queue length to set on the TUN/TAP interface'
+	option section	'coovachilli.tun'
+	option datatype	'uint'
+
+config variable
+	option name	'usetap'
+	option title	'Use TAP device'
+	option description	'Use the TAP interface instead of TUN'
+	option section	'coovachilli.tun'
+	option datatype	'boolean'
+
+config variable
+	option name	'tundev'
+	option title	'TUN/TAP device'
+	option description	'The specific device to use for the TUN/TAP interface'
+	option section	'coovachilli.tun'
+	option datatype	'file'
+
+config variable
 	option name	'net'
-	option title	'Option net'
+	option title	'Uplink subnet'
+	option description	'Network address of the uplink interface (CIDR notation)'
 	option section	'coovachilli.tun'
 	option datatype	'ip4addr'
 
 config variable
 	option name	'statip'
-	option title	'Option statip'
+	option title	'Static IP address pool'
+	option description	'Specifies a pool of static IP addresses'
 	option section	'coovachilli.tun'
 	option datatype	'ip4addr'
 
 config variable
 	option name	'dynip'
-	option title	'Option dynip'
+	option title	'Dynamic IP address pool'
+	option description	'Specifies a pool of dynamic IP addresses'
 	option section	'coovachilli.tun'
 	option datatype	'ip4addr'
 
 config variable
 	option name	'dns1'
-	option title	'Option dns1'
+	option title	'Primary DNS Server'
+	option description	'Is used to inform the client about the DNS address to use for host name resolution'
 	option section	'coovachilli.tun'
-	option datatype	'ip4addr'
+	option datatype	'host'
 
 config variable
 	option name	'dns2'
-	option title	'Option dns2'
+	option title	'Secondary DNS Server'
+	option description	'Is used to inform the client about the DNS address to use for host name resolution'
 	option section	'coovachilli.tun'
-	option datatype	'ip4addr'
+	option datatype	'host'
 
 config variable
 	option name	'domain'
-	option title	'Option domain'
+	option title	'Domain name'
+	option description	'Is used to inform the client about the domain name to use for DNS lookups'
 	option section	'coovachilli.tun'
 	option datatype	'string'
 
 config variable
 	option name	'ipdown'
-	option title	'Option ipdown'
+	option title	'IP down script'
+	option description	'Script executed after the tun network interface has been taken down'
 	option section	'coovachilli.tun'
 	option datatype	'file'
 
 config variable
 	option name	'ipup'
-	option title	'Option ipup'
+	option title	'IP up script'
+	option description	'Script executed after the TUN/TAP network interface has been brought up'
 	option section	'coovachilli.tun'
 	option datatype	'file'
 
 config variable
 	option name	'condown'
-	option title	'Option condown'
+	option title	'Network down script'
+	option description	'Script executed after a session has moved from authorized state to unauthorized'
 	option section	'coovachilli.tun'
 	option datatype	'file'
 
 config variable
 	option name	'conup'
-	option title	'Option conup'
+	option title	'Network up script'
+	option description	'Script executed after the tun network interface has been brought up'
 	option section	'coovachilli.tun'
 	option datatype	'file'
 
 
 config section
 	option name	'dhcp'
-	option title	'Section dhcp'
+	option title	'DHCP configuration'
+	option description	'Set DHCP options for connecting clients'
 	option package	'coovachilli'
 	option unique	true
 	option required	true
 
 config variable
 	option name	'dhcpif'
-	option title	'Option dhcpif'
+	option title	'DHCP interface'
+	option description	'Ethernet interface to listen to for the downlink interface'
 	option section	'coovachilli.dhcp'
 	option datatype	'string'
+	option required	true
 
 config variable
 	option name	'dhcpmac'
-	option title	'Option dhcpmac'
+	option title	'Listen MAC address'
+	option description	'MAC address to listen to. If not specified the MAC address of the interface will be used'
 	option section	'coovachilli.dhcp'
 	option datatype	'macaddr'
 
 config variable
 	option name	'lease'
-	option title	'Option lease'
+	option title	'Leasetime'
+	option description	'Use a DHCP lease of seconds (default 600)'
 	option section	'coovachilli.dhcp'
 	option datatype	'uint'
 
+config variable
+	option name	'dhcpstart'
+	option title	'DHCP start number'
+	option description	'Where to start assigning IP addresses (default 10)'
+	option section	'coovachilli.dhcp'
+	option datatype	'uint'
+
+config variable
+	option name	'dhcpend'
+	option title	'DHCP end number'
+	option description	'Where to stop assigning IP addresses (default 254)'
+	option section	'coovachilli.dhcp'
+	option datatype	'uint'
+
+config variable
+	option name	'eapolenable'
+	option title	'Enable IEEE 802.1x'
+	option description	'Enable IEEE 802.1x authentication and listen for EAP requests'
+	option section	'coovachilli.dhcp'
+	option datatype	'boolean'
+
 
 config section
 	option name	'macauth'
 	option title	'Section macauth'
+	option description	'Configure MAC authentication'
 	option package	'coovachilli'
 	option unique	true
 	option required	true
 
 config variable
 	option name	'macauth'
-	option title	'Option macauth'
+	option title	'Enable MAC authentification'
+	option description	'Try to authenticate all users based on their mac address alone'
+	option section	'coovachilli.macauth'
+	option datatype	'boolean'
+
+config variable
+	option name	'macallowlocal'
+	option title	'Authenticate locally allowed MACs'
+	option description	'Authenticate allowed MAC addresses without the use of RADIUS'
 	option section	'coovachilli.macauth'
 	option datatype	'boolean'
 
 config variable
 	option name	'macallowed'
-	option title	'Option macallowed'
+	option title	'Allowed MAC addresses'
+	option description	'List of MAC addresses for which MAC authentication will be performed'
 	option section	'coovachilli.macauth'
 	option datatype	'string'
 	option type	'lazylist'
 
 config variable
 	option name	'macpasswd'
-	option title	'Option macpasswd'
+	option title	'Password'
+	option description	'Password used when performing MAC authentication'
 	option section	'coovachilli.macauth'
 	option datatype	'string'
 
 config variable
 	option name	'macsuffix'
-	option title	'Option macsuffix'
+	option title	'Suffix'
+	option description	'Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server'
 	option section	'coovachilli.macauth'
 	option datatype	'string'
 
@@ -162,73 +237,92 @@ config variable
 config section
 	option name	'radius'
 	option title	'Section radius'
+	option description	''
 	option package	'coovachilli'
 	option unique	true
 	option required	true
 
 config variable
+	option name	'acctupdate'
+	option title	'Allow session update through RADIUS'
+	option description	'Allow updating of session parameters with RADIUS attributes sent in Accounting-Response'
+	option section	'coovachilli.radius'
+	option datatype	'boolean'
+
+config variable
 	option name	'radiusacctport'
 	option title	'Option radiusacctport'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'port'
 
 config variable
 	option name	'radiusauthport'
 	option title	'Option radiusauthport'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'port'
 
 config variable
 	option name	'radiuscalled'
 	option title	'Option radiuscalled'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'string'
 
 config variable
 	option name	'radiuslisten'
 	option title	'Option radiuslisten'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'ip4addr'
 
 config variable
 	option name	'radiuslocationid'
 	option title	'Option radiuslocationid'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'string'
 
 config variable
 	option name	'radiuslocationname'
 	option title	'Option radiuslocationname'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'string'
 
 config variable
 	option name	'radiusnasid'
 	option title	'Option radiusnasid'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'string'
 
 config variable
 	option name	'radiusnasip'
 	option title	'Option radiusnasip'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'ip4addr'
 
 config variable
 	option name	'radiussecret'
 	option title	'Option radiussecret'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'string'
 
 config variable
 	option name	'radiusserver1'
 	option title	'Option radiusserver1'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'host'
 
 config variable
 	option name	'radiusserver2'
 	option title	'Option radiusserver2'
+	option description	''
 	option section	'coovachilli.radius'
 	option datatype	'host'
 
@@ -236,6 +330,7 @@ config variable
 config section
 	option name	'proxy'
 	option title	'Section proxy'
+	option description	''
 	option package	'coovachilli'
 	option unique	true
 	option required	true
@@ -243,24 +338,28 @@ config section
 config variable
 	option name	'proxyclient'
 	option title	'Option proxyclient'
+	option description	''
 	option section	'coovachilli.proxy'
 	option datatype	'ip4addr'
 
 config variable
 	option name	'proxylisten'
 	option title	'Option proxylisten'
+	option description	''
 	option section	'coovachilli.proxy'
 	option datatype	'ip4addr'
 
 config variable
 	option name	'proxyport'
 	option title	'Option proxyport'
+	option description	''
 	option section	'coovachilli.proxy'
 	option datatype	'port'
 
 config variable
 	option name	'proxysecret'
 	option title	'Option proxysecret'
+	option description	''
 	option section	'coovachilli.proxy'
 	option datatype	'string'
 
@@ -268,6 +367,7 @@ config variable
 config section
 	option name	'remoteconfig'
 	option title	'Section remoteconfig'
+	option description	''
 	option package	'coovachilli'
 	option unique	true
 	option required	true
@@ -275,56 +375,214 @@ config section
 config variable
 	option name	'confpassword'
 	option title	'Option confpassword'
+	option description	''
 	option section	'coovachilli.remoteconfig'
 	option datatype	'string'
 
 config variable
 	option name	'confusername'
 	option title	'Option confusername'
+	option description	''
 	option section	'coovachilli.remoteconfig'
 	option datatype	'string'
 
 
 config section
 	option name	'uam'
-	option title	'Section uam'
+	option title	'UAM settings'
+	option description	'Unified Configuration Method settings'
 	option package	'coovachilli'
 	option unique	true
 	option required	true
 
 config variable
+	option name	'uamanydns'
+	option title	'Allow any DNS server'
+	option description	'Allow any DNS server for unauthenticated clients'
+	option section	'coovachilli.uam'
+	option datatype	'boolean'
+
+config variable
+	option name	'uamanyip'
+	option title	'Allow any IP address'
+	option description	'Allow clients to use any IP settings they wish by spoofing ARP (experimental)'
+	option section	'coovachilli.uam'
+	option datatype	'boolean'
+
+config variable
+	option name	'dnsparanoia'
+	option title	'Inspect DNS traffic'
+	option description	'Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)'
+	option section	'coovachilli.uam'
+	option datatype	'boolean'
+
+config variable
+	option name	'nouamsuccess'
+	option title	'Do not redirect to UAM server'
+	option description	'Do not return to UAM server on login success, just redirect to original URL'
+	option section	'coovachilli.uam'
+	option datatype	'boolean'
+
+config variable
+	option name	'nouamwispr'
+	option title	'Do not do WISPr'
+	option description	'Do not do any WISPr XML, assume the back-end is doing this instead'
+	option section	'coovachilli.uam'
+	option datatype	'boolean'
+
+config variable
+	option name	'usestatusfile'
+	option title	'Use status file'
+	option description	'Write the status of clients in a non-volatile state file (experimental)'
+	option section	'coovachilli.uam'
+	option datatype	'boolean'
+
+config variable
+	option name	'chillixml'
+	option title	'Use Chilli XML'
+	option description	'Return the so-called Chilli XML along with WISPr XML'
+	option section	'coovachilli.uam'
+	option datatype	'boolean'
+
+config variable
+	option name	'uamui'
+	option title	'UAM user interface'
+	option description	'An init.d style program to handle local content on the uamuiport web server'
+	option section	'coovachilli.uam'
+	option datatype	'file'
+
+config variable
 	option name	'uamallowed'
-	option title	'Option uamallowed'
+	option title	'Allowed resources'
+	option description	'List of resources the client can access without first authenticating'
 	option section	'coovachilli.uam'
-	option datatype	'host'
+	option datatype	'string'
+	option type	'list'
+
+config variable
+	option name	'uamdomain'
+	option title	'Allowed domains'
+	option description	'Defines a list of domain names to automatically add to the walled garden'
+	option section	'coovachilli.uam'
+	option datatype	'string'
 	option type	'list'
 
 config variable
 	option name	'uamhomepage'
-	option title	'Option uamhomepage'
+	option title	'UAM homepage'
+	option description	'URL of homepage to redirect unauthenticated users to'
 	option section	'coovachilli.uam'
 	option datatype	'string'
 
 config variable
 	option name	'uamlisten'
-	option title	'Option uamlisten'
+	option title	'UAM listening address'
+	option description	'IP address to listen to for authentication of clients'
 	option section	'coovachilli.uam'
-	option datatype	'ip4addr'
+	option datatype	'host'
 
 config variable
 	option name	'uamport'
-	option title	'Option uamport'
+	option title	'UAM listening port'
+	option description	'TCP port to bind to for authenticating clients (default 3990)'
+	option section	'coovachilli.uam'
+	option datatype	'port'
+
+config variable
+	option name	'uamiport'
+	option title	'UAM static content port'
+	option description	'TCP port to bind to for only serving embedded content'
 	option section	'coovachilli.uam'
 	option datatype	'port'
 
 config variable
 	option name	'uamsecret'
-	option title	'Option uamsecret'
+	option title	'UAM secret'
+	option description	'Shared secret between uamserver and chilli'
 	option section	'coovachilli.uam'
 	option datatype	'string'
+	option required	true
 
 config variable
 	option name	'uamserver'
-	option title	'Option uamserver'
+	option title	'UAM server'
+	option description	'URL of web server to use for authenticating clients'
 	option section	'coovachilli.uam'
 	option datatype	'string'
+
+config variable
+	option name	'uamlogoutip'
+	option title	'UAM logout IP'
+	option description	'Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)'
+	option section	'coovachilli.uam'
+	option datatype	'ip4addr'
+
+config variable
+	option name	'wisprlogin'
+	option title	'WISPr login url'
+	option description	'Specific URL to be given in WISPr XML LoginURL'
+	option section	'coovachilli.uam'
+	option datatype	'string'
+
+config variable
+	option name	'defsessiontimeout'
+	option title	'Default session timeout'
+	option description	'Default session timeout unless otherwise set by RADIUS (defaults to 0)'
+	option section	'coovachilli.uam'
+	option datatype	'uint'
+
+config variable
+	option name	'defidletimeout'
+	option title	'Default idle timeout'
+	option description	'Default idle timeout unless otherwise set by RADIUS (defaults to 0)'
+	option section	'coovachilli.uam'
+	option datatype	'uint'
+
+config variable
+	option name	'definteriminterval'
+	option title	'Default interim interval'
+	option description	'Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)'
+	option section	'coovachilli.uam'
+	option datatype	'uint'
+
+config variable
+	option name	'wwwdir'
+	option title	'Web content directory'
+	option description	'Directory where embedded local web content is placed'
+	option section	'coovachilli.uam'
+	option datatype	'directory'
+
+config variable
+	option name	'wwwbin'
+	option title	'CGI program'
+	option description	'Executable to run as a CGI type program (like haserl) for URLs with extention .chi'
+	option section	'coovachilli.uam'
+	option datatype	'file'
+
+config variable
+	option name	'localusers'
+	option title	'Local users file'
+	option description	'A colon seperated file containing usernames and passwords of locally authenticated users'
+	option section	'coovachilli.uam'
+	option datatype	'file'
+
+config variable
+	option name	'postauthproxy'
+	option title	'Post auth proxy'
+	option description	'Used with postauthproxyport to define a post authentication HTTP proxy server'
+	option section	'coovachilli.uam'
+	option datatype	'file'
+
+config variable
+	option name	'postauthproxyport'
+	option title	'Post auth proxy port'
+	option description	'Used with postauthproxy to define a post authentication HTTP proxy server'
+	option section	'coovachilli.uam'
+	option datatype	'file'
+
+config variable
+	option name	'locationname'
+	option title	'Location name'
+	option description	'Human readable location name used in JSON interface'
+	option section	'coovachilli.uam'
+	option datatype	'file'