298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2ray server support empty username and password for socks and http protocol (#3203)

Browse Source
This commit is contained in:
trackycn 2020-02-20 16:13:39 +08:00 committed by GitHub
parent 4605165ed2
commit b3e90d7d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua
View File

@ -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
}
}
}

8
package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/config.lua
View File

@ -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")