Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #959 from EricLuehrsen/unbound_odhcpd

Browse source 
unbound: update UCI for odhcpd and hostname
This commit is contained in:
Hannu Nyman 2017-01-24 07:35:48 +02:00 committed by GitHub
commit e7aa7b7d69
1 changed files with 108 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

162
applications/luci-app-unbound/luasrc/model/cbi/unbound.lua
View file

@ -5,26 +5,29 @@
m = Map("unbound", translate("Recursive DNS"),
translate("Unbound is a validating, recursive, and caching DNS resolver."))
s = m:section(TypedSection, "unbound", translate("Unbound Settings"))
s.addremove = false
s.anonymous = true
s:tab("service", translate("Unbound Service"))
s:tab("resource", translate("Unbound Resources"))
s:tab("dnsmasq", translate("Dnsmasq Link"))
s1 = m:section(TypedSection, "unbound")
s1.addremove = false
s1.anonymous = true
s1:tab("service", translate("Basic Settings"))
s1:tab("advanced", translate("Advanced Settings"))
s1:tab("resource", translate("Resource Settings"))
--Enable Unbound
--LuCI or Not
e = s:taboption("service", Flag, "enabled", translate("Enable Unbound:"),
ena = s1:taboption("service", Flag, "enabled", translate("Enable Unbound:"),
translate("Enable the initialization scripts for Unbound"))
e.rmempty = false
ena.rmempty = false
function e.cfgvalue(self, section)
mcf = s1:taboption("service", Flag, "manual_conf", translate("Manual Conf:"),
translate("Skip UCI and use /etc/unbound/unbound.conf"))
mcf.rmempty = false
function ena.cfgvalue(self, section)
return luci.sys.init.enabled("unbound") and self.enabled or self.disabled
end
function e.write(self, section, value)
function ena.write(self, section, value)
if value == "1" then
luci.sys.init.enable("unbound")
luci.sys.call("/etc/init.d/unbound start >/dev/null")
@ -36,72 +39,136 @@ function e.write(self, section, value)
return Flag.write(self, section, value)
end
--Service Tab
--Basic Tab
mcf = s:taboption("service", Flag, "manual_conf", translate("Manual Conf:"),
translate("Skip UCI and use /etc/unbound/unbound.conf"))
mcf.rmempty = false
lsv = s:taboption("service", Flag, "localservice", translate("Local Service:"),
lsv = s1:taboption("service", Flag, "localservice", translate("Local Service:"),
translate("Accept queries only from local subnets"))
lsv.rmempty = false
qry = s:taboption("service", Flag, "query_minimize", translate("Query Minimize:"),
translate("Break down query components for small added privacy"))
qry.rmempty = false
rlh = s:taboption("service", Flag, "rebind_localhost", translate("Block Localhost Rebind:"),
rlh = s1:taboption("service", Flag, "rebind_localhost", translate("Block Localhost Rebind:"),
translate("Prevent upstream response of 127.0.0.0/8"))
rlh.rmempty = false
rpv = s:taboption("service", Flag, "rebind_protection", translate("Block Private Rebind:"),
rpv = s1:taboption("service", Flag, "rebind_protection", translate("Block Private Rebind:"),
translate("Prevent upstream response of RFC1918 ranges"))
rpv.rmempty = false
vld = s:taboption("service", Flag, "validator", translate("Enable DNSSEC:"),
vld = s1:taboption("service", Flag, "validator", translate("Enable DNSSEC:"),
translate("Enable the DNSSEC validator module"))
vld.rmempty = false
nvd = s:taboption("service", Flag, "validator_ntp", translate("DNSSEC NTP Fix:"),
nvd = s1:taboption("service", Flag, "validator_ntp", translate("DNSSEC NTP Fix:"),
translate("Break the loop where DNSSEC needs NTP and NTP needs DNS"))
nvd.rmempty = false
nvd:depends({ validator = true })
eds = s:taboption("service", Value, "edns_size", translate("EDNS Size:"),
eds = s1:taboption("service", Value, "edns_size", translate("EDNS Size:"),
translate("Limit extended DNS packet size"))
eds.datatype = "and(uinteger,min(512),max(4096))"
eds.rmempty = false
prt = s:taboption("service", Value, "listen_port", translate("Listening Port:"),
prt = s1:taboption("service", Value, "listen_port", translate("Listening Port:"),
translate("Choose Unbounds listening port"))
prt.datatype = "port"
prt.rmempty = false
tlm = s:taboption("service", Value, "ttl_min", translate("TTL Minimum:"),
tlm = s1:taboption("service", Value, "ttl_min", translate("TTL Minimum:"),
translate("Prevent excessively short cache periods"))
tlm.datatype = "and(uinteger,min(0),max(600))"
tlm.rmempty = false
d64 = s:taboption("service", Flag, "dns64", translate("Enable DNS64:"),
--Advanced Tab
ctl = s1:taboption("advanced", Flag, "unbound_control", translate("Unbound Control App:"),
translate("Enable unecrypted localhost access for unbound-control"))
ctl.rmempty = false
dlk = s1:taboption("advanced", ListValue, "dhcp_link", translate("DHCP Link:"),
translate("Link to supported programs to load DHCP into DNS"))
dlk:value("none", translate("No Link"))
dlk:value("dnsmasq", "dnsmasq")
dlk:value("odhcpd", "odhcpd")
dlk.rmempty = false
dom = s1:taboption("advanced", Value, "domain", translate("Local Domain:"),
translate("Domain suffix for this router and DHCP clients"))
dom.placeholder = "lan"
dom:depends({ dhcp_link = "none" })
dom:depends({ dhcp_link = "odhcpd" })
dty = s1:taboption("advanced", ListValue, "domain_type", translate("Local Domain Type:"),
translate("How to treat queries of this local domain"))
dty:value("deny", translate("Ignored"))
dty:value("refuse", translate("Refused"))
dty:value("static", translate("Only Local"))
dty:value("transparent", translate("Also Forwarded"))
dty:depends({ dhcp_link = "none" })
dty:depends({ dhcp_link = "odhcpd" })
lfq = s1:taboption("advanced", ListValue, "add_local_fqdn", translate("LAN DNS:"),
translate("How to enter the LAN or local network router in DNS"))
lfq:value("0", translate("No DNS"))
lfq:value("1", translate("Hostname, Primary Address"))
lfq:value("2", translate("Hostname, All Addresses"))
lfq:value("3", translate("Host FQDN, All Addresses"))
lfq:value("4", translate("Interface FQDN, All Addresses"))
lfq:depends({ dhcp_link = "none" })
lfq:depends({ dhcp_link = "odhcpd" })
wfq = s1:taboption("advanced", ListValue, "add_wan_fqdn", translate("WAN DNS:"),
translate("Override the WAN side router entry in DNS"))
wfq:value("0", translate("Upstream"))
wfq:value("1", translate("Hostname, Primary Address"))
wfq:value("2", translate("Hostname, All Addresses"))
wfq:value("3", translate("Host FQDN, All Addresses"))
wfq:value("4", translate("Interface FQDN, All Addresses"))
wfq:depends({ dhcp_link = "none" })
wfq:depends({ dhcp_link = "odhcpd" })
ctl = s1:taboption("advanced", Flag, "dhcp4_slaac6", translate("DHCPv4 to SLAAC:"),
translate("Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)"))
ctl.rmempty = false
d64 = s1:taboption("advanced", Flag, "dns64", translate("Enable DNS64:"),
translate("Enable the DNS64 module"))
d64.rmempty = false
pfx = s:taboption("service", Value, "dns64_prefix", translate("DNS64 Prefix:"),
pfx = s1:taboption("advanced", Value, "dns64_prefix", translate("DNS64 Prefix:"),
translate("Prefix for generated DNS64 addresses"))
pfx.datatype = "ip6addr"
pfx.placeholder = "64:ff9b::/96"
pfx.optional = true
pfx:depends({ dns64 = "1" })
pfx:depends({ dns64 = true })
qry = s1:taboption("advanced", Flag, "query_minimize", translate("Query Minimize:"),
translate("Break down query components for limited added privacy"))
qry.rmempty = false
qrs = s1:taboption("advanced", Flag, "query_min_strict", translate("Strict Minimize:"),
translate("Strict version of 'query minimize' but it can break DNS"))
qrs.rmempty = false
qrs:depends({ query_minimize = true })
--TODO: dnsmasq needs to not reference resolve-file and get off port 53.
--Resource Tuning Tab
rsn = s:taboption("resource", ListValue, "recursion", translate("Recursion Strength:"),
pro = s1:taboption("resource", ListValue, "protocol", translate("Recursion Protocol:"),
translate("Chose the protocol recursion queries leave on"))
pro:value("mixed", translate("IP4 and IP6"))
pro:value("ip6_prefer", translate("IP6 Preferred"))
pro:value("ip4_only", translate("IP4 Only"))
pro:value("ip6_only", translate("IP6 Only"))
pro.rmempty = false
rsn = s1:taboption("resource", ListValue, "recursion", translate("Recursion Strength:"),
translate("Recursion activity affects memory growth and CPU load"))
rsn:value("aggressive", translate("Aggressive"))
rsn:value("default", translate("Default"))
rsn:value("passive", translate("Passive"))
rsn.rmempty = false
rsc = s:taboption("resource", ListValue, "resource", translate("Memory Resource:"),
rsc = s1:taboption("resource", ListValue, "resource", translate("Memory Resource:"),
translate("Use menu System/Processes to observe any memory growth"))
rsc:value("large", translate("Large"))
rsc:value("medium", translate("Medium"))
@ -109,27 +176,14 @@ rsc:value("small", translate("Small"))
rsc:value("tiny", translate("Tiny"))
rsc.rmempty = false
age = s:taboption("resource", Value, "root_age", translate("Root DSKEY Age:"),
ag2 = s1:taboption("resource", Value, "root_age", translate("Root DSKEY Age:"),
translate("Limit days between RFC5011 to reduce flash writes"))
age.datatype = "and(uinteger,min(1),max(99))"
age:value("14", "14")
age:value("28", "28 ("..translate("default")..")")
age:value("45", "45")
age:value("90", "90")
age:value("99", "99 ("..translate("never")..")")
--Dnsmasq Link Tab
dld = s:taboption("dnsmasq", Flag, "dnsmasq_link_dns", translate("Link dnsmasq:"),
translate("Forward queries to dnsmasq for local clients"))
dld.rmempty = false
dgn = s:taboption("dnsmasq", Flag, "dnsmsaq_gate_name", translate("Local Gateway Name:"),
translate("Also query dnsmasq for this hosts outbound gateway"))
dgn.rmempty = false
--TODO: Read only repective dnsmasq options and inform user of link requirements.
--TODO: dnsmasq needs to not reference resolve-file and get off port 53.
ag2.datatype = "and(uinteger,min(1),max(99))"
ag2:value("14", "14")
ag2:value("28", "28 ("..translate("default")..")")
ag2:value("45", "45")
ag2:value("90", "90")
ag2:value("99", "99 ("..translate("never")..")")
return m