From 8609a59322f9037b6b8d0c52c2f863f3f5a05097 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Sun, 5 Sep 2021 11:08:29 +0100 Subject: [PATCH] added special handling for none security --- infra/conf/v5cfg/stream.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/infra/conf/v5cfg/stream.go b/infra/conf/v5cfg/stream.go index a8443d99a..2add4e458 100644 --- a/infra/conf/v5cfg/stream.go +++ b/infra/conf/v5cfg/stream.go @@ -31,15 +31,17 @@ func (s StreamConfig) BuildV5(ctx context.Context) (proto.Message, error) { Settings: serial.ToTypedMessage(transportConfigPack), }) - if s.SecuritySettings == nil { - s.SecuritySettings = []byte("{}") + if s.Security != "none" && s.Security != "" { + if s.SecuritySettings == nil { + s.SecuritySettings = []byte("{}") + } + securityConfigPack, err := loadHeterogeneousConfigFromRawJson("security", s.Security, s.SecuritySettings) + if err != nil { + return nil, newError("unable to load security config").Base(err) + } + config.SecurityType = s.Security + config.SecuritySettings = append(config.SecuritySettings, serial.ToTypedMessage(securityConfigPack)) } - securityConfigPack, err := loadHeterogeneousConfigFromRawJson("security", s.Security, s.SecuritySettings) - if err != nil { - return nil, newError("unable to load security config").Base(err) - } - config.SecurityType = s.Security - config.SecuritySettings = append(config.SecuritySettings, serial.ToTypedMessage(securityConfigPack)) config.SocketSettings, err = s.SocketSettings.Build() if err != nil {