Commit Graph

66 Commits

Author SHA1 Message Date
Scott Maxwell f0017b8330 Fix import * and a bunch of PEP8 formatting 2014-03-07 20:45:26 -08:00
Jeff Forcier 7688c7aaaf More minor whitespacey bits 2014-03-07 12:32:53 -08:00
Jeff Forcier 7e8623f06f Fix a bunch of indentation errors.
Maybe that whitespace merge flag was not so great an idea.
2014-03-05 17:12:09 -08:00
Jeff Forcier b2be63ec62 Merge remote-tracking branch 'scottkmaxwell/py3-support-without-py25' into python3
Conflicts:
	dev-requirements.txt
	paramiko/__init__.py
	paramiko/file.py
	paramiko/hostkeys.py
	paramiko/message.py
	paramiko/proxy.py
	paramiko/server.py
	paramiko/transport.py
	paramiko/util.py
	paramiko/win_pageant.py
	setup.py
2014-03-05 17:03:37 -08:00
Jeff Forcier 01f365a3e1 Client info fields 2014-02-26 11:39:33 -08:00
Jeff Forcier 91c47b1748 s/python/Python/, c'mon son! 2014-02-21 15:46:58 -08:00
Jeff Forcier f836c98e5c Don't actually need :class: anywhere now 2014-02-21 12:16:11 -08:00
Jeff Forcier f09b562fa8 Replace accidental class-refs on local method-refs 2014-02-21 12:15:29 -08:00
Jeff Forcier 3f9270c0be Mass SnR of class refs with dotted ones.
Boo on Sphinx for not letting me just change this behavior
by default.

There are a handful of incorrect items here that will get
tweaked later.
2014-02-21 11:11:10 -08:00
Jeff Forcier eb332c781b Reorganize Client so API doc flows better 2014-02-21 10:21:19 -08:00
Olle Lundberg 24635609dc Epydoc -> Sphinx. 2014-01-23 11:32:59 +01:00
Scott Maxwell b9e62182e5 Merge remote-tracking branch 'master/master' into py3-support-without-py25
Conflicts:
	paramiko/__init__.py
	setup.py
	tests/test_client.py
2014-01-16 19:50:53 -08:00
Nathan Scowcroft 0fea895cdb ditto 2014-01-08 12:45:22 -08:00
Nathan Scowcroft a1c1f8f29f Check correct stored hosts filename. 2014-01-08 12:45:14 -08:00
Scott Maxwell 2da5f1fb45 Use 'with' for opening most file and SFTPFIle objects 2013-11-19 08:56:53 -08:00
Scott Maxwell 25dd096da0 Change all exceptions to modern format (not Py2.5 compatible) 2013-11-19 08:06:35 -08:00
Scott Maxwell 45e65b6e1e Make sftp.open handle binary and text, more type conversion 2013-11-02 14:56:43 -07:00
Scott Maxwell 0b7d0cf0a2 Convert and detect types properly, use helper constants, use StringIO and range 2013-10-30 17:14:52 -07:00
Scott Maxwell 2ea352b8ba Fix dict iters, sorts, exceptions, bytes renames and tuple args 2013-10-30 16:46:33 -07:00
Jeff Forcier e25c7c4bdf Merge branch '1.9' into 1.10 2013-09-27 21:29:51 -07:00
Jeff Forcier 2de9c72720 Merge branch '1.8' into 1.9 2013-09-27 21:29:41 -07:00
Jeff Forcier 83f44878ea Fixed a typo in the license header of most files
Conflicts:
	paramiko/proxy.py
2013-09-27 21:29:18 -07:00
Mike Gabriel 1b928df15e do not write ,,garbage'' to known_hosts file(s) 2013-04-27 20:36:45 -07:00
Mike Gabriel 81f87f1d5e Load host entries from the known_hosts file(s) before writing the file from RAM to disk. Avoids loss of host entries in case other SSH clients have written to the known_hosts file(s) meanwhile. 2013-04-27 20:36:45 -07:00
Phillip Heller edc9eaf4f2 Added width_pixel and height_pixel parameters to Channel.get_pty() and
resize_pty(), and Client.invoke_shell().  Perhaps useless, but more RFC
compliant.  Updated methods to include these parameters in server messages.

Adjusted Channel.resize_pty() to neither request nor wait for a response, as
per RFC 4254 6.7 (A response SHOULD NOT be sent to this message.)  This is
necessary as certain hosts have been observed to not acknowledge this type of
channel request (Cisco IOS XR), which causes paramiko to end the session.
2013-03-01 10:33:03 -08:00
Michael van der Kolff cd51bfc031 Add support for get_pty to SSHClient.exec_command() 2012-11-30 22:02:09 +11:00
Jeff Forcier 2575b3efc4 Fix #94 2012-11-29 08:52:39 -08:00
Jeff Forcier 2403504b44 Fix #113: add timeout passthru to exec_command 2012-11-28 22:22:33 -08:00
Jeff Forcier f9b7ce902f Tweak docstring re #77 2012-11-05 13:30:56 -08:00
Steven Noonan 31ea4f0734 SSHClient: add 'sock' parameter to connect() for tunneling
Re #77

