From b7e9fc662c53c126cd9f62887509a9148f26fc98 Mon Sep 17 00:00:00 2001
From: Kui Wu <wkmike@outlook.com>
Date: Sat, 18 Apr 2020 20:20:40 +0800
Subject: [PATCH] luci-app-frpc: add proxy_protocol_version option for proxy
 config (#4370)

---
 package/lean/luci-app-frpc/Makefile           |   4 ++--
 .../luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo   | Bin 4004 -> 5032 bytes
 .../luasrc/model/cbi/frp/config.lua           |   9 +++++++++
 .../lean/luci-app-frpc/root/etc/init.d/frp    |   9 +++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/package/lean/luci-app-frpc/Makefile b/package/lean/luci-app-frpc/Makefile
index 911ad624d..ed9bb9c86 100644
--- a/package/lean/luci-app-frpc/Makefile
+++ b/package/lean/luci-app-frpc/Makefile
@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=LuCI for FRPC
 LUCI_DEPENDS:=+wget +frpc
 LUCI_PKGARCH:=all
-PKG_VERSION:=1.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.2
+PKG_RELEASE:=1
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/lean/luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo b/package/lean/luci-app-frpc/luasrc/i18n/frp.zh-cn.lmo
index f3b95348f88a98819790b4e8ff91847fd3378504..9e48c9b3fad24425271ac5c91888635be699583a 100644
GIT binary patch
delta 2629
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

delta 1650
zcmYk5c~DbV6vl5B10*Sg-69|=2!b6&A}%<nfEHyDZKwoot0<xcMk^Mrpb2VdkT4J*
zo2Y;al_dnI6i`e-#TKot)MCphQ?ceHVNqLGgpT%m@JG$eojJdA?>*=H&dsaxte9%G
za`!GeQ(@Gpjn(Y~@?0uxQnFg(J0mC8q}3W5+vw74NpO@KJ<f!Ly%STNtOypNyxHL{
zgoH{YQTn#C#=J~IqSuAHnOf?N`Hh6=b?p?#;u9*#LPNQ6Le(3iC<!Z`Qm~g&*Vt2W
zon{A62^<$&Ls2E&US!fX(7FP;qS{c<K-BlXqFOmol*;^l9$lX~aIBIlGmoQOxVED8
z@p1IgawJXK_JJZTp*pyBBF0Kt8J(9ipvW=mkW})VsZC}vR5!1X8Z=AuyCkRc>ItD0
z=Ld@F2pN!P8M3PlxySTv&Hw8+U98o&=>}?4ruqy*sJZ+Kw+Um${3?U81?Ar{3kAmV
z3~GcgrnU;^QnLl~S>*gN!D<#YEL<q1wP$d{SX)0~ju`6B(kH7-?RlotDt&7mF`TTK
z073}FPsGNf%?5b}G1YxTtB*qDxEIFS_!H2%hcFtdjyFv<@j6`fu;22OEqR3SFQE*N
z=kU3-eoxwcLfF0FNWQZ!kUbJ;O~@pMt@v{me_?6o*+B?L1-2KI3SS*mZgNE|!b%kO
zYx+-mN`Jw5A=t*sKf~LzMSd5hhrvSI{V58u`1vy;BfJqLQtajgon^goScHZZU|)xx
z>7g@KlS2qGmw-i1^XzxnKkhFDZv{IzNrG;MG`7AbgtZUMcYf3<{n7SrHP{X8INhZv
zC1L)lhY%nJ3p_(A9N)X+jF=6R#AcS6Q@A?PUMmCSGZ%bHW`wc#<*h=4Cgwn3;I{qb
zw?l>CDzG4UFf4wtSBX0zX64}05D)EO#9LhtAr^XY+{#(25`A_(C?<rv1k77CS*77P
zMZ+8yCWuW$?b1YE;%Wu7mV+%KheD3~JV=xcqCq+mQ=+4dF)vb`eQ-bywvuN1H&fnz
zxXjm#^We)&Za~9hI6MNjj%|_UUVYjvL4!VKKWXonW#yNDdVsyaHc6)B=%D?McoGgX
z@_?PjE!RuZmv><zCa`dKN~~E$oGkJh3ML`J-*aa)wwe9xdlZNPPfK<5xRvd+r4tvh
zh)r6ySx|B5ZHCd5EIgRLSMup)%L6bY2CqFL>-BZ%lZBxaGh!>nTV3k#uRC5qz)i5L
za{JHO=UCoXF`SLy9ID61@}W$oKtoOi5}pNz1*LJp{#=Zh5yUH&D(%EG9V5^{363pE
zS1q|PjUS2g3&CqobS_AkJ-Tly1Tz!-sI29?&7#pkJQ<7GpLeE6>bgW;I~{@;1NP^>
zCI=@6oZ=v6m|xSA^R2A!ig6i0gC(pheOWI0A+Zt;RbZQj?fQ;Bj&Cm-41-0@Z~f1t
zZ@Yz$pQQ&^w^)QH-^tp5m{kl8ySOGMSJV9A2E>dYhpx-~e)rAlKhP@_yrAoKV|emk
zNjG4SG30RL_g<M)^(H+Q4VNKded}ZA-Gyyy+VG!X*tVNJ$#O{9X8{5Kf<--|RKG=e
z@_3vt2ix2yw#7a!WdUf=2X^m&V(FLVtH;RAyTJ1wHrd|~J$+#a4flX~`YR_oUR-&E
zCnDWg5vD@fsr9`ru0LVKU?Lv$qMinKh_g|Eab)>qXTlWQnvPM#tyugg)d%vg*7_<S
zzzuBu_wf~3f)nfbh?$?&Ki7wvZhL4x!xMRdMbG=(9hHYyyu|tE%>Jv}1*2=;+)D#D
vF+Ac|cFiks>56_hWE2TU#$4z)tpgnLxZvoqln<z}8Lt+@0W(q|zC`jLMvOu!

diff --git a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua
index 48bfe7250..b015ff7ad 100644
--- a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua
+++ b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/config.lua
@@ -105,6 +105,15 @@ e:depends("type","http")
 e = t:taboption("other",Value, "host_header_rewrite", translate("Host Header"), translate("The Host header will be rewritten to match the hostname portion of the forwarding address."))
 e.default = "dev.yourdomain.com"
 e:depends("enable_host_header_rewrite",1)
+e = t:taboption("base",ListValue, "proxy_protocol_version", translate("Proxy-Protocol Version"), translate("Proxy Protocol to send user's real IP to local services."))
+e.default = "disable"
+e:value("disable",translate("Disable"))
+e:value("v1",translate("V1"))
+e:value("v2",translate("V2"))
+e:depends("type","tcp")
+e:depends("type","stcp")
+e:depends("type","http")
+e:depends("type","https")
 e = t:taboption("base",Flag, "use_encryption", translate("Use Encryption"), translate("Encrypted the communication between frpc and frps, will effectively prevent the traffic intercepted."))
 e.default = "1"
 e.rmempty = false
diff --git a/package/lean/luci-app-frpc/root/etc/init.d/frp b/package/lean/luci-app-frpc/root/etc/init.d/frp
index ced13f7bb..cde1c0ebe 100755
--- a/package/lean/luci-app-frpc/root/etc/init.d/frp
+++ b/package/lean/luci-app-frpc/root/etc/init.d/frp
@@ -30,7 +30,7 @@ conf_proxy_add() {
 	local cfg="$1"
 	local tmpconf="$2"
 	local enable type domain_type custom_domains remote_port local_ip local_port enable_http_auth enable_host_header_rewrite host_header_rewrite
-	local subdomain use_encryption use_compression http_user http_pwd remark locations
+	local subdomain proxy_protocol_version use_encryption use_compression http_user http_pwd remark locations
 	local enable_plugin plugin plugin_http_user plugin_http_passwd plugin_unix_path stcp_role stcp_secretkey stcp_servername
 	
 	config_get_bool enable "$cfg" enable 1
@@ -54,6 +54,7 @@ conf_proxy_add() {
 	config_get stcp_role "$cfg" stcp_role
 	config_get stcp_secretkey "$cfg" stcp_secretkey
 	config_get stcp_servername "$cfg" stcp_servername
+	config_get proxy_protocol_version "$cfg" proxy_protocol_version
 
 
 	[ -n "$remark" ] && [ -n "$type" ] || return 1
@@ -92,7 +93,11 @@ conf_proxy_add() {
 		[ -n "$stcp_secretkey" ] && echo "sk=$stcp_secretkey" >>$tmpconf || return 1
 	}
 	
-	
+	[ -n "$proxy_protocol_version" ] && {
+		if [ "$proxy_protocol_version" != "disable" ]; then
+			echo "proxy_protocol_version=$proxy_protocol_version" >>$tmpconf
+		fi
+	}
 
 	frp_write_bool use_encryption $cfg 1
 	frp_write_bool use_compression $cfg 1