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

Merge pull request #4460 from stangri/master-luci-app-vpn-policy-routing

Browse source 
luci-app-vpn-policy-routing: ACL-related update
This commit is contained in:
Stan 2020-09-21 11:41:14 -07:00 committed by GitHub
commit 482e367e02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 173 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-vpn-policy-routing/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Policy-Based Routing Service Web UI
LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service. LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service.
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=73 PKG_RELEASE:=74
include ../../luci.mk include ../../luci.mk

24
applications/luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua
View file

@ -3,25 +3,31 @@ function index()
if nixio.fs.access("/etc/config/vpn-policy-routing") then if nixio.fs.access("/etc/config/vpn-policy-routing") then
local e = entry({"admin", "vpn"}, firstchild(), _("VPN"), 60) local e = entry({"admin", "vpn"}, firstchild(), _("VPN"), 60)
e.dependent = false e.dependent = false
e.acl_depends = { "luci-app-vpn-policy-routing" }
entry({"admin", "vpn", "vpn-policy-routing"}, cbi("vpn-policy-routing"), _("VPN Policy Routing")).acl_depends = { "luci-app-vpn-policy-routing" } entry({"admin", "vpn", "vpn-policy-routing"}, cbi("vpn-policy-routing"), _("VPN Policy Routing"))
entry({"admin", "vpn", "vpn-policy-routing", "action"}, call("vpn_policy_routing_action"), nil).leaf = true entry({"admin", "vpn", "vpn-policy-routing", "action"}, call("vpn_policy_routing_action"), nil).leaf = true
end end
end end
function vpn_policy_routing_action(name) function vpn_policy_routing_action(name)
local packageName = "vpn-policy-routing" local packageName = "vpn-policy-routing"
local http = require "luci.http"
local sys = require "luci.sys"
local uci = require "luci.model.uci".cursor()
local util = require "luci.util"
if name == "start" then if name == "start" then
luci.sys.init.start(packageName) sys.init.start(packageName)
elseif name == "action" then elseif name == "action" then
luci.util.exec("/etc/init.d/" .. packageName .. " restart >/dev/null 2>&1") util.exec("/etc/init.d/" .. packageName .. " restart >/dev/null 2>&1")
elseif name == "stop" then elseif name == "stop" then
luci.sys.init.stop(packageName) sys.init.stop(packageName)
elseif name == "enable" then elseif name == "enable" then
luci.util.exec("uci set " .. packageName .. ".config.enabled=1; uci commit " .. packageName) uci:set(packageName, "config", "enabled", "1")
uci:commit(packageName)
elseif name == "disable" then elseif name == "disable" then
luci.util.exec("uci set " .. packageName .. ".config.enabled=0; uci commit " .. packageName) uci:set(packageName, "config", "enabled", "0")
uci:commit(packageName)
end end
luci.http.prepare_content("text/plain") http.prepare_content("text/plain")
luci.http.write("0") http.write("0")
end end

16
applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
View file

@ -13,6 +13,20 @@ local dispatcher = require "luci.dispatcher"
local enabledFlag = uci:get(packageName, "config", "enabled") local enabledFlag = uci:get(packageName, "config", "enabled")
local enc local enc
function getPackageVersion()
local opkgFile = "/usr/lib/opkg/status"
local line
local flag = false
for line in io.lines(opkgFile) do
if flag then
return line:match('[%d%.$-]+') or ""
elseif line:find("Package: " .. packageName:gsub("%-", "%%%-")) then
flag = true
end
end
return ""
end
local ubusStatus = util.ubus("service", "list", { name = packageName }) local ubusStatus = util.ubus("service", "list", { name = packageName })
if ubusStatus and ubusStatus[packageName] and if ubusStatus and ubusStatus[packageName] and
ubusStatus[packageName]["instances"] and ubusStatus[packageName]["instances"] and
@ -33,7 +47,7 @@ if ubusStatus and ubusStatus[packageName] and
end end
local serviceRunning, statusText = false, nil local serviceRunning, statusText = false, nil
local packageVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'"))) or "" local packageVersion = getPackageVersion()
if packageVersion == "" then if packageVersion == "" then
statusText = translatef("%s is not installed or not found", packageName) statusText = translatef("%s is not installed or not found", packageName)
end end

6
applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm
View file

