Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Complete migration of random /etc/config.mesh files into UCI (#1743)

This commit is contained in:
Tim Wilkinson 2024-12-03 23:46:32 -08:00 committed by GitHub
parent fb6af52305
commit e824a6cb0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 159 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/app/main/status/e/dhcp.ut
View File

@ -132,7 +132,7 @@ for (let i = 0; i < length(res); i++) {
} }
} }
} }
const f = fs.open(dhcp.leases); const f = fs.open("/tmp/dhcp.leases");
if (f) { if (f) {
for (let l = f.read("line"); length(l); l = f.read("line")) { for (let l = f.read("line"); length(l); l = f.read("line")) {
// ?, mac, ip, name, ? // ?, mac, ip, name, ?

58
files/app/main/status/e/local-services.ut
View File

@ -50,25 +50,29 @@ if (request.env.REQUEST_METHOD === "PUT") {
} }
if ("aliases" in request.args) { if ("aliases" in request.args) {
const aliases = json(request.args.aliases); const aliases = json(request.args.aliases);
const dhcp = configuration.getDHCP(); if (!uciMesh.get("setup", "aliases")) {
let f = fs.open(dhcp.aliases, "w"); uciMesh.set("setup", "aliases", "aliases");
if (f) {
for (let i = 0; i < length(aliases); i++) {
f.write(`${aliases[i]}\n`);
}
f.close();
} }
if (length(aliases)) {
uciMesh.set("setup", "aliases", "alias", aliases);
}
else {
uciMesh.delete("setup", "aliases", "alias");
}
uciMesh.commit("setup");
} }
if ("ports" in request.args) { if ("ports" in request.args) {
const ports = json(request.args.ports); const ports = json(request.args.ports);
const dhcp = configuration.getDHCP(); if (!uciMesh.get("setup", "ports")) {
let f = fs.open(dhcp.ports, "w"); uciMesh.set("setup", "ports", "ports");
if (f) {
for (let i = 0; i < length(ports); i++) {
f.write(`${ports[i]}\n`);
}
f.close();
} }
if (length(ports)) {
uciMesh.set("setup", "ports", "port", ports);
}
else {
uciMesh.delete("setup", "ports", "port");
}
uciMesh.commit("setup");
} }
print(_R("changes")); print(_R("changes"));
return; return;
@ -158,26 +162,20 @@ for (let i = 0; i < length(res); i++) {
} }
} }
} }
let f = fs.open(dhcp.aliases); const als = uciMesh.get("setup", "aliases", "alias") || [];
if (f) { for (let i = 0; i < length(als); i++) {
for (let l = f.read("line"); length(l); l = f.read("line")) { const v = match(trim(als[i]), /^(.+) (.+)$/);
const v = match(trim(l), /^(.+) (.+)$/); if (v) {
if (v) { push(aliases.map, { hostname: v[2], address: v[1] });
push(aliases.map, { hostname: v[2], address: v[1] });
}
} }
f.close();
} }
const ports = []; const ports = [];
f = fs.open(dhcp.ports); const pts = uciMesh.get("setup", "ports", "port") || [];
if (f) { for (let l = 0; l < length(pts); l++) {
for (let l = f.read("line"); length(l); l = f.read("line")) { const m = match(trim(pts[l]), /^(wan|wifi|both):(tcp|udp|both):([0-9\-]+):([.0-9]+):([0-9]+):([01])$/);
const m = match(trim(l), /^(wan|wifi|both):(tcp|udp|both):([0-9\-]+):([.0-9]+):([0-9]+):([01])$/); if (m) {
if (m) { push(ports, { src: m[1], type: m[2], sports: m[3], dst: m[4], dport: m[5], enabled: m[6] === "1" });
push(ports, { src: m[1], type: m[2], sports: m[3], dst: m[4], dport: m[5], enabled: m[6] === "1" });
}
} }
f.close();
} }
%} %}
<div class="dialog"> <div class="dialog">

17
files/app/main/status/e/network.ut
View File

