ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-23 15:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #569 from resin-io/permit-ssh-controlmaster

Browse Source 
Do not explicitly disable ControlMaster option for device SSH connections
This commit is contained in:
Kostas Lekkas 2017-06-29 11:54:19 +03:00 committed by GitHub
commit 3095938b0e
7 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added ### Added
- Do not explicitly disable ControlMaster option for device SSH connections
- Fix issue when using resin deploy with non-standard stdin (e.g. git bash on windows) - Fix issue when using resin deploy with non-standard stdin (e.g. git bash on windows)
## [6.0.0] - 2017-06-26 ## [6.0.0] - 2017-06-26

4
build/actions/local/promote.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.6 // Generated by CoffeeScript 1.12.5
/* /*
Copyright 2017 Resin.io Copyright 2017 Resin.io
@ -51,7 +51,7 @@ module.exports = {
_.assign(options, { _.assign(options, {
deviceIp: deviceIp deviceIp: deviceIp
}); });
command = "ssh " + verbose + " -t -p " + options.port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlMaster=no root@" + options.deviceIp + " -- \"resin-provision interactive\""; command = "ssh " + verbose + " -t -p " + options.port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@" + options.deviceIp + " -- \"resin-provision interactive\"";
subShellCommand = getSubShellCommand(command); subShellCommand = getSubShellCommand(command);
return child_process.spawn(subShellCommand.program, subShellCommand.args, { return child_process.spawn(subShellCommand.program, subShellCommand.args, {
stdio: 'inherit' stdio: 'inherit'

4
build/actions/local/ssh.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.6 // Generated by CoffeeScript 1.12.5
/* /*
Copyright 2017 Resin.io Copyright 2017 Resin.io
@ -76,7 +76,7 @@ module.exports = {
return options.container; return options.container;
}).then(function(container) { }).then(function(container) {
var command, shellCmd, subShellCommand; var command, shellCmd, subShellCommand;
command = "ssh " + verbose + " -t -p " + options.port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlMaster=no root@" + options.deviceIp; command = "ssh " + verbose + " -t -p " + options.port + " -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@" + options.deviceIp;
if (!options.host) { if (!options.host) {
shellCmd = '/bin/sh -c $"\'if [ -e /bin/bash ]; then exec /bin/bash; else exec /bin/sh; fi\'"'; shellCmd = '/bin/sh -c $"\'if [ -e /bin/bash ]; then exec /bin/bash; else exec /bin/sh; fi\'"';
command += " docker exec -ti " + container + " " + shellCmd; command += " docker exec -ti " + container + " " + shellCmd;

4
build/actions/ssh.js
View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.6 // Generated by CoffeeScript 1.12.5
/* /*
Copyright 2016-2017 Resin.io Copyright 2016-2017 Resin.io
@ -112,7 +112,7 @@ module.exports = {
return Promise["try"](function() { return Promise["try"](function() {
var command, sshProxyCommand, subShellCommand; var command, sshProxyCommand, subShellCommand;
sshProxyCommand = getSshProxyCommand(hasTunnelBin); sshProxyCommand = getSshProxyCommand(hasTunnelBin);
command = "ssh " + verbose + " -t -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ControlMaster=no " + sshProxyCommand + " -p " + options.port + " " + username + "@ssh." + proxyUrl + " enter " + uuid + " " + containerId; command = "ssh " + verbose + " -t -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null " + sshProxyCommand + " -p " + options.port + " " + username + "@ssh." + proxyUrl + " enter " + uuid + " " + containerId;
subShellCommand = getSubShellCommand(command); subShellCommand = getSubShellCommand(command);
return child_process.spawn(subShellCommand.program, subShellCommand.args, { return child_process.spawn(subShellCommand.program, subShellCommand.args, {
stdio: 'inherit' stdio: 'inherit'

1
lib/actions/local/promote.coffee
View File

@ -69,7 +69,6 @@ module.exports =
-o LogLevel=ERROR \ -o LogLevel=ERROR \
-o StrictHostKeyChecking=no \ -o StrictHostKeyChecking=no \
-o UserKnownHostsFile=/dev/null \ -o UserKnownHostsFile=/dev/null \
-o ControlMaster=no \
root@#{options.deviceIp} \ root@#{options.deviceIp} \
-- \"resin-provision interactive\"" -- \"resin-provision interactive\""

1
lib/actions/local/ssh.coffee
View File

@ -97,7 +97,6 @@ module.exports =
-o LogLevel=ERROR \ -o LogLevel=ERROR \
-o StrictHostKeyChecking=no \ -o StrictHostKeyChecking=no \
-o UserKnownHostsFile=/dev/null \ -o UserKnownHostsFile=/dev/null \
-o ControlMaster=no \
root@#{options.deviceIp}" root@#{options.deviceIp}"
if not options.host if not options.host

1
lib/actions/ssh.coffee
View File

@ -121,7 +121,6 @@ module.exports =
-o LogLevel=ERROR \ -o LogLevel=ERROR \
-o StrictHostKeyChecking=no \ -o StrictHostKeyChecking=no \
-o UserKnownHostsFile=/dev/null \ -o UserKnownHostsFile=/dev/null \
-o ControlMaster=no \
#{sshProxyCommand} \ #{sshProxyCommand} \
-p #{options.port} #{username}@ssh.#{proxyUrl} enter #{uuid} #{containerId}" -p #{options.port} #{username}@ssh.#{proxyUrl} enter #{uuid} #{containerId}"