This parameter, if set, can be used to make Paramiko wrap an existing socket
connected to a remote SSH server. For instance, you could set up another
SSHClient directly connected to a "gateway" host, and then create a direct-tcpip
tunnel to a "target" host directly accessible from the gateway's perspective
(e.g. think of trying to establish an SSH connection to hosts behind a NAT).
The gateway host would then establish a TCP connection to the target host
directly, and a channel is exposed on the client side. This channel could be
wrapped by an SSHClient class using the connect() function, avoiding the need
to establish a new TCP connnection.

This effectively allows you to create tunneled SSH connections.

Based on work by Oskari Saarenmaa <os@ohmu.fi>, in Paramiko pull request #39.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
2012-11-05 13:30:48 -08:00
Jeff Forcier 2e016358ef Whitespace + lang tweak 2012-09-25 18:09:35 -07:00
Jeff Forcier 66118cad83 Improve unknown-server exception language
Fixes #11
(cherry picked from commit 01ab79211c3aeeb8dd55dafff3ce7b3a77844ca6)
2012-09-24 18:58:59 -07:00
Douglas Turk 681a465f32 Handle/fix handling of EINTR errors in a few places.
(cherry picked from commit 351bdb72e539c373985e108c89f61839f3acdd2a)

Conflicts:
	paramiko/agent.py
	paramiko/client.py
	paramiko/transport.py
2012-09-24 18:58:54 -07:00
Jeff Forcier 7ead8d9c70 Fix unbound local variable exception
(cherry picked from commit 503d7e62602cfe3ed63a4f44fba12874a17aa199)
2012-09-24 18:56:45 -07:00
Andrew 38dec6fc5b - make sure we honor 2-factor for all auth_pkey blocks
- explicit check for ['password'] as remaining auth type
(cherry picked from commit 53a3421da6d74333c4679fd6289d418917833b44)
2012-09-24 18:54:30 -07:00
Andrew b592eb1074 make sure to break out of key auth loop on success when doing 2-factor
(cherry picked from commit 0a4aa8a9d119022adef3b8d89f129ea26110fc1a)
2012-09-23 16:46:07 -07:00
Andrew 33176b90f7 add support for 2 factor authentication (key+password)
(cherry picked from commit be19c273bbe77d58fd67edeabf344ff253997b23)
2012-09-23 16:46:06 -07:00
John Adams 33fd998a94 patch ssh-agent handling to not leak file descriptors 2011-02-01 02:43:17 -08:00
Robey Pointer 188c82eede patch from Michele Bertoldi to allow compression to be turned on in the client constructor. 2010-04-25 13:37:13 -07:00
Robey Pointer 3242df7f09 i lost who sent this to me (sorry). patches to fix AIX. 2010-04-25 13:34:54 -07:00
Robey Pointer 71e872e23a bug 426925: lookup host keys correctly when they have a different port. 2009-11-01 21:28:47 -08:00
Robey Pointer c628faa102 bug 411910: when asking for a sockaddr, ask for streams only. 2009-11-01 18:58:23 -08:00
Robey Pointer e80cec73b6 bug 363163: copy the SSHClient AF patch to transport.py too. 2009-10-31 16:10:59 -07:00
Robey Pointer 60c6e94e7d fix my email address to be the current one. 2009-07-19 19:45:02 -07:00
Robey Pointer adb349bf2b fix tests. 2009-05-10 21:19:10 -07:00
Shikhar Bhushan 044814ba16 typo 2009-04-18 18:50:19 +02:00
Shikhar Bhushan 20e3306f3d fix ipv6 support in SSHClient 2009-04-18 18:26:12 +02:00
Robey Pointer 5e32b33be7 patch from maxime ripard adding ip6 support. 2009-04-14 18:55:25 -07:00
Robey Pointer c2ef48cf18 [project @ robey@lag.net-20080706203706-zqxb69qrcgyuf90n]
allow multiple key files to be specified in SSHClient.
suggested by Bernhard Walle.
2008-07-06 13:37:06 -07:00
Robey Pointer 7b819f0e91 [project @ robey@lag.net-20080323024555-s95m60jycc8dt14q]
bug 192749: document that SSHClient.connect may throw socket.error.
2008-03-22 19:45:55 -07:00