Add certification check

Author: Marshall Wu

builder/xenserver/clone/builder.go

@@ -80,7 +80,7 @@ func (self *Builder) Prepare(raws ...interface{}) (params []string, warns []stri
 }
 
 func (self *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
-	c, err := xscommon.NewXenAPIClient(self.config.HostIp, self.config.Username, self.config.Password)
+	c, err := xscommon.NewXenAPIClient(self.config.HostIp, self.config.Username, self.config.Password, self.config.SkipCertVerification, self.config.ServerCert)
 
 	if err != nil {
 		return nil, err

builder/xenserver/common/client.go

@@ -5,8 +5,10 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	
+	"strings"
+
 	"xenapi"
+
 	version "github.com/xenserver/packer-plugin-xenserver/version"
 )
 
@@ -64,8 +66,6 @@ func GetDisks(c *Connection, vmRef xenapi.VMRef) (vdis []xenapi.VDIRef, err erro
 	return vdis, nil
 }
 
-
-
 func ConnectVdi(c *Connection, vmRef xenapi.VMRef, vdiRef xenapi.VDIRef, vbdType xenapi.VbdType) (err error) {
 
 	var mode xenapi.VbdMode
@@ -154,7 +154,6 @@ func DisconnectVdi(c *Connection, vmRef xenapi.VMRef, vdi xenapi.VDIRef) error {
 	return fmt.Errorf("Could not find VBD for VDI '%s'", vdi)
 }
 
-
 func ConnectNetwork(c *Connection, networkRef xenapi.NetworkRef, vmRef xenapi.VMRef, device string) (*xenapi.VIFRef, error) {
 	vif, err := xenapi.VIF.Create(c.session, xenapi.VIFRecord{
 		Network:     networkRef,
@@ -171,9 +170,6 @@ func ConnectNetwork(c *Connection, networkRef xenapi.NetworkRef, vmRef xenapi.VM
 	return &vif, nil
 }
 
-
-
-
 // Expose a VDI using the Transfer VM
 // (Legacy VHD export)
 
@@ -270,12 +266,10 @@ func Unexpose(c *Connection, vdiRef xenapi.VDIRef) (err error) {
 	return nil
 }
 
-
-
 // Client Initiator
 type Connection struct {
 	session  *xenapi.Session
-	ref	 	 xenapi.SessionRef
+	ref      xenapi.SessionRef
 	Host     string
 	Username string
 	Password string
@@ -285,23 +279,36 @@ func (c Connection) GetSession() *xenapi.Session {
 	return c.session
 }
 
-func NewXenAPIClient(host, username, password string) (*Connection, error) {
+func NewXenAPIClient(host, username, password string, skipCertVerification bool, serverCert string) (*Connection, error) {
 	log.Printf("XenServer Packer Plugin Version: %s", version.PluginVersion.FormattedVersion())
 
-	session := xenapi.NewSession(&xenapi.ClientOpts{
-		URL: "http://" + host,
+	if !strings.HasPrefix(host, "http") {
+		host = "https://" + host
+	}
+
+	opts := &xenapi.ClientOpts{
+		URL: host,
 		Headers: map[string]string{
 			"User-Agent": fmt.Sprintf("XenServerPacker/%s", version.PluginVersion.FormattedVersion()),
 		},
-	})
-
+	}
+	if !skipCertVerification {
+		opts.SecureOpts = &xenapi.SecureOpts{
+			ServerCert: serverCert,
+		}
+	}
+	session := xenapi.NewSession(opts)
 
 	ref, err := session.LoginWithPassword(username, password, "1.0", "packer")
 	if err != nil {
 		return nil, err
 	}
 
-	return &Connection{session,ref, host, username, password}, nil
+	// Strip the scheme from host before storing — callers that build HTTP URLs
+	// (step_upload_vdi, step_export, …) already prepend "https://".
+	bareHost := strings.TrimPrefix(strings.TrimPrefix(host, "https://"), "http://")
+
+	return &Connection{session, ref, bareHost, username, password}, nil
 }
 
 func (c *Connection) GetSessionRef() xenapi.SessionRef {

builder/xenserver/common/common_config.go

@@ -3,12 +3,13 @@ package common
 import (
 	"errors"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/hashicorp/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	
+
 	"xenapi"
 )
 
@@ -40,12 +41,15 @@ type CommonConfig struct {
 	HTTPPortMin uint   `mapstructure:"http_port_min"`
 	HTTPPortMax uint   `mapstructure:"http_port_max"`
 
-	SSHConfig   `mapstructure:",squash"`
-	
+	SSHConfig `mapstructure:",squash"`
+
 	OutputDir string `mapstructure:"output_directory"`
 	Format    string `mapstructure:"format"`
 	KeepVM    string `mapstructure:"keep_vm"`
 	IPGetter  string `mapstructure:"ip_getter"`
+
+	SkipCertVerification bool   `mapstructure:"skip_cert_verification"`
+	ServerCert           string `mapstructure:"server_cert"`
 }
 
 func (c *CommonConfig) Prepare(ctx *interpolate.Context, pc *common.PackerConfig) []error {
@@ -113,6 +117,16 @@ func (c *CommonConfig) Prepare(ctx *interpolate.Context, pc *common.PackerConfig
 		errs = append(errs, errors.New("remote_host must be specified."))
 	}
 
+	if !c.SkipCertVerification && c.ServerCert == "" {
+		errs = append(errs, errors.New("server_cert must be specified when skip_cert_verification is false."))
+	}
+
+	for _, f := range c.CDFiles {
+		if _, err := os.Stat(f); os.IsNotExist(err) {
+			errs = append(errs, fmt.Errorf("cd_files: '%s' does not exist", f))
+		}
+	}
+
 	if c.HostPortMin > c.HostPortMax {
 		errs = append(errs, errors.New("the host min port must be less than the max"))
 	}

builder/xenserver/common/config.hcl2spec.go

@@ -155,7 +155,7 @@ func (self *Builder) Prepare(raws ...interface{}) (params []string, warns []stri
 }
 
 func (self *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
-	c, err := xscommon.NewXenAPIClient(self.config.HostIp, self.config.Username, self.config.Password)
+	c, err := xscommon.NewXenAPIClient(self.config.HostIp, self.config.Username, self.config.Password, self.config.SkipCertVerification, self.config.ServerCert)
 
 	if err != nil {
 		return nil, err

builder/xenserver/iso/builder.go

@@ -90,7 +90,7 @@ func (self *Builder) Prepare(raws ...interface{}) (params []string, warns []stri
 
 func (self *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
 	//Setup XAPI client
-	c, err := xscommon.NewXenAPIClient(self.config.HostIp, self.config.Username, self.config.Password)
+	c, err := xscommon.NewXenAPIClient(self.config.HostIp, self.config.Username, self.config.Password, self.config.SkipCertVerification, self.config.ServerCert)
 
 	if err != nil {
 		return nil, err