Commit Graph

136 Commits

Author SHA1 Message Date
Megan Marsh 7d40aeaa33 this needs to be _below_ the call to ToPath 2018-10-19 14:24:56 -07:00
Megan Marsh 18c5e8deb8 fix 2018-10-19 13:46:55 -07:00
Megan Marsh 1e4133cbf9 quote upload path 2018-10-19 13:43:13 -07:00
Matthew Hooker 44012b29ec
Remove redundant error message. 2018-05-08 03:25:39 -07:00
Megan Marsh ee1ff3132d remove attempt to discover whether destination is a directory from upload function in various communicators 2018-04-10 08:13:06 -07:00
DanHam 191f407f5c
Fix copy/paste error in comment 2018-03-23 12:54:33 +00:00
Matthew Hooker c5e0710a9a
Do nothing if we detect destination is a directory
We can't modify the destination path in the communicator because it
breaks assumptions in the provisioners. For example, we try to chmod in
the shell provisioner. The chmod command uses the path as supplied by
the user. If the communicator decides to rewrite the path, the
provisioner doesn't know that, and so tries to chmod the wrong thing.

The best we can do is detect that the destination is a directory and
fail.

Also correctly surface output from sftp uploader.
2018-03-20 16:33:00 -07:00
Matthew Hooker 67c7b9d152
display debug log levels 2018-03-20 16:32:55 -07:00
Matthew Hooker ccdee2550b
Treat any output directory test command as error.
Surfaces any communications from the remote end during file
uploads. For example, we might get notifications if we're logging in
with the wrong user. Rather than swallow these, let's show them to the
user.
2018-03-20 16:32:35 -07:00
Matthew Hooker e2f9204c11
replace nil ptr exceptions with infinite loops 2018-03-19 15:52:43 -07:00
Josh Soref 6c1654d421 spelling: separators 2018-03-14 03:21:38 +00:00
Josh Soref eebe236587 spelling: keyboard 2018-03-13 08:07:31 +00:00
Josh Soref fc99dc25ae spelling: error 2018-03-13 07:45:13 +00:00
Matthew Hooker a4123eabe3
prevent 0-value ticker during ssh keepalive 2018-02-12 10:45:53 -08:00
Matthew Hooker ff64ccda55
Merge pull request #5426 from hashicorp/fix_4915
Fix 4915
2018-02-05 14:54:27 -08:00
Matthew Hooker 63f1673909
ssh deadlines 2018-01-31 12:35:25 -08:00
Matthew Hooker cab52872f4
add session level keep-alives for ssh communicator 2018-01-30 22:00:37 -08:00
Matthew Hooker ebe995c0ff
run goimports 2018-01-22 17:21:10 -08:00
Paul Kilar d9b404fa00 SOCKS5 proxy support 2017-10-10 15:04:15 +01:00
Megan Marsh a79d5eff4e implement sftp path 2017-10-05 10:44:18 -07:00
Megan Marsh 93bddb3e65 implement directory fix for lxc file uploads 2017-10-04 13:35:15 -07:00
Megan Marsh b3cc90125d ssh communicator works 2017-10-03 16:36:27 -07:00
Megan Marsh a5e6134819 implement dir check for ssh communicator 2017-10-03 15:55:32 -07:00
Megan Marsh 4e8303f3b4 Merge pull request #5024 from rickard-von-essen/issue-4941
ssh: Renamed ssh_disable_agent to ssh_disable_agent_forwarding
2017-08-28 11:55:26 -07:00
Matthew Hooker ea76b5a693
Show scp output on error 2017-08-10 11:46:38 -07:00
Rickard von Essen 4f6010aa26
ssh: Renamed ssh_disable_agent to ssh_disable_agent_forwarding
Closes: #4941
2017-06-19 16:26:18 +02:00
Roger Shimizu 28ee60d216 handle ABI change of golang-golang-x-crypto-dev
That ABI change was due to CVE security fix

Fix is picked from upstream of golang-golang-x-crypto-dev:
  e4e2799dd7

Closes: #861282
2017-05-14 23:54:04 +09:00
Matthew Hooker 81522dced0
move packer to hashicorp 2017-04-04 13:39:01 -07:00
Matthew Hooker eab4730c29
communicator/ssh: don't return error if we can't close connection. 2017-03-30 02:14:49 -07:00
Matthew Hooker cc11ec3566
check for a couple errors 2017-03-28 20:36:21 -07:00
Matthew Hooker 35578d9ed1
remove unnecessary type conversions 2017-03-28 20:36:21 -07:00
Matthew Hooker 79287d7e47
simplify some code 2017-03-28 20:36:20 -07:00
Matthew Hooker ce259c126a
communicator/ssh: fix nil ptr error
fixes a case where we could return a nil error and nil ssh session.
2017-03-20 14:30:53 -07:00
Vasiliy Tolstov 00ebe9e1d3 various fixes
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2016-11-29 14:55:44 +03:00
Matthew Hooker d920b3fbf4 run gofmt 2016-11-01 14:08:04 -07:00
Matthew Hooker 892d5e82c9 expect_disconnect option
provisioner/shell: Adds option to fail if the remote server disconnects
us.
2016-10-21 11:39:03 -07:00
Matthew Hooker 5747f4e890 prevent panic when ssh reconnect fails 2016-10-14 11:23:35 -07:00
Matthew Hooker 4e93e60313 log unknown error, make ExitMissingError clearer 2016-10-06 11:13:39 -07:00
Matthew Hooker 286b7836fa remove dead code.
continues work from a629f1655b
2016-10-05 18:17:02 -07:00
Matthew Hooker 5ab19ea469 bump ssh library, check for ssh.ExitMissingError
should resolve #3920
2016-10-05 18:16:08 -07:00
开恒 5919f8d552 continue add support for file-provisioner implement directory download feature. 2016-09-18 20:48:30 +08:00
Alex Brown 0cea0e5c24 Swap width and height when allocating a pty
RequestPty from crypto/ssh looks like this:

func (s *Session) RequestPty(term string, h, w int, termmodes TerminalModes) error

So arguments 2 and 3 are height and width, respectively. I'm not sure if
the original was just a typo, or if there's an actual reason we want a
40 column terminal. Either way, having a terminal this narrow led me to
a really "fun" bug[0], where `wget` in my shell provisioner scripts
would segfault when trying to display the progress bar.

[0] http://lists.gnu.org/archive/html/bug-wget/2016-02/msg00041.html
2016-04-06 15:40:19 -04:00
Vasiliy Tolstov feee19e4ed file provisioner improvements
* allow specify source/destination as dir
* allow specify many files as source

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
2016-02-12 11:48:28 -08:00
Alfonso Acosta a59c82d7a6 Add sftp file transfer support
Adds a new config option: "ssh_file_transfer_method", which can be set to "scp"
or "sftp" (defaults to "scp")
2015-07-26 23:49:18 +00:00
Chris Bednarski 0ca03f09c1 Fix some style issues and add a doc to ErrHandshakeTimeout 2015-07-02 11:58:51 -07:00
Chris Bednarski 5dd8ae45c7 Cleanup some resources we may have created 2015-07-02 03:55:18 -07:00
Chris Bednarski 03850cafc6 Implemented timeout around the SSH handshake, including a unit test 2015-07-02 03:40:47 -07:00
Mitchell Hashimoto 8657b1e9d8 communicator/ssh: more logging 2015-06-29 11:40:08 -07:00
Mark Peek d8b6c94012 Fix typo: diabled -> disabled 2015-06-26 10:52:21 -07:00
Mitchell Hashimoto a019575026 helper/communicator: support disabling SSH agent 2015-06-23 14:52:37 -07:00