Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(libvirt): properly establish TLS connections using dialers.NewTLS #1156

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −6
Open

fix(libvirt): properly establish TLS connections using dialers.NewTLS #1156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions libvirt/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
libvirt "github.com/digitalocean/go-libvirt"
"github.com/dmacvicar/terraform-provider-libvirt/libvirt/helper/mutexkv"
uri "github.com/dmacvicar/terraform-provider-libvirt/libvirt/uri"
"github.com/digitalocean/go-libvirt/socket/dialers"
)

// Config struct for the libvirt-provider.
Expand All @@ -26,23 +27,40 @@ type Client struct {

// Client libvirt, returns a libvirt client for a config.
func (c *Config) Client() (*Client, error) {
log.Printf("[DEBUG] Entering Client() for URI: %s", c.URI)

// Parse the URI to extract connection details
u, err := uri.Parse(c.URI)
if err != nil {
return nil, err
log.Printf("[ERROR] Failed to parse URI '%s': %v", c.URI, err)
return nil, fmt.Errorf("failed to parse URI: %w", err)
}
log.Printf("[DEBUG] Parsed URI successfully: %s", u.String())

// Extract remote hostname
host := u.Hostname() // This ensures only the hostname is extracted
if host == "" {
return nil, fmt.Errorf("failed to extract valid host from URI: %s", c.URI)
}
log.Printf("[DEBUG] Using host for TLS connection: %s", host)

l := libvirt.NewWithDialer(u)
// Create a new libvirt client with TLS dialer
l := libvirt.NewWithDialer(dialers.NewTLS(host))

if err := l.ConnectToURI(libvirt.ConnectURI(u.RemoteName())); err != nil {
return nil, fmt.Errorf("failed to connect: %w", err)
// Establish the connection
if err := l.Connect(); err != nil {
return nil, fmt.Errorf("failed to connect to libvirt at %s: %w", host, err)
}
log.Printf("[DEBUG] Successfully connected to libvirt on %s.", host)

v, err := l.ConnectGetLibVersion()
// Fetch and log the libvirt version
v, err := l.Version()
if err != nil {
return nil, fmt.Errorf("failed to retrieve libvirt version: %w", err)
}
log.Printf("[INFO] libvirt client libvirt version: %v\n", v)
log.Printf("[INFO] libvirt client version: %v", v)

// Create and return the Client instance
client := &Client{
libvirt: l,
poolMutexKV: mutexkv.NewMutexKV(),
Expand Down