@ -1,5 +1,5 @@
<%# <%#
Copyright 2017-2019 Stan Grishin (stangri@melmac.net) Copyright 2017-2020 Stan Grishin (stangri@melmac.net)
This is free software, licensed under the Apache License, Version 2.0 This is free software, licensed under the Apache License, Version 2.0
-%> -%>
@ -11,8 +11,8 @@ This is free software, licensed under the Apache License, Version 2.0
</textarea> </textarea>
<div> <div>
<%- local readmeURL = "https://github.com/openwrt/packages/tree/master/net/vpn-policy-routing/files/README.md" -%> <%- local readmeURL = "https://github.com/openwrt/packages/tree/master/net/vpn-policy-routing/files/README.md" -%>
<%=translatef("Checkmark represents the default gateway. See the %sREADME%s for details.", "<a href=\"" .. readmeURL .. "#a-word-about-default-routing" .. "\" target=\"_blank\">", "</a>")%> <%=translatef("The %s represents the default gateway. See the %sREADME%s for details.", "<strong>✓</strong>", "<a href=\"" .. readmeURL .. "#a-word-about-default-routing" .. "\" target=\"_blank\">", "</a>")%>
</div> </div>
<%+cbi/valuefooter%> <%+cbi/valuefooter%>

219
applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
View file

