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

Respect unsecured connections to vSphere #656

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Respect unsecured connections to vSphere #656

Show file tree
Hide file tree
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
19 changes: 18 additions & 1 deletion pkg/controller/plan/adapter/vsphere/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
liburl "net/url"
"strconv"

planapi "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1/plan"
"github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1/ref"
Expand Down Expand Up @@ -330,7 +331,7 @@ func (r *Client) connect() error {
url.User = liburl.UserPassword(
r.user(),
r.password())
soapClient := soap.NewClient(url, false)
soapClient := soap.NewClient(url, r.getInsecureSkipVerifyFlag())
soapClient.SetThumbprint(url.Host, r.thumbprint())
vimClient, err := vim25.NewClient(context.TODO(), soapClient)
if err != nil {
Expand Down Expand Up @@ -369,6 +370,22 @@ func (r *Client) thumbprint() string {
return ""
}

// getInsecureSkipVerifyFlag gets the insecureSkipVerify boolean flag
// value from the provider connection secret.
func (r *Client) getInsecureSkipVerifyFlag() bool {
insecure, found := r.Source.Secret.Data["insecureSkipVerify"]
if !found {
return false
}

insecureSkipVerify, err := strconv.ParseBool(string(insecure))
if err != nil {
return false
}

return insecureSkipVerify
}

func (r *Client) DetachDisks(vmRef ref.Ref) (err error) {
// no-op
return
Expand Down
24 changes: 21 additions & 3 deletions pkg/controller/plan/adapter/vsphere/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ package vsphere

import (
"context"
liburl "net/url"
"strconv"
"time"

model "github.com/konveyor/forklift-controller/pkg/controller/provider/web/vsphere"
liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
"github.com/vmware/govmomi"
Expand All @@ -10,8 +14,6 @@ import (
"github.com/vmware/govmomi/vim25"
"github.com/vmware/govmomi/vim25/soap"
core "k8s.io/api/core/v1"
liburl "net/url"
"time"
)

// ESX Host.
Expand Down Expand Up @@ -92,7 +94,7 @@ func (r *EsxHost) connect(ctx context.Context) (err error) {
url.User = liburl.UserPassword(
r.user(),
r.password())
soapClient := soap.NewClient(url, false)
soapClient := soap.NewClient(url, r.getInsecureSkipVerifyFlag())
soapClient.SetThumbprint(url.Host, r.thumbprint())
vimClient, err := vim25.NewClient(ctx, soapClient)
if err != nil {
Expand Down Expand Up @@ -147,3 +149,19 @@ func (r *EsxHost) thumbprint() string {

return ""
}

// GetInsecureSkipVerifyFlag gets the insecureSkipVerify boolean flag
// value from the provider connection secret.
func (r *EsxHost) getInsecureSkipVerifyFlag() bool {
insecure, found := r.Secret.Data["insecureSkipVerify"]
if !found {
return false
}

insecureSkipVerify, err := strconv.ParseBool(string(insecure))
if err != nil {
return false
}

return insecureSkipVerify
}
18 changes: 17 additions & 1 deletion pkg/controller/provider/container/vsphere/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ func (r *Collector) connect(ctx context.Context) (status int, err error) {
url.User = liburl.UserPassword(
r.user(),
r.password())
soapClient := soap.NewClient(url, false)
soapClient := soap.NewClient(url, r.getInsecureSkipVerifyFlag())
soapClient.SetThumbprint(url.Host, r.thumbprint())
vimClient, err := vim25.NewClient(ctx, soapClient)
if err != nil {
Expand Down Expand Up @@ -544,6 +544,22 @@ func (r *Collector) thumbprint() string {
return ""
}

// getInsecureSkipVerifyFlag gets the insecureSkipVerify boolean flag
// value from the provider connection secret.
func (r *Collector) getInsecureSkipVerifyFlag() bool {
insecure, found := r.secret.Data["insecureSkipVerify"]
if !found {
return false
}

insecureSkipVerify, err := strconv.ParseBool(string(insecure))
if err != nil {
return false
}

return insecureSkipVerify
}

// Build the object Spec filter.
func (r *Collector) filter(pc *property.Collector) *property.WaitFilter {
return &property.WaitFilter{
Expand Down
Loading