opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

lbagent: fix possible out of bound index access

Browse Source
This commit is contained in:
Yousong Zhou
2019-09-05 07:20:12 +00:00
parent c88a391caa
commit 173a316f3e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/lbagent/models/haproxy.go
+4 -2
View File
@@ -74,7 +74,7 @@ func (b *LoadbalancerCorpus) GenHaproxyConfigs(dir string, opts *AgentParams) (*
}
for _, lbcert := range b.LoadbalancerCertificates {
d := []byte(lbcert.Certificate)
if d[len(d)-1] != '\n' {
if len(d) > 0 && d[len(d)-1] != '\n' {
d = append(d, '\n')
}
d = append(d, []byte(lbcert.PrivateKey)...)
@@ -154,7 +154,9 @@ func (b *LoadbalancerCorpus) GenHaproxyConfigs(dir string, opts *AgentParams) (*
r.LoadbalancersEnabled = append(r.LoadbalancersEnabled, lb)
d := buf.Bytes()
d = d[:len(d)-2]
if len(d) > 1 { // this is for sure because of "\n\n"
d = d[:len(d)-2]
}
fn := fmt.Sprintf("%s.%s", lb.Id, agentutils.HaproxyCfgExt)
p := filepath.Join(dir, fn)
err := ioutil.WriteFile(p, d, agentutils.FileModeFile)