@ -1,83 +1,78 @@
msgid "" msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8" msgstr "Content-Type: text/plain; charset=UTF-8"
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:49 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:63
msgid "%s (disabled)" msgid "%s (disabled)"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:44 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:58
msgid "%s (strict mode)" msgid "%s (strict mode)"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:38 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:52
msgid "%s is not installed or not found" msgid "%s is not installed or not found"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:183 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:197
msgid "" msgid ""
"%sWARNING:%s Please make sure to check the %sREADME%s before changing " "%sWARNING:%s Please make sure to check the %sREADME%s before changing "
"anything in this section! Change any of the settings below with extreme " "anything in this section! Change any of the settings below with extreme "
"caution!%s" "caution!%s"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:200 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:214
msgid "" msgid ""
"Add an ip rule, not an iptables entry for policies with just the local " "Add an ip rule, not an iptables entry for policies with just the local "
"address. Use with caution to manipulte policies priorities." "address. Use with caution to manipulte policies priorities."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:182 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:196
msgid "Advanced Configuration" msgid "Advanced Configuration"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:185 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:199
msgid "" msgid ""
"Allows to specify the list of interface names (in lower case) to be " "Allows to specify the list of interface names (in lower case) to be "
"explicitly supported by the service. Can be useful if your OpenVPN tunnels " "explicitly supported by the service. Can be useful if your OpenVPN tunnels "
"have dev option other than tun* or tap*." "have dev option other than tun* or tap*."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:188 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:202
msgid "" msgid ""
"Allows to specify the list of interface names (in lower case) to be ignored " "Allows to specify the list of interface names (in lower case) to be ignored "
"by the service. Can be useful if running both VPN server and VPN client on " "by the service. Can be useful if running both VPN server and VPN client on "
"the router." "the router."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:196 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:210
msgid "Append" msgid "Append"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:213 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:227
msgid "Append local IP Tables rules" msgid "Append local IP Tables rules"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:216 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:230
msgid "Append remote IP Tables rules" msgid "Append remote IP Tables rules"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:150 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:164
msgid "Basic Configuration" msgid "Basic Configuration"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:191 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:205
msgid "Boot Time-out" msgid "Boot Time-out"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:324 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:338
msgid "Chain" msgid "Chain"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm:15 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:289
msgid ""
"Checkmark represents the default gateway. See the %sREADME%s for details."
msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:275
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:272
msgid "" msgid ""
"Comment, interface and at least one other field are required. Multiple local " "Comment, interface and at least one other field are required. Multiple local "
"and remote addresses/devices/domains and ports can be space separated. " "and remote addresses/devices/domains and ports can be space separated. "
@ -85,31 +80,31 @@ msgid ""
"fields are left blank." "fields are left blank."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:154 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:168
msgid "Condensed output" msgid "Condensed output"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:145 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:159
msgid "Configuration" msgid "Configuration"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:152 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:166
msgid "Controls both system log and console output verbosity." msgid "Controls both system log and console output verbosity."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:358 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:372
msgid "Custom User File Includes" msgid "Custom User File Includes"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:351 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:365
msgid "DSCP Tag" msgid "DSCP Tag"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:346 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:360
msgid "DSCP Tagging" msgid "DSCP Tagging"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:204 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:218
msgid "Default ICMP Interface" msgid "Default ICMP Interface"
msgstr "" msgstr ""
@ -117,22 +112,22 @@ msgstr ""
msgid "Disable" msgid "Disable"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:166 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:180
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:174 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:188
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:178 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:192
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:201 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:215
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:237 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:251
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:241 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:255
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:248 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:262
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:252 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:266
msgid "Disabled" msgid "Disabled"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:244 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258
msgid "Display these protocols in protocol column in Web UI." msgid "Display these protocols in protocol column in Web UI."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:160 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:174
msgid "Do not enforce policies when their gateway is down" msgid "Do not enforce policies when their gateway is down"
msgstr "" msgstr ""
@ -140,52 +135,52 @@ msgstr ""
msgid "Enable" msgid "Enable"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:179 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:193
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:202 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:216
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:238 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:252
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:242 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:256
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:249 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:263
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:253 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:267
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:269 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:283
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:365 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:379
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:229 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:243
msgid "" msgid ""
"FW Mask used by the service. High mask is used to avoid conflict with SQM/" "FW Mask used by the service. High mask is used to avoid conflict with SQM/"
"QoS. Change with caution together with" "QoS. Change with caution together with"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:204 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:218
msgid "Force the ICMP protocol interface." msgid "Force the ICMP protocol interface."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/root/usr/share/rpcd/acl.d/luci-app-vpn-policy-routing.json:3 #: applications/luci-app-vpn-policy-routing/root/usr/share/rpcd/acl.d/luci-app-vpn-policy-routing.json:3
msgid "Grant UCI access for luci-app-vpn-policy-routing" msgid "Grant UCI and file access for luci-app-vpn-policy-routing"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:200 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:214
msgid "IP Rules Support" msgid "IP Rules Support"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:195 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:209
msgid "IPTables rule option" msgid "IPTables rule option"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:177 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:191
msgid "IPv6 Support" msgid "IPv6 Support"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:188 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:202
msgid "Ignored Interfaces" msgid "Ignored Interfaces"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:197 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:211
msgid "Insert" msgid "Insert"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:333 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:347
msgid "Interface" msgid "Interface"
msgstr "" msgstr ""
@ -193,48 +188,48 @@ msgstr ""
msgid "Loading" msgid "Loading"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:280 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:294
msgid "Local addresses / devices" msgid "Local addresses / devices"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:287 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:301
msgid "Local ports" msgid "Local ports"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:277 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:291
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:205 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:219
msgid "No Change" msgid "No Change"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:152 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:166
msgid "Output verbosity" msgid "Output verbosity"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:368 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:382
msgid "Path" msgid "Path"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:165 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:179
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:173 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:187
msgid "Please check the %sREADME%s before changing this option." msgid "Please check the %sREADME%s before changing this option."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:272
msgid "Policies" msgid "Policies"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:304 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:318
msgid "Protocol" msgid "Protocol"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:292 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:306
msgid "Remote addresses / domains" msgid "Remote addresses / domains"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:297 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:311
msgid "Remote ports" msgid "Remote ports"
msgstr "" msgstr ""
@ -242,101 +237,101 @@ msgstr ""
msgid "Restart" msgid "Restart"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:359 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:373
msgid "" msgid ""
"Run the following user files after setting up but before restarting DNSMASQ. " "Run the following user files after setting up but before restarting DNSMASQ. "
"See the %sREADME%s for details." "See the %sREADME%s for details."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:42 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:56
msgid "Running" msgid "Running"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:159 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:173
msgid "See the %sREADME%s for details." msgid "See the %sREADME%s for details."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:195 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:209
msgid "Select Append for -A and Insert for -I." msgid "Select Append for -A and Insert for -I."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:130 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:144
msgid "Service Errors" msgid "Service Errors"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:224 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:238
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:229 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:243
msgid "Service FW Mask" msgid "Service FW Mask"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:125 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:139
msgid "Service Gateways" msgid "Service Gateways"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:121 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:135
msgid "Service Status" msgid "Service Status"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:120 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:134
msgid "Service Status [%s %s]" msgid "Service Status [%s %s]"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:135 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:149
msgid "Service Warnings" msgid "Service Warnings"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:347 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:361
msgid "" msgid ""
"Set DSCP tags (in range between 1 and 63) for specific interfaces. See the " "Set DSCP tags (in range between 1 and 63) for specific interfaces. See the "
"%sREADME%s for details." "%sREADME%s for details."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:247 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:261
msgid "Show Chain Column" msgid "Show Chain Column"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:236 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:250
msgid "Show Enable Column" msgid "Show Enable Column"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:240 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:254
msgid "Show Protocol Column" msgid "Show Protocol Column"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:251 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:265
msgid "Show Up/Down Buttons" msgid "Show Up/Down Buttons"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:251 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:265
msgid "" msgid ""
"Shows the Up/Down buttons for policies, allowing you to move a policy up or " "Shows the Up/Down buttons for policies, allowing you to move a policy up or "
"down in the list." "down in the list."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:247 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:261
msgid "" msgid ""
"Shows the chain column for policies, allowing you to assign a PREROUTING, " "Shows the chain column for policies, allowing you to assign a PREROUTING, "
"FORWARD, INPUT or OUTPUT chain to a policy." "FORWARD, INPUT or OUTPUT chain to a policy."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:236 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:250
msgid "" msgid ""
"Shows the enable checkbox column for policies, allowing you to quickly " "Shows the enable checkbox column for policies, allowing you to quickly "
"enable/disable specific policy without deleting it." "enable/disable specific policy without deleting it."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:240 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:254
msgid "" msgid ""
"Shows the protocol column for policies, allowing you to assign a specific " "Shows the protocol column for policies, allowing you to assign a specific "
"protocol to a policy." "protocol to a policy."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:213 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:227
msgid "" msgid ""
"Special instructions to append iptables rules for local IPs/netmasks/devices." "Special instructions to append iptables rules for local IPs/netmasks/devices."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:216 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:230
msgid "Special instructions to append iptables rules for remote IPs/netmasks." msgid "Special instructions to append iptables rules for remote IPs/netmasks."
msgstr "" msgstr ""
@ -344,13 +339,13 @@ msgstr ""
msgid "Start" msgid "Start"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:224 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:238
msgid "" msgid ""
"Starting (WAN) FW Mark for marks used by the service. High starting mark is " "Starting (WAN) FW Mark for marks used by the service. High starting mark is "
"used to avoid conflict with SQM/QoS. Change with caution together with" "used to avoid conflict with SQM/QoS. Change with caution together with"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:219 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:233
msgid "Starting (WAN) Table ID number for tables created by the service." msgid "Starting (WAN) Table ID number for tables created by the service."
msgstr "" msgstr ""
@ -358,49 +353,53 @@ msgstr ""
msgid "Stop" msgid "Stop"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:47 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:61
msgid "Stopped" msgid "Stopped"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:158 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:172
msgid "Strict enforcement" msgid "Strict enforcement"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:161 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:175
msgid "Strictly enforce policies when their gateway is down" msgid "Strictly enforce policies when their gateway is down"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:185 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:199
msgid "Supported Interfaces" msgid "Supported Interfaces"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:244 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258
msgid "Supported Protocols" msgid "Supported Protocols"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:153 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:167
msgid "Suppress/No output" msgid "Suppress/No output"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:172 #: applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm:15
msgid "The %s represents the default gateway. See the %sREADME%s for details."
msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:186
msgid "The ipset option for local policies" msgid "The ipset option for local policies"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:164 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:178
msgid "The ipset option for remote policies" msgid "The ipset option for remote policies"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:191 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:205
msgid "" msgid ""
"Time (in seconds) for service to wait for WAN gateway discovery on boot." "Time (in seconds) for service to wait for WAN gateway discovery on boot."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:168 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:182
msgid "Use DNSMASQ ipset" msgid "Use DNSMASQ ipset"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:167 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:181
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:175 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:189
msgid "Use ipset command" msgid "Use ipset command"
msgstr "" msgstr ""
@ -412,27 +411,27 @@ msgstr ""
msgid "VPN Policy Routing" msgid "VPN Policy Routing"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:118 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:132
msgid "VPN and WAN Policy-Based Routing" msgid "VPN and WAN Policy-Based Routing"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:155 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:169
msgid "Verbose output" msgid "Verbose output"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:206 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:220
msgid "WAN" msgid "WAN"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:224 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:238
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:229 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:243
msgid "WAN Table FW Mark" msgid "WAN Table FW Mark"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:219 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:233
msgid "WAN Table ID" msgid "WAN Table ID"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:234 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:248
msgid "Web UI Configuration" msgid "Web UI Configuration"
msgstr "" msgstr ""

31
applications/luci-app-vpn-policy-routing/root/usr/share/rpcd/acl.d/luci-app-vpn-policy-routing.json
View file

@ -1,11 +1,36 @@
{ {
"luci-app-vpn-policy-routing": { "luci-app-vpn-policy-routing": {
"description": "Grant UCI access for luci-app-vpn-policy-routing", "description": "Grant UCI and file access for luci-app-vpn-policy-routing",
"read": { "read": {
"uci": [ "vpn-policy-routing" ] "cgi-io": [
"exec"
],
"file": {
"/usr/lib/opkg/status": [
"read"
],
"/etc/init.d/vpn-policy-routing *": [
"exec"
],
"/usr/bin/grep *": [
"exec"
],
"/usr/sbin/grep *": [
"exec"
],
"/usr/sbin/iptables *": [
"exec"
]
},
"uci": [
"network",
"vpn-policy-routing"
]
}, },
"write": { "write": {
"uci": [ "vpn-policy-routing" ] "uci": [
"vpn-policy-routing"
]
} }
} }
} }