Merge pull request #3827 from stangri/18.06-luci-app-vpnbypass
[18.06] luci-app-vpnbypass: better service control & buttons styling
This commit is contained in:
Hannu Nyman
GitHub
commit
be69e1ac46
8 changed files with 159 additions and 90 deletions
|
|
@ -8,9 +8,9 @@ PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
|
|||
|
||||
LUCI_TITLE:=VPN Bypass Web UI
|
||||
LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
|
||||
LUCI_DEPENDS:=+luci-mod-admin-full +vpnbypass
|
||||
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpnbypass
|
||||
LUCI_PKGARCH:=all
|
||||
PKG_RELEASE:=13
|
||||
PKG_RELEASE:=16
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
module("luci.controller.vpnbypass", package.seeall)
|
||||
function index()
|
||||
if nixio.fs.access("/etc/config/vpnbypass") then
|
||||
local node = "services"
|
||||
if luci.dispatcher.lookup("admin/vpn") then node = "vpn" end
|
||||
entry({"admin", node, "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
|
||||
entry({"admin", node, "vpnbypass", "action"}, call("vpnbypass_action"), nil).leaf = true
|
||||
entry({"admin", "vpn"}, firstchild(), _("VPN"), 60).dependent=false
|
||||
entry({"admin", "vpn", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
|
||||
entry({"admin", "vpn", "vpnbypass", "action"}, call("vpnbypass_action"), nil).leaf = true
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -13,7 +12,7 @@ function vpnbypass_action(name)
|
|||
if name == "start" then
|
||||
luci.sys.init.start(packageName)
|
||||
elseif name == "action" then
|
||||
luci.util.exec("/etc/init.d/" .. packageName .. " reload >/dev/null 2>&1")
|
||||
luci.util.exec("/etc/init.d/" .. packageName .. " restart >/dev/null 2>&1")
|
||||
luci.util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
|
||||
elseif name == "stop" then
|
||||
luci.sys.init.stop(packageName)
|
||||
|
|
|
|||
|
|
@ -4,27 +4,42 @@ local sys = require "luci.sys"
|
|||
local util = require "luci.util"
|
||||
local packageName = "vpnbypass"
|
||||
|
||||
local tmpfsVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'")))
|
||||
if not tmpfsVersion or tmpfsVersion == "" then
|
||||
tmpfsStatusCode = -1
|
||||
tmpfsVersion = ""
|
||||
tmpfsStatus = packageName .. " " .. translate("is not installed or not found")
|
||||
local packageVersion, statusText = nil, nil
|
||||
packageVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'")))
|
||||
if not packageVersion or packageVersion == "" then
|
||||
packageVersion = ""
|
||||
statusText = packageName .. " " .. translate("is not installed or not found")
|
||||
else
|
||||
tmpfsVersion = " [" .. packageName .. " " .. tmpfsVersion .. "]"
|
||||
packageVersion = " [" .. packageName .. " " .. packageVersion .. "]"
|
||||
end
|
||||
local tmpfsStatus = "Stopped"
|
||||
if sys.call("iptables -t mangle -L | grep -q VPNBYPASS") == 0 then
|
||||
tmpfsStatus = "Running"
|
||||
|
||||
local serviceRunning, serviceEnabled = false, false
|
||||
if uci:get(packageName, "config", "enabled") == "1" then
|
||||
serviceEnabled = true
|
||||
end
|
||||
if sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then
|
||||
serviceRunning = true
|
||||
end
|
||||
|
||||
if serviceRunning then
|
||||
statusText = translate("Running")
|
||||
else
|
||||
statusText = translate("Stopped")
|
||||
if not serviceEnabled then
|
||||
statusText = statusText .. " (" .. translate("disabled") .. ")"
|
||||
end
|
||||
end
|
||||
|
||||
m = Map("vpnbypass", translate("VPN Bypass Settings"))
|
||||
|
||||
h = m:section(NamedSection, "config", packageName, translate("Service Status") .. tmpfsVersion)
|
||||
h = m:section(NamedSection, "config", packageName, translate("Service Status") .. packageVersion)
|
||||
ss = h:option(DummyValue, "_dummy", translate("Service Status"))
|
||||
ss.template = packageName .. "/status"
|
||||
ss.value = tmpfsStatus
|
||||
buttons = h:option(DummyValue, "_dummy")
|
||||
buttons.template = packageName .. "/buttons"
|
||||
ss.value = statusText
|
||||
if packageVersion ~= "" then
|
||||
buttons = h:option(DummyValue, "_dummy")
|
||||
buttons.template = packageName .. "/buttons"
|
||||
end
|
||||
|
||||
s = m:section(NamedSection, "config", "vpnbypass", translate("VPN Bypass Rules"))
|
||||
-- Local Ports
|
||||
|
|
@ -60,9 +75,9 @@ d = Map("dhcp")
|
|||
s4 = d:section(TypedSection, "dnsmasq")
|
||||
s4.anonymous = true
|
||||
di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"),
|
||||
translate("Domains to be accessed directly (outside of the VPN tunnel), see ")
|
||||
translate("Domains to be accessed directly (outside of the VPN tunnel), see ")
|
||||
.. [[<a href="]] .. readmeURL .. [[#bypass-domains-formatsyntax" target="_blank">]]
|
||||
.. translate("README") .. [[</a> ]] .. translate("for syntax"))
|
||||
.. translate("README") .. [[</a> ]] .. translate("for syntax"))
|
||||
function d.on_after_commit(map)
|
||||
util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,53 +1,77 @@
|
|||
<%#
|
||||
Copyright 2019 Stan Grishin <stangri@melmac.net>
|
||||
-%>
|
||||
|
||||
<%-
|
||||
local packageName = "vpnbypass"
|
||||
local tmpfsStatus = "Stopped"
|
||||
local enabledFlag = luci.model.uci.cursor():get(packageName, "config", "enabled")
|
||||
if luci.sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then
|
||||
tmpfsStatus = "Running"
|
||||
end
|
||||
|
||||
if tmpfsStatus == "Stopped" then
|
||||
btn_start_style = "cbi-button cbi-button-apply important"
|
||||
btn_action_style = "cbi-button cbi-button-apply important"
|
||||
btn_stop_style = "cbi-button cbi-button-reset -disabled"
|
||||
else
|
||||
btn_start_style = "cbi-button cbi-button-apply -disabled"
|
||||
btn_action_style = "cbi-button cbi-button-apply important"
|
||||
btn_stop_style = "cbi-button cbi-button-reset important"
|
||||
end
|
||||
if enabledFlag ~= "1" then
|
||||
btn_start_style = "cbi-button cbi-button-apply -disabled"
|
||||
btn_action_style = "cbi-button cbi-button-apply -disabled"
|
||||
btn_enable_style = "cbi-button cbi-button-apply important"
|
||||
btn_disable_style = "cbi-button cbi-button-reset -disabled"
|
||||
else
|
||||
btn_enable_style = "cbi-button cbi-button-apply -disabled"
|
||||
btn_disable_style = "cbi-button cbi-button-reset important"
|
||||
end
|
||||
-%>
|
||||
<%# Copyright 2020 Stan Grishin <stangri@melmac.net> -%>
|
||||
|
||||
<%+vpnbypass/css%>
|
||||
<%+vpnbypass/js%>
|
||||
|
||||
<%-
|
||||
local packageName = "vpnbypass"
|
||||
local serviceRunning, serviceEnabled = false, false;
|
||||
if luci.sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then
|
||||
serviceRunning = true
|
||||
end
|
||||
if luci.model.uci.cursor():get(packageName, "config", "enabled") == "1" then
|
||||
serviceEnabled = true
|
||||
end
|
||||
|
||||
if serviceEnabled then
|
||||
btn_start_status = true
|
||||
btn_action_status = true
|
||||
btn_stop_status = true
|
||||
btn_enable_status = false
|
||||
btn_disable_status = true
|
||||
else
|
||||
btn_start_status = false
|
||||
btn_action_status = false
|
||||
btn_stop_status = false
|
||||
btn_enable_status = true
|
||||
btn_disable_status = false
|
||||
end
|
||||
if serviceRunning then
|
||||
btn_start_status = false
|
||||
btn_action_status = true
|
||||
btn_stop_status = true
|
||||
else
|
||||
btn_action_status = false
|
||||
btn_stop_status = false
|
||||
end
|
||||
-%>
|
||||
|
||||
<div class="cbi-value"><label class="cbi-value-title">Service Control</label>
|
||||
<div class="cbi-value-field">
|
||||
<input type="button" class="<%=btn_start_style%>" id="btn_start" name="start" value="<%:Start%>" onclick="button_action(this)" />
|
||||
<input type="button" class="cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>"
|
||||
onclick="button_action(this)" />
|
||||
<span id="btn_start_spinner" class="btn_spinner"></span>
|
||||
<input type="button" class="<%=btn_action_style%>" id="btn_action" name="action" value="<%:Reload%>" onclick="button_action(this)" />
|
||||
<input type="button" class="cbi-button cbi-button-apply" id="btn_action" name="action" value="<%:Restart%>"
|
||||
onclick="button_action(this)" />
|
||||
<span id="btn_action_spinner" class="btn_spinner"></span>
|
||||
<input type="button" class="<%=btn_stop_style%>" id="btn_stop" name="stop" value="<%:Stop%>" onclick="button_action(this)" />
|
||||
<input type="button" class="cbi-button cbi-button-reset" id="btn_stop" name="stop" value="<%:Stop%>"
|
||||
onclick="button_action(this)" />
|
||||
<span id="btn_stop_spinner" class="btn_spinner"></span>
|
||||
|
||||
|
||||
|
||||
|
||||
<input type="button" class="<%=btn_enable_style%>" id="btn_enable" name="enable" value="<%:Enable%>" onclick="button_action(this)" />
|
||||
<input type="button" class="cbi-button cbi-button-apply" id="btn_enable" name="enable" value="<%:Enable%>"
|
||||
onclick="button_action(this)" />
|
||||
<span id="btn_enable_spinner" class="btn_spinner"></span>
|
||||
<input type="button" class="<%=btn_disable_style%>" id="btn_disable" name="disable" value="<%:Disable%>" onclick="button_action(this)" />
|
||||
<input type="button" class="cbi-button cbi-button-reset" id="btn_disable" name="disable" value="<%:Disable%>"
|
||||
onclick="button_action(this)" />
|
||||
<span id="btn_disable_spinner" class="btn_spinner"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%-if not btn_start_status then%>
|
||||
<script type="text/javascript">document.getElementById("btn_start").disabled = true;</script>
|
||||
<%-end%>
|
||||
<%-if not btn_action_status then%>
|
||||
<script type="text/javascript">document.getElementById("btn_action").disabled = true;</script>
|
||||
<%-end%>
|
||||
<%-if not btn_stop_status then%>
|
||||
<script type="text/javascript">document.getElementById("btn_stop").disabled = true;</script>
|
||||
<%-end%>
|
||||
<%-if not btn_enable_status then%>
|
||||
<script type="text/javascript">document.getElementById("btn_enable").disabled = true;</script>
|
||||
<%-end%>
|
||||
<%-if not btn_disable_status then%>
|
||||
<script type="text/javascript">document.getElementById("btn_disable").disabled = true;</script>
|
||||
<%-end%>
|
||||
|
|
@ -1,14 +1,12 @@
|
|||
<%- if luci.dispatcher.lookup("admin/vpn") then node = "vpn" else node = "services" end -%>
|
||||
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
function button_action(action) {
|
||||
var xhr = new XHR(false);
|
||||
var btn_start = document.getElementById("btn_start");
|
||||
var btn_action = document.getElementById("btn_action");
|
||||
var btn_stop = document.getElementById("btn_stop");
|
||||
var btn_enable = document.getElementById("btn_enable");
|
||||
var btn_disable = document.getElementById("btn_disable");
|
||||
var xhr = new XHR(false);
|
||||
var btn_start = document.getElementById("btn_start");
|
||||
var btn_action = document.getElementById("btn_action");
|
||||
var btn_stop = document.getElementById("btn_stop");
|
||||
var btn_enable = document.getElementById("btn_enable");
|
||||
var btn_disable = document.getElementById("btn_disable");
|
||||
var btn_spinner;
|
||||
switch (action.name) {
|
||||
case "start":
|
||||
|
|
@ -32,28 +30,28 @@
|
|||
btn_stop.disabled = true;
|
||||
btn_enable.disabled = true;
|
||||
btn_disable.disabled = true;
|
||||
spinner(btn_spinner, 1);
|
||||
xhr.get('<%=luci.dispatcher.build_url("admin", node, "vpnbypass", "action")%>/' + action.name, null,
|
||||
spinner(btn_spinner, 1);
|
||||
xhr.get('<%=luci.dispatcher.build_url("admin", "vpn", "vpnbypass", "action")%>/' + action.name, null,
|
||||
function (x) {
|
||||
if (!x) {
|
||||
return;
|
||||
}
|
||||
btn_start.disabled = false;
|
||||
btn_action.disabled = false;
|
||||
btn_stop.disabled = false;
|
||||
btn_enable.disabled = false;
|
||||
btn_disable.disabled = false;
|
||||
btn_start.disabled = false;
|
||||
btn_action.disabled = false;
|
||||
btn_stop.disabled = false;
|
||||
btn_enable.disabled = false;
|
||||
btn_disable.disabled = false;
|
||||
spinner(btn_spinner, 0);
|
||||
location.reload();
|
||||
});
|
||||
location.reload();
|
||||
});
|
||||
}
|
||||
function spinner(element, state) {
|
||||
if (state === 1) {
|
||||
element.style.width = "16px";
|
||||
element.style.width = "16px";
|
||||
element.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
|
||||
}
|
||||
else {
|
||||
element.style.width = "0px";
|
||||
element.style.width = "0px";
|
||||
element.innerHTML = '';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ This is free software, licensed under the Apache License, Version 2.0
|
|||
<%+cbi/valueheader%>
|
||||
|
||||
<textarea rows="<%=select(2, self:cfgvalue(section):gsub('\n', '\n'))%>"
|
||||
style="border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:20px;width:50em;padding:none;margin:6px;resize:none;overflow:hidden;"
|
||||
disabled="disabled"><%=self:cfgvalue(section):gsub('\n', '\n')%>
|
||||
style="border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:20px;width:50em;padding:none;margin:6px;resize:none;overflow:hidden;"
|
||||
disabled="disabled"><%=self:cfgvalue(section):gsub('\n', '\n')%>
|
||||
</textarea>
|
||||
|
||||
<%+cbi/valuefooter%>
|
||||
|
|
|
|||
|
|
@ -1,75 +1,115 @@
|
|||
msgid ""
|
||||
msgstr "Content-Type: text/plain; charset=UTF-8"
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:57
|
||||
msgid "Disable"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:77
|
||||
msgid "Domains to Bypass"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:78
|
||||
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:54
|
||||
msgid "Enable"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/js.htm:51
|
||||
msgid "Loading"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
|
||||
msgid "Local IP Addresses to Bypass"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
|
||||
msgid ""
|
||||
"Local IP addresses or subnets with direct internet access (outside of the "
|
||||
"VPN tunnel)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
|
||||
msgid "Local Ports to Bypass"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
|
||||
msgid "Local ports to trigger VPN Bypass"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:80
|
||||
msgid "README"
|
||||
msgstr ""
|
||||
|
||||
msgid "Reload"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:67
|
||||
msgid "Remote IP Addresses to Bypass"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:67
|
||||
msgid ""
|
||||
"Remote IP addresses or subnets which will be accessed directly (outside of "
|
||||
"the VPN tunnel)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
|
||||
msgid "Remote Ports to Bypass"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
|
||||
msgid "Remote ports to trigger VPN Bypass"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:44
|
||||
msgid "Restart"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:25
|
||||
msgid "Running"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:35
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
|
||||
msgid "Service Status"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:41
|
||||
msgid "Start"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:47
|
||||
msgid "Stop"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:27
|
||||
msgid "Stopped"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:4
|
||||
msgid "VPN"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
|
||||
msgid "VPN Bypass"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:44
|
||||
msgid "VPN Bypass Rules"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:33
|
||||
msgid "VPN Bypass Settings"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:29
|
||||
msgid "disabled"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:80
|
||||
msgid "for syntax"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:11
|
||||
msgid "is not installed or not found"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
#!/bin/sh
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
delete ucitrack.@vpnbypass[-1]
|
||||
add ucitrack vpnbypass
|
||||
set ucitrack.@vpnbypass[-1].init=vpnbypass
|
||||
commit ucitrack
|
||||
EOF
|
||||
|
||||
rm -f /tmp/luci-indexcache
|
||||
rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
|
||||
exit 0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue