iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply same url encoding to other places we call ovftool

This commit is contained in:
Megan Marsh 2020-07-23 17:03:42 -07:00
parent 1b6b44589d
commit 74aef3c819
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builder/vmware/common/driver_config.go
View File

@ -99,10 +99,16 @@ func (c *DriverConfig) Validate(SkipExport bool) error {
// now, so that we don't fail for a simple mistake after a long // now, so that we don't fail for a simple mistake after a long
// build // build
ovftool := GetOVFTool() ovftool := GetOVFTool()
ovfToolArgs := []string{"--noSSLVerify", "--verifyOnly", fmt.Sprintf("vi://%s:%s@%s",
url.QueryEscape(c.RemoteUser), // Generate the uri of the host, with embedded credentials
url.QueryEscape(c.RemotePassword), ovftool_uri := fmt.Sprintf("vi://%s", c.RemoteHost)
c.RemoteHost)} u, err := url.Parse(ovftool_uri)
if err != nil {
return fmt.Errorf("Couldn't generate uri for ovftool: %s", err)
}
u.User = url.UserPassword(c.RemoteUser, c.RemotePassword)
ovfToolArgs := []string{"--noSSLVerify", "--verifyOnly", u.String()}
var out bytes.Buffer var out bytes.Buffer
cmdCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second) cmdCtx, cancel := context.WithTimeout(context.Background(), 15*time.Second)

40
builder/vmware/common/step_export.go
View File

@ -38,22 +38,28 @@ func GetOVFTool() string {
return ovftool return ovftool
} }
func (s *StepExport) generateArgs(c *DriverConfig, displayName string, hidePassword bool) []string { func (s *StepExport) generateArgs(c *DriverConfig, displayName string, hidePassword bool) ([]string, error) {
password := url.QueryEscape(c.RemotePassword)
username := url.QueryEscape(c.RemoteUser)
if hidePassword { ovftool_uri := fmt.Sprintf("vi://%s/%s", c.RemoteHost, displayName)
password = "****" u, err := url.Parse(ovftool_uri)
if err != nil {
return []string{}, err
} }
password := c.RemotePassword
if hidePassword {
password = "<password_redacted>"
}
u.User = url.UserPassword(c.RemoteUser, password)
args := []string{ args := []string{
"--noSSLVerify=true", "--noSSLVerify=true",
"--skipManifestCheck", "--skipManifestCheck",
"-tt=" + s.Format, "-tt=" + s.Format,
u.String(),
"vi://" + username + ":" + password + "@" + c.RemoteHost + "/" + displayName,
s.OutputDir, s.OutputDir,
} }
return append(s.OVFToolOptions, args...) return append(s.OVFToolOptions, args...), nil
} }
func (s *StepExport) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { func (s *StepExport) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
@ -91,9 +97,23 @@ func (s *StepExport) Run(ctx context.Context, state multistep.StateBag) multiste
if v, ok := state.GetOk("display_name"); ok { if v, ok := state.GetOk("display_name"); ok {
displayName = v.(string) displayName = v.(string)
} }
ui.Message(fmt.Sprintf("Executing: %s %s", ovftool, strings.Join(s.generateArgs(c, displayName, true), " "))) ui_args, err := s.generateArgs(c, displayName, true)
if err != nil {
err := fmt.Errorf("Couldn't generate ovftool uri: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
ui.Message(fmt.Sprintf("Executing: %s %s", ovftool, strings.Join(ui_args, " ")))
var out bytes.Buffer var out bytes.Buffer
cmd := exec.Command(ovftool, s.generateArgs(c, displayName, false)...) args, err := s.generateArgs(c, displayName, false)
if err != nil {
err := fmt.Errorf("Couldn't generate ovftool uri: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
cmd := exec.Command(ovftool, args...)
cmd.Stdout = &out cmd.Stdout = &out
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
err := fmt.Errorf("Error exporting virtual machine: %s\n%s\n", err, out.String()) err := fmt.Errorf("Error exporting virtual machine: %s\n%s\n", err, out.String())