@ -62,27 +62,20 @@ if (request.env.REQUEST_METHOD === "PUT") {
configuration.setSetting("dmz_dhcp_start", 2); configuration.setSetting("dmz_dhcp_start", 2);
configuration.setSetting("dmz_dhcp_end", (2 << (mode - 1)) - 2); configuration.setSetting("dmz_dhcp_end", (2 << (mode - 1)) - 2);
const dhcp = configuration.getDHCP(); const dhcp = configuration.getDHCP();
let f = fs.open(dhcp.aliases); const als = uciMesh.get("setup", "aliases", "alias");
if (f) { if (als) {
const aliases = []; const aliases = [];
const dmz_dhcp_start = (wifi_shift + 2) & 0xff; const dmz_dhcp_start = (wifi_shift + 2) & 0xff;
const dmz_dhcp_end = dmz_dhcp_start + (2 << (mode - 1)) - 4; const dmz_dhcp_end = dmz_dhcp_start + (2 << (mode - 1)) - 4;
const n_lan_ip = iptoarr(dmz_lan_ip); const n_lan_ip = iptoarr(dmz_lan_ip);
for (let l = f.read("line"); length(l); l = f.read("line")) { for (let l = 0; l < length(als); l++) {
const v = match(trim(l), /^(.+) (.+)$/); const v = match(trim(als[l]), /^(.+) (.+)$/);
if (v) { if (v) {
const octet = max(dmz_dhcp_start, min(dmz_dhcp_end, n_lan_ip[3] + iptoarr(v[1])[3] - o_lan_ip[3])); const octet = max(dmz_dhcp_start, min(dmz_dhcp_end, n_lan_ip[3] + iptoarr(v[1])[3] - o_lan_ip[3]));
push(aliases, `${arrtoip([ n_lan_ip[0], n_lan_ip[1], n_lan_ip[2], octet ])} ${v[2]}\n`); push(aliases, `${arrtoip([ n_lan_ip[0], n_lan_ip[1], n_lan_ip[2], octet ])} ${v[2]}\n`);
} }
} }
f.close(); uciMesh.set("setup", "aliases", "alias", aliases);
f = fs.open(dhcp.aliases, "w");
if (f) {
for (let i = 0; i < length(aliases); i++) {
f.write(aliases[i]);
}
f.close();
}
} }
} }
} }

2
files/app/partial/dhcp.ut
View File

@ -39,7 +39,7 @@
let at = 0; let at = 0;
let ao = 0; let ao = 0;
if (dhcp.enabled) { if (dhcp.enabled) {
const f = fs.open(dhcp.leases); const f = fs.open("/tmp/dhcp.leases");
if (f) { if (f) {
while (length(f.read("line"))) { while (length(f.read("line"))) {
da++; da++;

2
files/app/partial/local-services.ut
View File

@ -106,7 +106,7 @@
if (dhcp.enabled) { if (dhcp.enabled) {
const leased = {}; const leased = {};
f = fs.open(dhcp.leases); f = fs.open("/tmp/dhcp.leases");
if (f) { if (f) {
for (let l = f.read("line"); length(l); l = f.read("line")) { for (let l = f.read("line"); length(l); l = f.read("line")) {
const m = split(trim(l), " "); const m = split(trim(l), " ");

82
files/etc/uci-defaults/20_setup_migrate
View File

@ -53,7 +53,6 @@ if not c:get("setup", "globals") and nixio.fs.stat("/etc/config.mesh/_setup") th
end end
end end
end end
c:commit("setup")
end end
-- Migrate the old school _setup.services.{nat,dmz} files -- Migrate the old school _setup.services.{nat,dmz} files
@ -66,15 +65,16 @@ if not c:get("setup", "services") then
else else
file = nil file = nil
end end
c:set("setup", "services", "services")
if file then if file then
local services = {} local services = {}
for line in io.lines(file) for line in io.lines(file)
do do
services[#services + 1] = line services[#services + 1] = line
end end
c:set("setup", "services", "services") if #services > 0 then
c:set("setup", "services", "service", services) c:set("setup", "services", "service", services)
c:commit("setup") end
end end
end end
@ -88,15 +88,16 @@ if not c:get("setup", "dhcpreservations") then
else else
file = nil file = nil
end end
c:set("setup", "dhcpreservations", "dhcpreservations")
if file then if file then
local dhcp = {} local dhcp = {}
for line in io.lines(file) for line in io.lines(file)
do do
dhcp[#dhcp + 1] = line dhcp[#dhcp + 1] = line
end end
c:set("setup", "dhcpreservations", "dhcpreservations") if #dhcp > 0 then
c:set("setup", "dhcpreservations", "reservation", dhcp) c:set("setup", "dhcpreservations", "reservation", dhcp)
c:commit("setup") end
end end
end end
@ -110,15 +111,16 @@ if not c:get("setup", "dhcptags") then
else else
file = nil file = nil
end end
c:set("setup", "dhcptags", "dhcptags")
if file then if file then
local dhcp = {} local dhcp = {}
for line in io.lines(file) for line in io.lines(file)
do do
dhcp[#dhcp + 1] = line dhcp[#dhcp + 1] = line
end end
c:set("setup", "dhcptags", "dhcptags") if #dhcp > 0 then
c:set("setup", "dhcptags", "tag", dhcp) c:set("setup", "dhcptags", "tag", dhcp)
c:commit("setup") end
end end
end end
@ -132,18 +134,67 @@ if not c:get("setup", "dhcpoptions") then
else else
file = nil file = nil
end end
c:set("setup", "dhcpoptions", "dhcpoptions")
if file then if file then
local dhcp = {} local dhcp = {}
for line in io.lines(file) for line in io.lines(file)
do do
dhcp[#dhcp + 1] = line dhcp[#dhcp + 1] = line
end end
c:set("setup", "dhcpoptions", "dhcpoptions") if #dhcp > 0 then
c:set("setup", "dhcpoptions", "option", dhcp) c:set("setup", "dhcpoptions", "option", dhcp)
c:commit("setup") end
end end
end end
-- Migrate the old school _setup.ports.{nat,dmz} files
if not c:get("setup", "ports") then
local file = "/etc/config.mesh/ports."
if (nixio.fs.stat(file .. "nat", "size") or -1) >= 0 then
file = file .. "nat"
elseif (nixio.fs.stat(file .. "dmz", "size") or -1) >= 0 then
file = file .. "dmz"
else
file = nil
end
c:set("setup", "ports", "ports")
if file then
local ports = {}
for line in io.lines(file)
do
ports[#ports + 1] = line
end
if #ports > 0 then
c:set("setup", "ports", "port", ports)
end
end
end
-- Migrate the old school _setup.aliases.{nat,dmz} files
if not c:get("setup", "aliases") then
local file = "/etc/config.mesh/aliases."
if (nixio.fs.stat(file .. "nat", "size") or -1) >= 0 then
file = file .. "nat"
elseif (nixio.fs.stat(file .. "dmz", "size") or -1) >= 0 then
file = file .. "dmz"
else
file = nil
end
c:set("setup", "aliases", "aliases")
if file then
local aliases = {}
for line in io.lines(file)
do
aliases[#aliases + 1] = line
end
if #aliases > 0 then
c:set("setup", "aliases", "alias", aliases)
end
end
end
c:commit("setup")
-- Dont remove this yet otherwise we cannot revert this node -- Dont remove this yet otherwise we cannot revert this node
-- os.remove("/etc/config.mesh/_setup") -- os.remove("/etc/config.mesh/_setup")
-- os.remove("/etc/config.mesh/_setup.service.dmz") -- os.remove("/etc/config.mesh/_setup.service.dmz")
@ -154,6 +205,11 @@ end
-- os.remove("/etc/config.mesh/_setup.dhcptags.nat") -- os.remove("/etc/config.mesh/_setup.dhcptags.nat")
-- os.remove("/etc/config.mesh/_setup.dhcpoptions.dmz") -- os.remove("/etc/config.mesh/_setup.dhcpoptions.dmz")
-- os.remove("/etc/config.mesh/_setup.dhcpoptions.nat") -- os.remove("/etc/config.mesh/_setup.dhcpoptions.nat")
-- os.remove("/etc/config.mesh/_setup.ports.dmz")
-- os.remove("/etc/config.mesh/_setup.ports.nat")
-- os.remove("/etc/config.mesh/aliases.dmz")
-- os.remove("/etc/config.mesh/aliases.nat")
-- os.remove("/etc/config.mesh/aliases")
__EOF__ __EOF__
/usr/bin/lua /tmp/setup_migrate /usr/bin/lua /tmp/setup_migrate

6
files/usr/lib/lua/aredn/services.lua
View File

@ -183,11 +183,11 @@ local function get(validate)
-- Load NAT -- Load NAT
local nat = nil local nat = nil
if dmz_mode == "0" then if dmz_mode == "0" then
local portfile = "/etc/config.mesh/_setup.ports.nat" local ports = uci.cursor("/etc/config.mesh"):get_all("setup", "ports", "port")
if nixio.fs.access(portfile) then if ports then
nat = {} nat = {}
local lname = name:lower() .. ".local.mesh" local lname = name:lower() .. ".local.mesh"
for line in io.lines(portfile) for _, line in ipairs(ports)
do do
local _, type, sport, addr, dport, enable = line:match("^(.+):(.+):(.+):(.+):(%d+):(%d)$") local _, type, sport, addr, dport, enable = line:match("^(.+):(.+):(.+):(.+):(%d+):(%d)$")
if enable == "1" then if enable == "1" then

127
files/usr/local/bin/node-setup
View File

@ -307,29 +307,6 @@ do
end end
end end
-- select ports and dhcp files based on mode
local portfile = "/etc/config.mesh/_setup.ports"
local aliasfile = "/etc/config.mesh/aliases"
if is_nat_mode() then
portfile = portfile .. ".nat"
aliasfile = aliasfile .. ".nat"
else
portfile = portfile .. ".dmz"
aliasfile = aliasfile .. ".dmz"
end
-- check for old aliases file, copy it to .dmz and create symlink
-- just in case anyone is already using the file for some script or something
if not nixio.fs.readlink("/etc/config.mesh/aliases") then
if nixio.fs.stat("/etc/config.mesh/aliases") then
filecopy("/etc/config.mesh/aliases", "/etc/config.mesh/aliases.dmz")
os.remove("/etc/config.mesh/aliases")
else
io.open("/etc/config.mesh/aliases.dmz", "a"):close()
end
nixio.fs.symlink("aliases.dmz", "/etc/config.mesh/aliases")
end
-- generate the new school bridge configuration -- generate the new school bridge configuration
if nixio.fs.stat("/etc/aredn_include/bridge.network.user") then if nixio.fs.stat("/etc/aredn_include/bridge.network.user") then
cfg.bridge_network_config = expand_vars(read_all("/etc/aredn_include/bridge.network.user")) cfg.bridge_network_config = expand_vars(read_all("/etc/aredn_include/bridge.network.user"))
@ -703,50 +680,47 @@ if fw then
end end
end end
if nixio.fs.access(portfile) then local ports = cm:get_all("setup", "ports", "port") or {}
for line in io.lines(portfile) for _, line in ipairs(ports)
do do
if not (line:match("^%s*#") or line:match("^%s*$")) then local dip = line:match("dmz_ip = (%w+)")
local dip = line:match("dmz_ip = (%w+)") if dip and is_dmz_mode() then
if dip and is_dmz_mode() then fw:write("\nconfig redirect\n option src wifi\n option proto tcp\n option src_dip " .. cfg.wifi_ip .. "\n option dest_ip " .. dip .. "\n")
fw:write("\nconfig redirect\n option src wifi\n option proto tcp\n option src_dip " .. cfg.wifi_ip .. "\n option dest_ip " .. dip .. "\n") fw:write("\nconfig redirect\n option src wifi\n option proto udp\n option src_dip " .. cfg.wifi_ip .. "\n option dest_ip " .. dip .. "\n")
fw:write("\nconfig redirect\n option src wifi\n option proto udp\n option src_dip " .. cfg.wifi_ip .. "\n option dest_ip " .. dip .. "\n") else
else local intf, type, oport, host, iport, enable = line:match("(.*):(.*):(.*):(.*):(.*):(.*)")
local intf, type, oport, host, iport, enable = line:match("(.*):(.*):(.*):(.*):(.*):(.*)") if enable == "1" then
if enable == "1" then local match = "option src_dport " .. oport .. "\n"
local match = "option src_dport " .. oport .. "\n" if type == "tcp" then
if type == "tcp" then match = match .. " option proto tcp\n"
match = match .. " option proto tcp\n" elseif type == "udp" then
elseif type == "udp" then match = match .. " option proto udp\n"
match = match .. " option proto udp\n" end
end -- uci the host and then
-- uci the host and then -- set the inside port unless the rule uses an outside port range
-- set the inside port unless the rule uses an outside port range host = "option dest_ip " .. host .. "\n"
host = "option dest_ip " .. host .. "\n" if not oport:match("-") then
if not oport:match("-") then host = host .. " option dest_port " .. iport .. "\n"
host = host .. " option dest_port " .. iport .. "\n" end
end if is_dmz_mode() and intf == "both" then
if is_dmz_mode() and intf == "both" then intf = "wan"
intf = "wan" end
end if intf == "both" then
if intf == "both" then fw:write("\nconfig redirect\n option src wifi\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
fw:write("\nconfig redirect\n option src wifi\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n") fw:write("\nconfig redirect\n option src dtdlink\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
fw:write("\nconfig redirect\n option src dtdlink\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n") if vpnzone then
if vpnzone then fw:write("\nconfig redirect\n option src vpn\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
fw:write("\nconfig redirect\n option src vpn\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
end
fw:write("config redirect\n option src wan\n option dest lan\n " .. match .. " " .. host .. "\n")
elseif intf == "wifi" and is_nat_mode() then
fw:write("\nconfig redirect\n option src dtdlink\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
fw:write("\nconfig redirect\n option src wifi\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
if vpnzone then
fw:write("\nconfig redirect\n option src vpn\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
end
elseif intf == "wan" then
fw:write("\nconfig redirect\n option src dtdlink\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
fw:write("config redirect\n option src wan\n option dest lan\n " .. match .. " " .. host .. "\n")
end
end end
fw:write("config redirect\n option src wan\n option dest lan\n " .. match .. " " .. host .. "\n")
elseif intf == "wifi" and is_nat_mode() then
fw:write("\nconfig redirect\n option src dtdlink\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
fw:write("\nconfig redirect\n option src wifi\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
if vpnzone then
fw:write("\nconfig redirect\n option src vpn\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
end
elseif intf == "wan" then
fw:write("\nconfig redirect\n option src dtdlink\n option dest lan\n " .. match .. " option src_dip " .. cfg.wifi_ip .. "\n " .. host .. "\n")
fw:write("config redirect\n option src wan\n option dest lan\n " .. match .. " " .. host .. "\n")
end end
end end
end end
@ -1081,21 +1055,16 @@ if h and e then
-- aliases need to ba added to /etc/hosts or they will now show up on the localnode -- aliases need to ba added to /etc/hosts or they will now show up on the localnode
-- nor will the services thehy offer -- nor will the services thehy offer
-- also add a comment to the hosts file so we can display the aliases differently if needed -- also add a comment to the hosts file so we can display the aliases differently if needed
local f = io.open(aliasfile, "r") local aliases = cm:get_all("setup", "aliases", "alias") or {}
if f then for _, line in ipairs(aliases)
for line in f:lines() do
do local ip, host = line:match("(%S+)%s+(%S+)")
if not (line:match("^%s*#") or line:match("^%s*$")) then if ip then
local ip, host = line:match("(%S+)%s+(%S+)") if host:match("%.") and not host:match("%.local%.mesh$") then
if ip then host = host .. ".local.mesh"
if host:match("%.") and not host:match("%.local%.mesh$") then
host = host .. ".local.mesh"
end
h:write(ip .. "\t" .. host .. " #ALIAS\n")
end
end end
h:write(ip .. "\t" .. host .. " #ALIAS\n")
end end
f:close()
end end
h:write("\n") h:write("\n")

15
files/usr/share/ucode/aredn/configuration.uc
View File

@ -219,10 +219,7 @@ export function getDHCP(mode)
end: `${i[0]}.${i[1]}.${(e >> 8) & 255}.${e & 255}`, end: `${i[0]}.${i[1]}.${(e >> 8) & 255}.${e & 255}`,
gateway: setup.lan_ip, gateway: setup.lan_ip,
mask: setup.lan_mask, mask: setup.lan_mask,
cidr: network.netmaskToCIDR(setup.lan_mask), cidr: network.netmaskToCIDR(setup.lan_mask)
leases: "/tmp/dhcp.leases",
ports: "/etc/config.mesh/_setup.ports.nat",
aliases: "/etc/config.mesh/aliases.nat"
}; };
} }
else if (setup.dmz_mode === "1") { else if (setup.dmz_mode === "1") {
@ -239,10 +236,7 @@ export function getDHCP(mode)
end: `${i[0]}.${i[1]}.${(e >> 8) & 255}.${e & 255}`, end: `${i[0]}.${i[1]}.${(e >> 8) & 255}.${e & 255}`,
gateway: setup.lan_ip, gateway: setup.lan_ip,
mask: setup.lan_mask, mask: setup.lan_mask,
cidr: network.netmaskToCIDR(setup.lan_mask), cidr: network.netmaskToCIDR(setup.lan_mask)
leases: "/tmp/dhcp.leases",
ports: "/etc/config.mesh/_setup.ports.dmz",
aliases: "/etc/config.mesh/aliases.dmz"
}; };
} }
else { else {
@ -259,10 +253,7 @@ export function getDHCP(mode)
end: `${i[0]}.${i[1]}.${(e >> 8) & 255}.${e & 255}`, end: `${i[0]}.${i[1]}.${(e >> 8) & 255}.${e & 255}`,
gateway: setup.dmz_lan_ip, gateway: setup.dmz_lan_ip,
mask: setup.dmz_lan_mask, mask: setup.dmz_lan_mask,
cidr: network.netmaskToCIDR(setup.dmz_lan_mask), cidr: network.netmaskToCIDR(setup.dmz_lan_mask)
leases: "/tmp/dhcp.leases",
ports: "/etc/config.mesh/_setup.ports.dmz",
aliases: "/etc/config.mesh/aliases.dmz"
}; };
} }
}; };