Skip to content

Commit

Permalink
incusd/network/openvswitch: Port to memfd
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
Sponsored-by: Luizalabs (https://luizalabs.com)
  • Loading branch information
stgraber committed Dec 7, 2023
1 parent d636126 commit 70e59be
Showing 1 changed file with 4 additions and 21 deletions.
25 changes: 4 additions & 21 deletions internal/server/network/openvswitch/ovn.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"time"

"github.com/lxc/incus/internal/iprange"
"github.com/lxc/incus/internal/linux"
"github.com/lxc/incus/internal/server/state"
"github.com/lxc/incus/shared/subprocess"
"github.com/lxc/incus/shared/util"
Expand Down Expand Up @@ -313,50 +314,32 @@ func (o *OVN) xbctl(southbound bool, extraArgs ...string) (string, error) {
files := []*os.File{}
if strings.Contains(dbAddr, "ssl:") {
// Handle client certificate.
clientCertFile, err := os.CreateTemp("", "ovn")
clientCertFile, err := linux.CreateMemfd([]byte(o.sslClientCert))
if err != nil {
return "", err
}

defer clientCertFile.Close()
_ = os.Remove(clientCertFile.Name())
files = append(files, clientCertFile)

_, err = clientCertFile.WriteString(o.sslClientCert)
if err != nil {
return "", err
}

// Handle client key.
clientKeyFile, err := os.CreateTemp("", "ovn")
clientKeyFile, err := linux.CreateMemfd([]byte(o.sslClientKey))
if err != nil {
return "", err
}

defer clientKeyFile.Close()
_ = os.Remove(clientKeyFile.Name())
files = append(files, clientKeyFile)

_, err = clientKeyFile.WriteString(o.sslClientKey)
if err != nil {
return "", err
}

// Handle CA certificate.
caCertFile, err := os.CreateTemp("", "ovn")
caCertFile, err := linux.CreateMemfd([]byte(o.sslCACert))
if err != nil {
return "", err
}

defer caCertFile.Close()
_ = os.Remove(caCertFile.Name())
files = append(files, caCertFile)

_, err = caCertFile.WriteString(o.sslCACert)
if err != nil {
return "", err
}

args = append(args,
"-c", "/proc/self/fd/3",
"-p", "/proc/self/fd/4",
Expand Down

0 comments on commit 70e59be

Please sign in to comment.