Skip to content

Commit 9ffd3c5

Browse files
committed
feat: compatiable for offical frp crypto salt
1 parent 06351ba commit 9ffd3c5

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

conf/helper.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ import (
1717

1818
func MasterDefaultSalt() string {
1919
cfg := Get()
20+
if cfg.Master.CompatibleMode {
21+
logrus.Warnf("master compatible mode enabled, use frp as default salt, which is not recommended")
22+
return "frp"
23+
}
2024
return utils.MD5(fmt.Sprintf("salt_%s:%d:%s",
2125
cfg.Master.InternalFRPServerHost,
2226
cfg.Master.InternalFRPServerPort,

conf/settings.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ type Config struct {
2929
CacheSize int `env:"CACHE_SIZE" env-default:"10" env-description:"cache size in MB"`
3030
RPCHost string `env:"RPC_HOST" env-default:"127.0.0.1" env-description:"master host, is a public ip or domain"`
3131
RPCPort int `env:"RPC_PORT" env-default:"9001" env-description:"master rpc port"`
32+
CompatibleMode bool `env:"COMPATIBLE_MODE" env-default:"false" env-description:"compatible mode, for official frp client"`
3233
InternalFRPServerHost string `env:"INTERNAL_FRP_SERVER_HOST" env-description:"internal frp server host, used for client connection"`
3334
InternalFRPServerPort int `env:"INTERNAL_FRP_SERVER_PORT" env-default:"9002" env-description:"internal frp server port, used for client connection"`
3435
InternalFRPAuthServerHost string `env:"INTERNAL_FRP_AUTH_SERVER_HOST" env-default:"127.0.0.1" env-description:"internal frp auth server host"`

0 commit comments

Comments
 (0)