diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-02-09 19:44:12 +0200 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-02-12 16:32:41 +0200 |
commit | 29282b5a7d43e8b5ce12b0ec4b7a7620c19a67b6 (patch) | |
tree | a8ad7d5343c41950ff9c8f96a55f41a80271f72a /aconf/modules | |
parent | 07a0eb180872401b271de40190603df8f3ab3db2 (diff) | |
download | aconf-29282b5a7d43e8b5ce12b0ec4b7a7620c19a67b6.tar.bz2 aconf-29282b5a7d43e8b5ce12b0ec4b7a7620c19a67b6.tar.xz |
proper escaping for back-end addresses
Diffstat (limited to 'aconf/modules')
-rw-r--r-- | aconf/modules/dnsmasq.lua | 4 | ||||
-rw-r--r-- | aconf/modules/network.lua | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/aconf/modules/dnsmasq.lua b/aconf/modules/dnsmasq.lua index c61a1f5..5fd831c 100644 --- a/aconf/modules/dnsmasq.lua +++ b/aconf/modules/dnsmasq.lua @@ -1,5 +1,5 @@ --[[ -Copyright (c) 2012-2014 Kaarle Ritvanen +Copyright (c) 2012-2015 Kaarle Ritvanen See LICENSE file for license details --]] @@ -34,7 +34,7 @@ Filter.redirect_address = M.net.IPAddress{ Filter.address = M.Model{model=Address, visible=false} Filter.whitelist = M.Set{ type=M.net.DomainName, - addr='server/@/#/domain/#', + addr='server/@/\\#/domain/#', ui_name='Domain whitelist', widget='inline' } diff --git a/aconf/modules/network.lua b/aconf/modules/network.lua index 188ac28..82a83ef 100644 --- a/aconf/modules/network.lua +++ b/aconf/modules/network.lua @@ -1,5 +1,5 @@ --[[ -Copyright (c) 2012-2014 Kaarle Ritvanen +Copyright (c) 2012-2015 Kaarle Ritvanen See LICENSE file for license details --]] @@ -120,7 +120,7 @@ Interface.class = M.String{ local name = M.node.name(iface) if name == 'lo' then return 'loopback' end - local saddr = M.path.rawjoin('/files', iface_sys_dir, name, '.') + local saddr = M.addr.rawjoin('/files', iface_sys_dir, name, '.') if not txn:get(saddr) then return 'logical' end for _, addr in ipairs{ @@ -128,7 +128,7 @@ Interface.class = M.String{ {saddr, 'bridge'}, {'/files/proc/net/vlan', name} } do - if txn:get(M.path.join(table.unpack(addr))) then + if txn:get(M.addr.join(table.unpack(addr))) then return 'logical' end end @@ -234,10 +234,10 @@ Interface.stats = M.Collection{ type=M.Number{editable=false}, editable=false, addr=function(path) - return M.path.join( - '/files/sys/class/net', M.path.name(path), 'statistics' - ) - end, + return M.addr.join( + '/files/sys/class/net', M.path.name(path), 'statistics' + ) + end, ui_name='Statistics', ui_member='', widget='inline' |