mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-14 19:41:51 +00:00
Code Issues Releases Wiki Activity

Remove static key for openvpn

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-11-05 21:18:37 +01:00
parent 8e3a6ced89
commit a7d41e1d6f
3 changed files with 23 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -543,26 +543,6 @@ function wizard_add()
ucic:save("ubond")
ucic:commit("ubond")
-- Set OpenVPN settings
local openvpn_key = luci.http.formvalue("openvpn_key")
if openvpn_key ~= "" then
local openvpn_key_path = "/etc/luci-uploads/openvpn.key"
local fp
luci.http.setfilehandler(
function(meta, chunk, eof)
if not fp and meta and meta.name == "openvpn_key" then
fp = io.open(openvpn_key_path, "w")
end
if fp and chunk then
fp:write(chunk)
end
if fp and eof then
fp:close()
end
end)
ucic:set("openvpn","omr","secret",openvpn_key_path)
end
if default_vpn == "openvpn" then
ucic:set("openvpn","omr","enabled",1)
ucic:set("network","omrvpn","proto","dhcp")

13
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -236,19 +236,6 @@ end
</div>
</div>
<% end %>
<% if nixio.fs.access("/usr/sbin/openvpn") then %>
<div class="cbi-value">
<label class="cbi-value-title"><%:OpenVPN key%></label>
<div class="cbi-value-field">
<input type="file" name="openvpn_key" class="cbi-input-file">
<input type="text" class="cbi-input-text" data-update="change" value="<%=uci:get("openvpn","omr","secret")%>" />
<br />
<div class="cbi-value-description">
<%:You need to upload OpenVPN key file generated by server install script to use OpenVPN TCP%>
</div>
</div>
</div>
<% end %>
<div class="cbi-value">
<label class="cbi-value-title"><%:Default VPN%></label>
<div class="cbi-value-field">

50
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -82,32 +82,6 @@ _set_glorytun_vps() {
fi
}
_set_openvpn_vps() {
local enabled port key
enabled="$(uci -q get openvpn.omr.enabled)"
[ "$enabled" != "1" ] && echo "OpenVPN disabled" && return
port="$(uci -q get openvpn.omr.port)"
keyfile="$(uci -q get openvpn.omr.secret)"
if [ -n "$keyfile" ]; then
key="$(cat $keyfile | base64)"
else
key=""
fi
[ -z "$key" ] && echo "OpenVPN key not set" && return
local current_port current_key
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
current_port="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.port')"
current_key="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.key')"
if [ "$current_port" != "$port" ] || [ "$current_key" != "$key" ]; then
local settings
settings='{"port": '$port',"key":"'$key'"}'
echo $(_set_json "openvpn" "$settings")
else
echo 1
fi
}
_get_ss_redir() {
config_get cf_ebpf $1 ebpf
[ "$cf_ebpf" = "1" ] && ebpf="true"
@ -699,6 +673,29 @@ _set_config_from_vps() {
[ -n "$openvpn_client_ca" ] && {
echo $openvpn_client_ca | base64 -d > /etc/luci-uploads/ca.crt
}
[ -n "$openvpn_client_key" ] && [ -n "$openvpn_client_crt" ] && [ -n "$openvpn_client_ca" ] && {
openvpn_port="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.port')"
[ -z "$openvpn_port" ] && openvpn_port="65001"
vpn="$(uci -q get openmptcprouter.settings.vpn)"
openvpn_state=0
if [ "$vpn" = "openvpn" ]; then
openvpn_state=1
fi
uci -q batch <<-EOF >/dev/null
set openvpn.omr.port=$openvpn_port
set openvpn.omr.key="/etc/luci-uploads/client.key"
set openvpn.omr.cert="/etc/luci-uploads/client.crt"
set openvpn.omr.ca="/etc/luci-uploads/ca.crt"
set openvpn.omr.enabled=$openvpn_state
set openvpn.omr.tls_client=1
EOF
if [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ]; then
uci -q set openvpn.omr.remote="$vpsip"
fi
uci -q commit openvpn
logger -t "OMR-VPS" "OpenVPN restart..."
/etc/init.d/openvpn restart
}
# MLVPN settings
mlvpn_key="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.key')"
@ -962,7 +959,6 @@ _config_service() {
config_load shadowsocks-libev
config_foreach _set_ss_server_vps server
[ -z "$(_set_glorytun_vps)" ] && error=1
[ -z "$(_set_openvpn_vps)" ] && error=1
_set_vps_firewall
_backup_list
redirect_port="0"