Page MenuHomePhabricator
Files F15419924

D13340.id32278.diff
No OneTemporary
Actions

D13340.id32278.diff
View Options

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
@@ -42,46 +42,8 @@
$this->openCredentialsIfNotOpen();
$argv = func_get_args();
-
- if ($this->getConfig('platform') === 'windows') {
- // Handle Windows by executing the command under PowerShell.
- $command = id(new PhutilCommandString($argv))
- ->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
-}
-EOF;
-
- // When Microsoft says "Unicode" they don't mean UTF-8.
- $script = mb_convert_encoding($script, 'UTF-16LE');
-
- $script = base64_encode($script);
-
- $powershell =
- 'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe';
- $powershell .=
- ' -ExecutionPolicy Bypass'.
- ' -NonInteractive'.
- ' -InputFormat Text'.
- ' -OutputFormat Text'.
- ' -EncodedCommand '.$script;
-
- $full_command = $powershell;
- } else {
- // Handle UNIX by executing under the native shell.
- $argv = $this->applyWorkingDirectoryToArgv($argv);
-
- $full_command = call_user_func_array('csprintf', $argv);
- }
+ $argv = $this->applyWorkingDirectoryToArgv($argv);
+ $full_command = call_user_func_array('csprintf', $argv);
$command_timeout = '';
if ($this->connectTimeout !== null) {

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 22, 9:56 AM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7709777
Default Alt Text
D13340.id32278.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility