luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Fixes loading JSON pem bundles

Browse source
This commit is contained in:
Filipe Varela 2017-06-08 13:40:50 +01:00 committed by Oliver Beattie
parent df388903e4
commit 0177984e1b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
physical/cassandra.go
View file

@ -153,8 +153,12 @@ func setupCassandraTLS(conf map[string]string, cluster *gocql.ClusterConfig) err
return err
}
} else {
if pemJSONStr, ok := conf["pem_json"]; ok {
pemJSON, err := certutil.ParsePKIJSON([]byte(pemJSONStr))
if pemJSONPath, ok := conf["pem_json"]; ok {
pemJSONData, err := ioutil.ReadFile(pemJSONPath)
if err != nil {
return fmt.Errorf("Error reading json bundle from %s: %v", pemJSONPath, err)
}
pemJSON, err := certutil.ParsePKIJSON([]byte(pemJSONData))
if err != nil {
return err
}