apps/frp-panel
1
0
Fork 0
mirror of https://github.com/VaalaCat/frp-panel.git synced 2025-10-05 07:17:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: compatiable for offical frp crypto salt

Browse Source
This commit is contained in:
Vaala Cat
2024-04-12 20:26:03 +08:00
parent 06351baa2c
commit 9ffd3c5dfc
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conf/helper.go
View File

@@ -17,6 +17,10 @@ import (
func MasterDefaultSalt() string { func MasterDefaultSalt() string {
cfg := Get() cfg := Get()
if cfg.Master.CompatibleMode {
logrus.Warnf("master compatible mode enabled, use frp as default salt, which is not recommended")
return "frp"
}
return utils.MD5(fmt.Sprintf("salt_%s:%d:%s", return utils.MD5(fmt.Sprintf("salt_%s:%d:%s",
cfg.Master.InternalFRPServerHost, cfg.Master.InternalFRPServerHost,
cfg.Master.InternalFRPServerPort, cfg.Master.InternalFRPServerPort,

1
conf/settings.go
View File

@@ -29,6 +29,7 @@ type Config struct {
CacheSize int `env:"CACHE_SIZE" env-default:"10" env-description:"cache size in MB"` CacheSize int `env:"CACHE_SIZE" env-default:"10" env-description:"cache size in MB"`
RPCHost string `env:"RPC_HOST" env-default:"127.0.0.1" env-description:"master host, is a public ip or domain"` RPCHost string `env:"RPC_HOST" env-default:"127.0.0.1" env-description:"master host, is a public ip or domain"`
RPCPort int `env:"RPC_PORT" env-default:"9001" env-description:"master rpc port"` RPCPort int `env:"RPC_PORT" env-default:"9001" env-description:"master rpc port"`
CompatibleMode bool `env:"COMPATIBLE_MODE" env-default:"false" env-description:"compatible mode, for official frp client"`
InternalFRPServerHost string `env:"INTERNAL_FRP_SERVER_HOST" env-description:"internal frp server host, used for client connection"` InternalFRPServerHost string `env:"INTERNAL_FRP_SERVER_HOST" env-description:"internal frp server host, used for client connection"`
InternalFRPServerPort int `env:"INTERNAL_FRP_SERVER_PORT" env-default:"9002" env-description:"internal frp server port, used for client connection"` InternalFRPServerPort int `env:"INTERNAL_FRP_SERVER_PORT" env-default:"9002" env-description:"internal frp server port, used for client connection"`
InternalFRPAuthServerHost string `env:"INTERNAL_FRP_AUTH_SERVER_HOST" env-default:"127.0.0.1" env-description:"internal frp auth server host"` InternalFRPAuthServerHost string `env:"INTERNAL_FRP_AUTH_SERVER_HOST" env-default:"127.0.0.1" env-description:"internal frp auth server host"`