Page MenuHomePhabricator
Files F18834204

D10378.diff
No OneTemporary
Actions

D10378.diff
View Options

diff --git a/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
--- a/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php
@@ -76,18 +76,7 @@
$cmd = $lease->getInterface('command');
- if ($v_platform !== 'windows') {
- $cmd->execx('mkdir %s', $full_path);
- } else {
- // Windows is terrible. The mkdir command doesn't even support putting
- // the path in quotes. IN QUOTES. ARGUHRGHUGHHGG!! Do some terribly
- // inaccurate sanity checking since we can't safely escape the path.
- if (preg_match('/^[A-Z]\\:\\\\[a-zA-Z0-9\\\\\\ ]/', $full_path) === 0) {
- throw new Exception(
- 'Unsafe path detected for Windows platform: "'.$full_path.'".');
- }
- $cmd->execx('mkdir %C', $full_path);
- }
+ list($stdout, $stderr) = $cmd->execx('mkdir %s', $full_path);
$lease->setAttribute('path', $full_path);
}
diff --git a/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
--- a/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
+++ b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
@@ -41,17 +41,49 @@
$command = id(new PhutilCommandString($argv))
->setEscapingMode(PhutilCommandString::MODE_POWERSHELL);
+ $encapsulate_command = array('%s', (string)$command);
+ $double_command = id(new PhutilCommandString($encapsulate_command))
+ ->setEscapingMode(PhutilCommandString::MODE_POWERSHELL);
+
$change_directory = '';
if ($this->getWorkingDirectory() !== null) {
$change_directory .= 'cd '.$this->getWorkingDirectory();
}
$script = <<<EOF
-$change_directory
-$command
-if (\$LastExitCode -ne 0) {
- exit \$LastExitCode
+\$ErrorActionPreference = 'Continue'
+\$host.UI.RawUI.BufferSize = `
+ New-Object System.Management.Automation.Host.Size(512,50)
+
+\$s = New-PSSession localhost
+\$real_env = Invoke-Command -Session \$s -ErrorAction Continue -ScriptBlock {
+ dir Env:\\
+}
+Remove-PSSession \$s
+foreach (\$entry in (dir Env:\\)) {
+ \$keyname = ("env:" + \$entry.Name)
+ Remove-Item -Path \$keyname
}
+foreach (\$entry in \$real_env) {
+ \$keyname = ("env:" + \$entry.Name)
+ \$keyval = \$entry.Value
+ Set-Item -Path \$keyname -Value \$keyval
+}
+
+$change_directory
+
+# Encode the command as base64...
+\$original_command = $double_command
+\$bytes_command = [System.Text.Encoding]::Unicode.GetBytes(\$original_command)
+\$encoded_command = [Convert]::ToBase64String(\$bytes_command)
+
+# Run powershell from itself to get a "standard" exit code. This still
+# doesn't actually catch every kind of error :(
+C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\powershell.exe `
+ -NonInteractive `
+ -OutputFormat Text `
+ -EncodedCommand \$encoded_command
+exit \$LastExitCode
EOF;
// When Microsoft says "Unicode" they don't mean UTF-8.

File Metadata

Mime Type
text/plain
Expires
Oct 27 2025, 7:14 AM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8642465
Default Alt Text
D10378.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility