Refactor powershell provisioner
Use the common elevated code instead.
This commit is contained in:
Matt Dainty
parent
a42f8fac4d
commit
2e4b00f59d
|
|
@ -1,100 +0,0 @@
|
||||||
package powershell
|
|
||||||
|
|
||||||
import (
|
|
||||||
"text/template"
|
|
||||||
)
|
|
||||||
|
|
||||||
type elevatedOptions struct {
|
|
||||||
User string
|
|
||||||
Password string
|
|
||||||
TaskName string
|
|
||||||
TaskDescription string
|
|
||||||
LogFile string
|
|
||||||
XMLEscapedCommand string
|
|
||||||
}
|
|
||||||
|
|
||||||
var elevatedTemplate = template.Must(template.New("ElevatedCommand").Parse(`
|
|
||||||
$name = "{{.TaskName}}"
|
|
||||||
$log = [System.Environment]::ExpandEnvironmentVariables("{{.LogFile}}")
|
|
||||||
$s = New-Object -ComObject "Schedule.Service"
|
|
||||||
$s.Connect()
|
|
||||||
$t = $s.NewTask($null)
|
|
||||||
$xml = [xml]@'
|
|
||||||
<?xml version="1.0" encoding="UTF-16"?>
|
|
||||||
<Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
|
|
||||||
<RegistrationInfo>
|
|
||||||
<Description>{{.TaskDescription}}</Description>
|
|
||||||
</RegistrationInfo>
|
|
||||||
<Principals>
|
|
||||||
<Principal id="Author">
|
|
||||||
<UserId>{{.User}}</UserId>
|
|
||||||
<LogonType>Password</LogonType>
|
|
||||||
<RunLevel>HighestAvailable</RunLevel>
|
|
||||||
</Principal>
|
|
||||||
</Principals>
|
|
||||||
<Settings>
|
|
||||||
<MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>
|
|
||||||
<DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>
|
|
||||||
<StopIfGoingOnBatteries>false</StopIfGoingOnBatteries>
|
|
||||||
<AllowHardTerminate>true</AllowHardTerminate>
|
|
||||||
<StartWhenAvailable>false</StartWhenAvailable>
|
|
||||||
<RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
|
|
||||||
<IdleSettings>
|
|
||||||
<StopOnIdleEnd>false</StopOnIdleEnd>
|
|
||||||
<RestartOnIdle>false</RestartOnIdle>
|
|
||||||
</IdleSettings>
|
|
||||||
<AllowStartOnDemand>true</AllowStartOnDemand>
|
|
||||||
<Enabled>true</Enabled>
|
|
||||||
<Hidden>false</Hidden>
|
|
||||||
<RunOnlyIfIdle>false</RunOnlyIfIdle>
|
|
||||||
<WakeToRun>false</WakeToRun>
|
|
||||||
<ExecutionTimeLimit>PT24H</ExecutionTimeLimit>
|
|
||||||
<Priority>4</Priority>
|
|
||||||
</Settings>
|
|
||||||
<Actions Context="Author">
|
|
||||||
<Exec>
|
|
||||||
<Command>cmd</Command>
|
|
||||||
<Arguments>/c {{.XMLEscapedCommand}}</Arguments>
|
|
||||||
</Exec>
|
|
||||||
</Actions>
|
|
||||||
</Task>
|
|
||||||
'@
|
|
||||||
$logon_type = 1
|
|
||||||
$password = "{{.Password}}"
|
|
||||||
if ($password.Length -eq 0) {
|
|
||||||
$logon_type = 5
|
|
||||||
$password = $null
|
|
||||||
$ns = New-Object System.Xml.XmlNamespaceManager($xml.NameTable)
|
|
||||||
$ns.AddNamespace("ns", $xml.DocumentElement.NamespaceURI)
|
|
||||||
$node = $xml.SelectSingleNode("/ns:Task/ns:Principals/ns:Principal/ns:LogonType", $ns)
|
|
||||||
$node.ParentNode.RemoveChild($node) | Out-Null
|
|
||||||
}
|
|
||||||
$t.XmlText = $xml.OuterXml
|
|
||||||
if (Test-Path variable:global:ProgressPreference){$ProgressPreference="SilentlyContinue"}
|
|
||||||
$f = $s.GetFolder("\")
|
|
||||||
$f.RegisterTaskDefinition($name, $t, 6, "{{.User}}", $password, $logon_type, $null) | Out-Null
|
|
||||||
$t = $f.GetTask("\$name")
|
|
||||||
$t.Run($null) | Out-Null
|
|
||||||
$timeout = 10
|
|
||||||
$sec = 0
|
|
||||||
while ((!($t.state -eq 4)) -and ($sec -lt $timeout)) {
|
|
||||||
Start-Sleep -s 1
|
|
||||||
$sec++
|
|
||||||
}
|
|
||||||
|
|
||||||
$line = 0
|
|
||||||
do {
|
|
||||||
Start-Sleep -m 100
|
|
||||||
if (Test-Path $log) {
|
|
||||||
Get-Content $log | select -skip $line | ForEach {
|
|
||||||
$line += 1
|
|
||||||
Write-Output "$_"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} while (!($t.state -eq 3))
|
|
||||||
$result = $t.LastTaskResult
|
|
||||||
if (Test-Path $log) {
|
|
||||||
Remove-Item $log -Force -ErrorAction SilentlyContinue | Out-Null
|
|
||||||
}
|
|
||||||
[System.Runtime.Interopservices.Marshal]::ReleaseComObject($s) | Out-Null
|
|
||||||
exit $result`))
|
|
||||||
|
|
@ -4,8 +4,6 @@ package powershell
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"bytes"
|
|
||||||
"encoding/xml"
|
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
|
@ -20,6 +18,7 @@ import (
|
||||||
commonhelper "github.com/hashicorp/packer/helper/common"
|
commonhelper "github.com/hashicorp/packer/helper/common"
|
||||||
"github.com/hashicorp/packer/helper/config"
|
"github.com/hashicorp/packer/helper/config"
|
||||||
"github.com/hashicorp/packer/packer"
|
"github.com/hashicorp/packer/packer"
|
||||||
|
"github.com/hashicorp/packer/provisioner"
|
||||||
"github.com/hashicorp/packer/template/interpolate"
|
"github.com/hashicorp/packer/template/interpolate"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -498,90 +497,29 @@ func (p *Provisioner) createCommandTextPrivileged() (command string, err error)
|
||||||
return "", fmt.Errorf("Error processing command: %s", err)
|
return "", fmt.Errorf("Error processing command: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// OK so we need an elevated shell runner to wrap our command, this is
|
command, err = provisioner.GenerateElevatedRunner(command, p)
|
||||||
// going to have its own path generate the script and update the command
|
|
||||||
// runner in the process
|
|
||||||
path, err := p.generateElevatedRunner(command)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("Error generating elevated runner: %s", err)
|
return "", fmt.Errorf("Error generating elevated runner: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return the path to the elevated shell wrapper
|
|
||||||
command = fmt.Sprintf("powershell -executionpolicy bypass -file \"%s\"", path)
|
|
||||||
|
|
||||||
return command, err
|
return command, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Provisioner) generateElevatedRunner(command string) (uploadedPath string, err error) {
|
func (p *Provisioner) Communicator() packer.Communicator {
|
||||||
log.Printf("Building elevated command wrapper for: %s", command)
|
return p.communicator
|
||||||
|
}
|
||||||
|
|
||||||
var buffer bytes.Buffer
|
func (p *Provisioner) ElevatedUser() string {
|
||||||
|
return p.config.ElevatedUser
|
||||||
|
}
|
||||||
|
|
||||||
// Output from the elevated command cannot be returned directly to the
|
func (p *Provisioner) ElevatedPassword() string {
|
||||||
// Packer console. In order to be able to view output from elevated
|
|
||||||
// commands and scripts an indirect approach is used by which the commands
|
|
||||||
// output is first redirected to file. The output file is then 'watched'
|
|
||||||
// by Packer while the elevated command is running and any content
|
|
||||||
// appearing in the file is written out to the console. Below the portion
|
|
||||||
// of command required to redirect output from the command to file is
|
|
||||||
// built and appended to the existing command string
|
|
||||||
taskName := fmt.Sprintf("packer-%s", uuid.TimeOrderedUUID())
|
|
||||||
// Only use %ENVVAR% format for environment variables when setting the log
|
|
||||||
// file path; Do NOT use $env:ENVVAR format as it won't be expanded
|
|
||||||
// correctly in the elevatedTemplate
|
|
||||||
logFile := `%SYSTEMROOT%/Temp/` + taskName + ".out"
|
|
||||||
command += fmt.Sprintf(" > %s 2>&1", logFile)
|
|
||||||
|
|
||||||
// elevatedTemplate wraps the command in a single quoted XML text string
|
|
||||||
// so we need to escape characters considered 'special' in XML.
|
|
||||||
err = xml.EscapeText(&buffer, []byte(command))
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("Error escaping characters special to XML in command %s: %s", command, err)
|
|
||||||
}
|
|
||||||
escapedCommand := buffer.String()
|
|
||||||
log.Printf("Command [%s] converted to [%s] for use in XML string", command, escapedCommand)
|
|
||||||
buffer.Reset()
|
|
||||||
|
|
||||||
// Escape chars special to PowerShell in the ElevatedUser string
|
|
||||||
escapedElevatedUser := psEscape.Replace(p.config.ElevatedUser)
|
|
||||||
if escapedElevatedUser != p.config.ElevatedUser {
|
|
||||||
log.Printf("Elevated user %s converted to %s after escaping chars special to PowerShell",
|
|
||||||
p.config.ElevatedUser, escapedElevatedUser)
|
|
||||||
}
|
|
||||||
// Replace ElevatedPassword for winrm users who used this feature
|
// Replace ElevatedPassword for winrm users who used this feature
|
||||||
p.config.ctx.Data = &EnvVarsTemplate{
|
p.config.ctx.Data = &EnvVarsTemplate{
|
||||||
WinRMPassword: getWinRMPassword(p.config.PackerBuildName),
|
WinRMPassword: getWinRMPassword(p.config.PackerBuildName),
|
||||||
}
|
}
|
||||||
|
|
||||||
p.config.ElevatedPassword, _ = interpolate.Render(p.config.ElevatedPassword, &p.config.ctx)
|
elevatedPassword, _ := interpolate.Render(p.config.ElevatedPassword, &p.config.ctx)
|
||||||
|
|
||||||
// Escape chars special to PowerShell in the ElevatedPassword string
|
return elevatedPassword
|
||||||
escapedElevatedPassword := psEscape.Replace(p.config.ElevatedPassword)
|
|
||||||
if escapedElevatedPassword != p.config.ElevatedPassword {
|
|
||||||
log.Printf("Elevated password %s converted to %s after escaping chars special to PowerShell",
|
|
||||||
p.config.ElevatedPassword, escapedElevatedPassword)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate command
|
|
||||||
err = elevatedTemplate.Execute(&buffer, elevatedOptions{
|
|
||||||
User: escapedElevatedUser,
|
|
||||||
Password: escapedElevatedPassword,
|
|
||||||
TaskName: taskName,
|
|
||||||
TaskDescription: "Packer elevated task",
|
|
||||||
LogFile: logFile,
|
|
||||||
XMLEscapedCommand: escapedCommand,
|
|
||||||
})
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("Error creating elevated template: %s", err)
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
uuid := uuid.TimeOrderedUUID()
|
|
||||||
path := fmt.Sprintf(`C:/Windows/Temp/packer-elevated-shell-%s.ps1`, uuid)
|
|
||||||
log.Printf("Uploading elevated shell wrapper for command [%s] to [%s]", command, path)
|
|
||||||
err = p.communicator.Upload(path, &buffer, nil)
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("Error preparing elevated powershell script: %s", err)
|
|
||||||
}
|
|
||||||
return path, err
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue