From b3e90d7d68c83360c4d435b5109e9a3189fc04b1 Mon Sep 17 00:00:00 2001 From: trackycn Date: Thu, 20 Feb 2020 16:13:39 +0800 Subject: [PATCH] v2ray server support empty username and password for socks and http protocol (#3203) --- .../model/cbi/v2ray_server/api/genv2rayconfig.lua | 10 +++++----- .../luasrc/model/cbi/v2ray_server/config.lua | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua index 54655ef48..1ed2305f7 100644 --- a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua +++ b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua @@ -20,18 +20,18 @@ elseif server.protocol == "http" then allowTransparent = false, accounts = { { - user = (server.Http_user == nil) and "lean" or server.Http_user, - pass = (server.Http_pass == nil) and "password" or server.Http_pass + user = (server.Http_user == nil) and "" or server.Http_user, + pass = (server.Http_pass == nil) and "" or server.Http_pass } } } else proset = { - auth = "password", + auth = (server.Socks_user == nil) and "noauth" or "password", accounts = { { - user = (server.Socks_user == nil) and "lean" or server.Socks_user, - pass = (server.Socks_pass == nil) and "password" or server.Socks_pass + user = (server.Socks_user == nil) and "" or server.Socks_user, + pass = (server.Socks_pass == nil) and "" or server.Socks_pass } } } diff --git a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua index 3c7d8a595..18c04b64a 100644 --- a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua +++ b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua @@ -45,23 +45,23 @@ e.rmempty=true e:depends("protocol","vmess") e=t:option(Value,"Socks_user",translate("User name")) -e.default="lean" +e.default="" e.rmempty=true e:depends("protocol","socks") e=t:option(Value,"Socks_pass",translate("Password")) -e.default="password" +e.default="" e.rmempty=true e.password=true e:depends("protocol","socks") e=t:option(Value,"Http_user",translate("User name")) -e.default="lean" +e.default="" e.rmempty=true e:depends("protocol","http") e=t:option(Value,"Http_pass",translate("Password")) -e.default="password" +e.default="" e.rmempty=true e.password=true e:depends("protocol","http")