guoswork
/
frp
mirror of https://gitee.com/IrisVega/frp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix legacy ini proxy conversion panic (#3667)

This commit is contained in:
fatedier 2023-10-11 16:53:03 +08:00 committed by GitHub
parent b9c24e9b69
commit 01a0d557ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/config/legacy/conversion.go
View File

@ -306,6 +306,7 @@ func Convert_ProxyConf_To_v1(conf ProxyConf) v1.ProxyConfigurer {
c := &v1.XTCPProxyConfig{ProxyBaseConfig: *outBase} c := &v1.XTCPProxyConfig{ProxyBaseConfig: *outBase}
c.Secretkey = v.Sk c.Secretkey = v.Sk
c.AllowUsers = v.AllowUsers c.AllowUsers = v.AllowUsers
out = c
} }
return out return out
} }

2
test/e2e/framework/consts/consts.go
View File

@ -25,6 +25,7 @@ log.level = "trace"
DefaultClientConfig = ` DefaultClientConfig = `
serverAddr = "127.0.0.1" serverAddr = "127.0.0.1"
serverPort = {{ .%s }} serverPort = {{ .%s }}
loginFailExit = false
log.level = "trace" log.level = "trace"
` `
@ -38,6 +39,7 @@ log.level = "trace"
[common] [common]
server_addr = 127.0.0.1 server_addr = 127.0.0.1
server_port = {{ .%s }} server_port = {{ .%s }}
login_fail_exit = false
log_level = trace log_level = trace
` `
) )

1
test/e2e/framework/process.go
View File

@ -40,6 +40,7 @@ func (f *Framework) RunProcesses(serverTemplates []string, clientTemplates []str
currentServerProcesses = append(currentServerProcesses, p) currentServerProcesses = append(currentServerProcesses, p)
err = p.Start() err = p.Start()
ExpectNoError(err) ExpectNoError(err)
time.Sleep(500 * time.Millisecond)
} }
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)