gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-14 16:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for dns names to controller type

Browse Source
This commit is contained in:
Paul Lorenz
2023-06-28 15:23:32 -04:00
parent 4eca60e32d
commit f062513c16
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zititest/zitilab/component_controller.go
+2 -1
View File
@@ -42,6 +42,7 @@ type ControllerType struct {
ConfigName string
Version string
LocalPath string
DNSNames []string
}
func (self *ControllerType) GetActions() map[string]model.ComponentAction {
@@ -72,7 +73,7 @@ func (self *ControllerType) StageFiles(r model.Run, c *model.Component) error {
return err
}
if err := pki.CreateControllerCerts(r, c, c.Id); err != nil {
if err := pki.CreateControllerCerts(r, c, self.DNSNames, c.Id); err != nil {
return err
}
zititest/zitilab/pki/cert.go
+7 -3
View File
@@ -90,7 +90,7 @@ func loadInfoFile(file string) string {
return string(data)
}
func EnsureServerCertExists(run model.Run, name string, ip string, spiffeId string) error {
func EnsureServerCertExists(run model.Run, name string, ip string, dns []string, spiffeId string) error {
logrus.Infof("generating server certificate [%s:%s]", name, ip)
certFile := name + "-server"
@@ -124,6 +124,10 @@ func EnsureServerCertExists(run model.Run, name string, ip string, spiffeId stri
"--allow-overwrite",
"--ip", ip}
if len(dns) > 0 {
args = append(args, "--dns", strings.Join(dns, ","))
}
if spiffeId != "" {
args = append(args, "--spiffe-id", spiffeId)
}
@@ -138,7 +142,7 @@ func EnsureServerCertExists(run model.Run, name string, ip string, spiffeId stri
return os.WriteFile(infoFile, []byte(certInfo), 0600)
}
func CreateControllerCerts(run model.Run, component *model.Component, name string) error {
func CreateControllerCerts(run model.Run, component *model.Component, dns []string, name string) error {
trustDomain := component.GetStringVariableOr("ca.trustDomain", "ziti.test")
rootCaName := component.GetStringVariableOr("ca.rootName", "root")
if err := EnsureCaExists(run, trustDomain, rootCaName); err != nil {
@@ -149,5 +153,5 @@ func CreateControllerCerts(run model.Run, component *model.Component, name strin
return errors.Wrapf(err, "error generating public identity for component [%s]", component.Id)
}
return EnsureServerCertExists(run, name, component.Host.PublicIp, "controller/"+name)
return EnsureServerCertExists(run, name, component.Host.PublicIp, dns, "controller/"+name)
}