From fd5e29b5a8aff1fe9f11f9f7bee5f0eb85ae569a Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 11:22:07 -0800 Subject: Somehow missed a pretty important change in the changelog --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index ed9fd008..30bca139 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,8 @@ v1.8.1 (DD MM YYYY) v1.8.0 (3rd Oct 2012) --------------------- +* #17 ('ssh' 28): Fix spurious `NoneType has no attribute 'error'` and similar + exceptions that crop up on interpreter exit. * 'ssh' 32: Raise a more useful error explaining which `known_hosts` key line was problematic, when encountering `binascii` issues decoding known host keys. Thanks to `@thomasvs` for catch & patch. -- cgit v1.2.3 From 31244a2ccbf9e2e8607236e859cbf38ddafd6060 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 13:30:20 -0800 Subject: Changelog re #77 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 30bca139..f13cb9a8 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Releases v1.9.0 (DD MM YYYY) ------------------- +* #77: Allow `SSHClient.connect()` to take an explicit `sock` parameter + overriding creation of an internal, implicit socket object. v1.8.1 (DD MM YYYY) ------------------- -- cgit v1.2.3 From 8e8dcea2953dfd888602f37330c9f26e3f151244 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 15:34:46 -0800 Subject: Add in big attribution big in prep for having ProxyCommand done --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index f13cb9a8..02ec1421 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,10 @@ v1.9.0 (DD MM YYYY) * #77: Allow `SSHClient.connect()` to take an explicit `sock` parameter overriding creation of an internal, implicit socket object. +* Thanks in no particular order to Erwin Bolwidt, Oskari Saarenmaa, Steven + Noonan, Vladimir Lazarenko, Lincoln de Sousa, Valentino Volonghi and Github + user `@acrish` for the various and sundry patches leading to the above + changes. v1.8.1 (DD MM YYYY) ------------------- -- cgit v1.2.3 From fb5d245b3148250bb3d7d6b46c2ec2b7914982a7 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 17:04:25 -0800 Subject: More attributions --- NEWS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 02ec1421..83a524c5 100644 --- a/NEWS +++ b/NEWS @@ -18,9 +18,9 @@ v1.9.0 (DD MM YYYY) * #77: Allow `SSHClient.connect()` to take an explicit `sock` parameter overriding creation of an internal, implicit socket object. * Thanks in no particular order to Erwin Bolwidt, Oskari Saarenmaa, Steven - Noonan, Vladimir Lazarenko, Lincoln de Sousa, Valentino Volonghi and Github - user `@acrish` for the various and sundry patches leading to the above - changes. + Noonan, Vladimir Lazarenko, Lincoln de Sousa, Valentino Volonghi, Olle + Lundberg, and Github user `@acrish` for the various and sundry patches + leading to the above changes. v1.8.1 (DD MM YYYY) ------------------- -- cgit v1.2.3 From 7a3cb790a6561f391be6118b75b9f74513820517 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 5 Nov 2012 17:55:37 -0800 Subject: Changelog re #97 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 83a524c5..75dda2c2 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ Releases v1.9.0 (DD MM YYYY) ------------------- +* #97 (with a little #93): Improve config parsing of `ProxyCommand` directives + and provide a wrapper class to allow subprocess-driven proxy commands to be + used as `sock=` arguments for `SSHClient.connect`. * #77: Allow `SSHClient.connect()` to take an explicit `sock` parameter overriding creation of an internal, implicit socket object. * Thanks in no particular order to Erwin Bolwidt, Oskari Saarenmaa, Steven -- cgit v1.2.3 From 7f4c26f8601b2335b210896d2cb06348957e7aae Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 6 Nov 2012 13:08:41 -0800 Subject: Cut 1.8.1 --- NEWS | 4 ++-- paramiko/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index adcc1b91..26382ff2 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.8.1 (DD MM YYYY) -------------------- +v1.8.1 (6th Nov 2012) +--------------------- * #90: Ensure that callbacks handed to `SFTPClient.get()` always fire at least once, even for zero-length files downloaded. Thanks to Github user `@enB` for diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 8c158538..cd4dbe02 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -55,7 +55,7 @@ if sys.version_info < (2, 2): __author__ = "Jeff Forcier " -__version__ = "1.8.0" +__version__ = "1.8.1" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/setup.py b/setup.py index 73407b03..06597c6d 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.platform == 'darwin': setup(name = "paramiko", - version = "1.8.0", + version = "1.8.1", description = "SSH2 protocol library", author = "Jeff Forcier", author_email = "jeff@bitprophet.org", -- cgit v1.2.3 From 65de2529a9e21f66c72f6335886db5a7f2ea6b75 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 6 Nov 2012 13:10:03 -0800 Subject: Update changelog date for 1.9.0 --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index d7d37092..55420463 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.9.0 (DD MM YYYY) -------------------- +v1.9.0 (6th Nov 2012) +--------------------- * #97 (with a little #93): Improve config parsing of `ProxyCommand` directives and provide a wrapper class to allow subprocess-driven proxy commands to be -- cgit v1.2.3 From 2403504b44de773c3f566e7d647bc0e8661af918 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 28 Nov 2012 22:22:33 -0800 Subject: Fix #113: add timeout passthru to exec_command --- NEWS | 7 +++++++ paramiko/client.py | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 55420463..0627ad80 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,13 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +v1.10.0 (DD MM YYYY) +-------------------- + +* #113: Add `timeout` parameter to `SSHClient.exec_command` for easier setting + of the command's internal channel object's timeout. Thanks to Cernov Vladimir + for the patch. + v1.9.0 (6th Nov 2012) --------------------- diff --git a/paramiko/client.py b/paramiko/client.py index 07560a39..97ae4494 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -350,7 +350,7 @@ class SSHClient (object): self._agent.close() self._agent = None - def exec_command(self, command, bufsize=-1): + def exec_command(self, command, bufsize=-1, timeout=None): """ Execute a command on the SSH server. A new L{Channel} is opened and the requested command is executed. The command's input and output @@ -361,12 +361,15 @@ class SSHClient (object): @type command: str @param bufsize: interpreted the same way as by the built-in C{file()} function in python @type bufsize: int + @param timeout: set command's channel timeout. See L{Channel.settimeout}.settimeout + @type timeout: int @return: the stdin, stdout, and stderr of the executing command @rtype: tuple(L{ChannelFile}, L{ChannelFile}, L{ChannelFile}) @raise SSHException: if the server fails to execute the command """ chan = self._transport.open_session() + chan.settimeout(timeout) chan.exec_command(command) stdin = chan.makefile('wb', bufsize) stdout = chan.makefile('rb', bufsize) -- cgit v1.2.3 From 2575b3efc48cb9f42c3105015284b9afd9c67625 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 29 Nov 2012 08:52:39 -0800 Subject: Fix #94 --- NEWS | 2 ++ paramiko/client.py | 3 +-- paramiko/config.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 0627ad80..2dba8e0e 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,8 @@ v1.10.0 (DD MM YYYY) * #113: Add `timeout` parameter to `SSHClient.exec_command` for easier setting of the command's internal channel object's timeout. Thanks to Cernov Vladimir for the patch. +* #94: Remove duplication of SSH port constant. Thanks to Olle Lundberg for the + catch. v1.9.0 (6th Nov 2012) --------------------- diff --git a/paramiko/client.py b/paramiko/client.py index 97ae4494..a777b45b 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -28,6 +28,7 @@ import warnings from paramiko.agent import Agent from paramiko.common import * +from paramiko.config import SSH_PORT from paramiko.dsskey import DSSKey from paramiko.hostkeys import HostKeys from paramiko.resource import ResourceManager @@ -37,8 +38,6 @@ from paramiko.transport import Transport from paramiko.util import retry_on_signal -SSH_PORT = 22 - class MissingHostKeyPolicy (object): """ Interface for defining the policy that L{SSHClient} should use when the diff --git a/paramiko/config.py b/paramiko/config.py index 2828d903..d1ce9490 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -25,7 +25,7 @@ import os import re import socket -SSH_PORT=22 +SSH_PORT = 22 proxy_re = re.compile(r"^(proxycommand)\s*=*\s*(.*)", re.I) -- cgit v1.2.3 From f6ed6a8bbff9aabc58176b04e61c84b0509ecb7b Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 29 Nov 2012 08:55:43 -0800 Subject: Changelog re #80, fixes #80 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 2dba8e0e..1a6427a1 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,9 @@ v1.10.0 (DD MM YYYY) for the patch. * #94: Remove duplication of SSH port constant. Thanks to Olle Lundberg for the catch. +* #80: Expose the internal "is closed" property of the file transfer class + `BufferedFile` as `.closed`, better conforming to Python's file interface. + Thanks to `@smunaut` and James Hiscock for catch & patch. v1.9.0 (6th Nov 2012) --------------------- -- cgit v1.2.3 From 0ae0e9800c7bfb3f8ea40fa0d33ebf6dff49f759 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 29 Nov 2012 18:06:38 -0800 Subject: Changelog re #71 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 1a6427a1..1cfaa7e7 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ Releases v1.10.0 (DD MM YYYY) -------------------- +* #71: Add `SFTPClient.putfo` and `.getfo` methods to allow direct + uploading/downloading of file-like objects. Thanks to Eric Buehl for the + patch. * #113: Add `timeout` parameter to `SSHClient.exec_command` for easier setting of the command's internal channel object's timeout. Thanks to Cernov Vladimir for the patch. -- cgit v1.2.3 From e761502e8ec5958c27228006314e423057ff8c9d Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Sun, 3 Feb 2013 12:54:53 -0800 Subject: Add changelog entry re #115 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 1cfaa7e7..0fe99f5a 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ Releases v1.10.0 (DD MM YYYY) -------------------- +* #115: Add convenience `get_pty` kwarg to `Client.exec_command` so users not + manually controlling a channel object can still toggle PTY creation. Thanks + to Michael van der Kolff for the patch. * #71: Add `SFTPClient.putfo` and `.getfo` methods to allow direct uploading/downloading of file-like objects. Thanks to Eric Buehl for the patch. -- cgit v1.2.3 From ac9370d3e0e4a645f893028c9dee0ece20c4f0d3 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 27 Feb 2013 15:32:19 -0800 Subject: Changelog re #116 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 0fe99f5a..10b2bf54 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Releases v1.10.0 (DD MM YYYY) -------------------- +* #116: Limit `Message.get_bytes` to an upper bound of 1MB to protect against + potential DoS vectors. Thanks to `@mvschaik` for catch & patch. * #115: Add convenience `get_pty` kwarg to `Client.exec_command` so users not manually controlling a channel object can still toggle PTY creation. Thanks to Michael van der Kolff for the patch. -- cgit v1.2.3 From 8e697988af494f4cd499911c9a15ee25d6e2a492 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 27 Feb 2013 15:56:09 -0800 Subject: Changelog + docs re #127 --- NEWS | 2 ++ paramiko/sftp_client.py | 2 +- paramiko/sftp_file.py | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 10b2bf54..cd98477a 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Releases v1.10.0 (DD MM YYYY) -------------------- +* #127: Turn `SFTPFile` into a context manager. Thanks to Michael Williamson +* for the patch. * #116: Limit `Message.get_bytes` to an upper bound of 1MB to protect against potential DoS vectors. Thanks to `@mvschaik` for catch & patch. * #115: Add convenience `get_pty` kwarg to `Client.exec_command` so users not diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py index 8cb8ceaf..7df643f5 100644 --- a/paramiko/sftp_client.py +++ b/paramiko/sftp_client.py @@ -198,7 +198,7 @@ class SFTPClient (BaseSFTP): Open a file on the remote server. The arguments are the same as for python's built-in C{file} (aka C{open}). A file-like object is returned, which closely mimics the behavior of a normal python file - object. + object, including the ability to be used as a context manager. The mode indicates how the file is to be opened: C{'r'} for reading, C{'w'} for writing (truncating an existing file), C{'a'} for appending, diff --git a/paramiko/sftp_file.py b/paramiko/sftp_file.py index c9fc76f5..d4ecb89f 100644 --- a/paramiko/sftp_file.py +++ b/paramiko/sftp_file.py @@ -34,6 +34,9 @@ from paramiko.sftp_attr import SFTPAttributes class SFTPFile (BufferedFile): """ Proxy object for a file on the remote server, in client mode SFTP. + + Instances of this class may be used as context managers in the same way + that built-in Python file objects are. """ # Some sftp servers will choke if you send read/write requests larger than -- cgit v1.2.3 From e034a24f87ca24171fceb9f9069149f3fc76d51b Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 27 Feb 2013 18:50:19 -0800 Subject: Add changelog entry re #102 --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index cd98477a..6a70e860 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,10 @@ Releases v1.10.0 (DD MM YYYY) -------------------- +* #102: Forego random padding for packets when running under `*-ctr` ciphers. + This corrects some slowdowns on platforms where random byte generation is + inefficient (e.g. Windows). Thanks to `@warthog618` for catch & patch, and + Michael van der Kolff for code/technique review. * #127: Turn `SFTPFile` into a context manager. Thanks to Michael Williamson * for the patch. * #116: Limit `Message.get_bytes` to an upper bound of 1MB to protect against -- cgit v1.2.3 From bf4b535920eee426ceae1ade30a62e7afd698619 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 27 Feb 2013 19:40:09 -0800 Subject: Changelog re #128 --- NEWS | 3 +++ 1 file changed, 3 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 6a70e860..53d87fde 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ Releases v1.10.0 (DD MM YYYY) -------------------- +* #128: Defer FQDN resolution until needed, when parsing SSH config files. This + will speed up some operations on systems whose local hostnames are not in + DNS. Thanks to Parantapa Bhattacharya for catch & patch. * #102: Forego random padding for packets when running under `*-ctr` ciphers. This corrects some slowdowns on platforms where random byte generation is inefficient (e.g. Windows). Thanks to `@warthog618` for catch & patch, and -- cgit v1.2.3 From b9242c654abd3ec5137f482436f57a306b151573 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 27 Feb 2013 19:49:29 -0800 Subject: Changelog re #110 --- NEWS | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 53d87fde..7b45d621 100644 --- a/NEWS +++ b/NEWS @@ -15,9 +15,10 @@ Releases v1.10.0 (DD MM YYYY) -------------------- -* #128: Defer FQDN resolution until needed, when parsing SSH config files. This - will speed up some operations on systems whose local hostnames are not in - DNS. Thanks to Parantapa Bhattacharya for catch & patch. +* #110: Honor SSH config `AddressFamily` setting when looking up local + host's FQDN. Thanks to John Hensley for the patch. +* #128: Defer FQDN resolution until needed, when parsing SSH config files. + Thanks to Parantapa Bhattacharya for catch & patch. * #102: Forego random padding for packets when running under `*-ctr` ciphers. This corrects some slowdowns on platforms where random byte generation is inefficient (e.g. Windows). Thanks to `@warthog618` for catch & patch, and -- cgit v1.2.3 From 277526315e18c7190a92471eab61d3610331c7df Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 1 Mar 2013 09:42:09 -0800 Subject: Changelog re #93 --- NEWS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 7b45d621..e30e4332 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,9 @@ Releases v1.10.0 (DD MM YYYY) -------------------- +* #93: Overhaul SSH config parsing to be in line with `man ssh_config` (& the + behavior of `ssh` itself), including addition of parameter expansion within + config values. Thanks to Olle Lundberg for the patch. * #110: Honor SSH config `AddressFamily` setting when looking up local host's FQDN. Thanks to John Hensley for the patch. * #128: Defer FQDN resolution until needed, when parsing SSH config files. @@ -24,7 +27,7 @@ v1.10.0 (DD MM YYYY) inefficient (e.g. Windows). Thanks to `@warthog618` for catch & patch, and Michael van der Kolff for code/technique review. * #127: Turn `SFTPFile` into a context manager. Thanks to Michael Williamson -* for the patch. + for the patch. * #116: Limit `Message.get_bytes` to an upper bound of 1MB to protect against potential DoS vectors. Thanks to `@mvschaik` for catch & patch. * #115: Add convenience `get_pty` kwarg to `Client.exec_command` so users not -- cgit v1.2.3 From dd7edd8ec85e339b2ad6dd7d64abf25c8396b0ea Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 1 Mar 2013 10:34:35 -0800 Subject: Changelog re #133, and date fix for 1.10 --- NEWS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index e30e4332..3f6add65 100644 --- a/NEWS +++ b/NEWS @@ -12,9 +12,13 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.10.0 (DD MM YYYY) +v1.10.0 (1st Mar 2013) -------------------- +* #133: Fix handling of window-change events to be on-spec and not + attempt to wait for a response from the remote sshd; this fixes problems with + less common targets such as some Cisco devices. Thanks to Phillip Heller for + catch & patch. * #93: Overhaul SSH config parsing to be in line with `man ssh_config` (& the behavior of `ssh` itself), including addition of parameter expansion within config values. Thanks to Olle Lundberg for the patch. -- cgit v1.2.3 From 721f74d8c240071e444ed1cdfff432c75339e8b2 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 1 Mar 2013 12:01:35 -0800 Subject: Changelog re #66, re #141. Fixes #66 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 3f6add65..f34a8769 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Releases v1.10.0 (1st Mar 2013) -------------------- +* #66: Batch SFTP writes to help speed up file transfers. Thanks to Olle + Lundberg for the patch. * #133: Fix handling of window-change events to be on-spec and not attempt to wait for a response from the remote sshd; this fixes problems with less common targets such as some Cisco devices. Thanks to Phillip Heller for -- cgit v1.2.3 From abe009b14980d8547b111f07ca9ca782c0bb47a6 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 4 Mar 2013 08:49:47 -0500 Subject: Update NEWS per #142 --- NEWS | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index f34a8769..363b8389 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,12 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +v1.10.1 (...) +------------- + +* #142: (Fabric #811) SFTP put of empty file will still return the attributes + of the put file. Thanks to Jason R. Coombs for the patch. + v1.10.0 (1st Mar 2013) -------------------- @@ -325,7 +331,7 @@ v1.5 (paras) 02oct05 separation * demo scripts fixed to have a better chance of loading the host keys correctly on windows/cygwin - + v1.4 (oddish) 17jul05 --------------------- * added SSH-agent support (for posix) from john rochester -- cgit v1.2.3 From 17ba0d5b61fe0c87b6b7b657d1b74176931f890f Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 5 Apr 2013 11:51:19 -0700 Subject: Dumb format tweak to NEWS --- NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 363b8389..f135005f 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.10.1 (...) -------------- +v1.10.1 (DD MM YYYY) +-------------------- * #142: (Fabric #811) SFTP put of empty file will still return the attributes of the put file. Thanks to Jason R. Coombs for the patch. -- cgit v1.2.3 From 1d494eb0db49316365d9328059a8bf869c7e95c0 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 5 Apr 2013 12:58:44 -0700 Subject: Changelog re #154 --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index f135005f..9f7805e5 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,10 @@ v1.10.1 (DD MM YYYY) * #142: (Fabric #811) SFTP put of empty file will still return the attributes of the put file. Thanks to Jason R. Coombs for the patch. +* #154: (Fabric #876) Forwarded SSH agent connections left stale local pipes + lying around, which could cause local (and sometimes remote or network) + resource starvation when running many agent-using remote commands. Thanks to + Kevin Tegtmeier for catch & patch. v1.10.0 (1st Mar 2013) -------------------- -- cgit v1.2.3 From 02d071be07fef362764b13a99dd9335a668c9117 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 5 Apr 2013 13:00:19 -0700 Subject: Bump version to 1.10.1 --- NEWS | 4 ++-- paramiko/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 9f7805e5..7a983baf 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.10.1 (DD MM YYYY) --------------------- +v1.10.1 (5th Apr 2013) +---------------------- * #142: (Fabric #811) SFTP put of empty file will still return the attributes of the put file. Thanks to Jason R. Coombs for the patch. diff --git a/paramiko/__init__.py b/paramiko/__init__.py index e2b359fb..099314ea 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -55,7 +55,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier " -__version__ = "1.10.0" +__version__ = "1.10.1" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/setup.py b/setup.py index 9812a4f4..d6caccf7 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ if sys.platform == 'darwin': setup(name = "paramiko", - version = "1.10.0", + version = "1.10.1", description = "SSH2 protocol library", author = "Jeff Forcier", author_email = "jeff@bitprophet.org", -- cgit v1.2.3 From 3966ac103c988218be02371803817b66b4deab17 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Sat, 27 Apr 2013 22:12:24 -0700 Subject: Changelog re #146 (also start 10.10.2 section) --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 7a983baf..1bb2d37d 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,12 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +v1.10.2 (DD MM 2013) +-------------------- + +* #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch + & patch. + v1.10.1 (5th Apr 2013) ---------------------- -- cgit v1.2.3 From 8c7f120c2cfb119ece27b4eea375de10ef5df554 Mon Sep 17 00:00:00 2001 From: Ethan Glasser-Camp Date: Mon, 25 Mar 2013 14:35:24 -0400 Subject: Warn on parse failure when reading known_hosts --- NEWS | 2 ++ paramiko/hostkeys.py | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 1bb2d37d..efee92d9 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,8 @@ Releases v1.10.2 (DD MM 2013) -------------------- +* #153, #67: Warn on parse failure when reading known_hosts + file. Thanks to `@glasserc` for patch. * #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch & patch. diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index e739312a..c54d2e74 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -28,6 +28,7 @@ import UserDict from paramiko.common import * from paramiko.dsskey import DSSKey from paramiko.rsakey import RSAKey +from paramiko.util import get_logger class InvalidHostKey(Exception): @@ -48,7 +49,7 @@ class HostKeyEntry: self.hostnames = hostnames self.key = key - def from_line(cls, line): + def from_line(cls, line, lineno=None): """ Parses the given line of text to find the names for the host, the type of key, and the key data. The line is expected to be in the @@ -61,9 +62,12 @@ class HostKeyEntry: @param line: a line from an OpenSSH known_hosts file @type line: str """ + log = get_logger('paramiko.hostkeys') fields = line.split(' ') if len(fields) < 3: # Bad number of fields + log.warn("Not enough fields found in known_hosts in line %s (%r)" % + (lineno, line)) return None fields = fields[:3] @@ -78,6 +82,7 @@ class HostKeyEntry: elif keytype == 'ssh-dss': key = DSSKey(data=base64.decodestring(key)) else: + log.warn("Unable to handle key of type %s" % (keytype,)) return None except binascii.Error, e: raise InvalidHostKey(line, e) @@ -160,11 +165,11 @@ class HostKeys (UserDict.DictMixin): @raise IOError: if there was an error reading the file """ f = open(filename, 'r') - for line in f: + for lineno, line in enumerate(f): line = line.strip() if (len(line) == 0) or (line[0] == '#'): continue - e = HostKeyEntry.from_line(line) + e = HostKeyEntry.from_line(line, lineno) if e is not None: self._entries.append(e) f.close() -- cgit v1.2.3 From c8b75a489c569ea71b2166c6fbcc7f773397da3b Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 26 Jul 2013 15:04:16 -0700 Subject: Update changelog for release --- NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index efee92d9..0ad9f6b4 100644 --- a/NEWS +++ b/NEWS @@ -12,11 +12,11 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.10.2 (DD MM 2013) --------------------- +v1.10.2 (26th Jul 2013) +----------------------- -* #153, #67: Warn on parse failure when reading known_hosts - file. Thanks to `@glasserc` for patch. +* #153, #67: Warn on parse failure when reading known_hosts file. Thanks to + `@glasserc` for patch. * #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch & patch. -- cgit v1.2.3 From f7d74d03d9f1f6ec10b0f7df3061384afdb61b48 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 20 Sep 2013 13:44:28 -0700 Subject: Changelog entry re #162 --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 0ad9f6b4..d052ebbd 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,13 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +v1.10.3 (20th Sep 2013) +----------------------- + +* #162: Clean up HMAC module import to avoid deadlocks in certain uses of + SSHClient. Thanks to Gernot Hillier for the catch & suggested + fix. + v1.10.2 (26th Jul 2013) ----------------------- -- cgit v1.2.3 From fa61f3c398068895e6a483e3ce1ccc684b18ff49 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 20 Sep 2013 14:13:08 -0700 Subject: Changelog re #36 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index d052ebbd..07ab7994 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,8 @@ v1.10.3 (20th Sep 2013) * #162: Clean up HMAC module import to avoid deadlocks in certain uses of SSHClient. Thanks to Gernot Hillier for the catch & suggested fix. +* #36: Fix the port-forwarding demo to avoid file descriptor errors. Thanks to + Jonathan Halcrow for catch & patch. v1.10.2 (26th Jul 2013) ----------------------- -- cgit v1.2.3 From db9dfebca801efbfd3743d85d4f7916f3996f4f5 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 20 Sep 2013 14:46:32 -0700 Subject: Changelog re #168 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 07ab7994..fadd878c 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,8 @@ v1.10.3 (20th Sep 2013) fix. * #36: Fix the port-forwarding demo to avoid file descriptor errors. Thanks to Jonathan Halcrow for catch & patch. +* #168: Update config handling to properly handle multiple 'localforward' and + 'remoteforward' keys. Thanks to Emre Yılmaz for the patch. v1.10.2 (26th Jul 2013) ----------------------- -- cgit v1.2.3 From 8b983d9d3d9c91f321c3f18ecc8fa2e9343ce661 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 27 Sep 2013 16:10:56 -0700 Subject: Changelog re #179 --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index fadd878c..28a95cef 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,13 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +v1.10.4 (27th Sep 2013) +----------------------- + +* #179: Fix a missing variable causing errors when an ssh_config file has a + non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for catch + & patch. + v1.10.3 (20th Sep 2013) ----------------------- -- cgit v1.2.3 From 57046f44cb4ba3c9aec6f36eed2d8f3032730871 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 27 Sep 2013 21:16:06 -0700 Subject: Changelog re #200 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 28a95cef..3a3849ef 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,8 @@ v1.10.4 (27th Sep 2013) * #179: Fix a missing variable causing errors when an ssh_config file has a non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for catch & patch. +* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex + Buchanan for catch & Dave Foster for patch. v1.10.3 (20th Sep 2013) ----------------------- -- cgit v1.2.3 From 8fcccce3d50b6abed92ed36224625e632671fc72 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Fri, 27 Sep 2013 21:56:57 -0700 Subject: Changelog re #199, fixes #199 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 3a3849ef..f3d00dd4 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,8 @@ v1.10.4 (27th Sep 2013) & patch. * #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex Buchanan for catch & Dave Foster for patch. +* #199: Typo fix in the license header cross-project. Thanks to Armin Ronacher + for catch & patch. v1.10.3 (20th Sep 2013) ----------------------- -- cgit v1.2.3 From b57e825f77544a88eea77cf65bbe7d2d0426d4c9 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 8 Jan 2014 12:49:27 -0800 Subject: Changelog, fixes #176 --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index f3d00dd4..2b48ba64 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,13 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +v1.10.5 (8th Jan 2014) +---------------------- + +* #176: Fix AttributeError bugs in known_hosts file (re)loading. Thanks to + Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test + case. + v1.10.4 (27th Sep 2013) ----------------------- -- cgit v1.2.3 From 2621db122dddc0ade86db22b7b789143db600c8f Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Tue, 21 Jan 2014 13:49:18 -0800 Subject: Add NEWS entry re #193 and friends --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'NEWS') diff --git a/NEWS b/NEWS index 2b48ba64..f66a0141 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,13 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== +v1.10.6 (21st Jan 2014) +----------------------- + +* #193 (and its attentant PRs #230 & #253): Fix SSH agent problems present on + Windows. Thanks to David Hobbs for initial report and to Aarni Koskela & Olle + Lundberg for the patches. + v1.10.5 (8th Jan 2014) ---------------------- -- cgit v1.2.3 From c563f06954fa7825ee74b9bdba8449b35c975cab Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 30 Jan 2014 10:59:15 -0800 Subject: Nuke sphinx-changelogg'd material --- NEWS | 96 +++----------------------------------------------------------------- 1 file changed, 4 insertions(+), 92 deletions(-) (limited to 'NEWS') diff --git a/NEWS b/NEWS index f66a0141..761f8e48 100644 --- a/NEWS +++ b/NEWS @@ -9,101 +9,13 @@ Issues noted as "'ssh' #NN" can be found at https://github.com/bitprophet/ssh/. Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. -Releases -======== - -v1.10.6 (21st Jan 2014) ------------------------ - -* #193 (and its attentant PRs #230 & #253): Fix SSH agent problems present on - Windows. Thanks to David Hobbs for initial report and to Aarni Koskela & Olle - Lundberg for the patches. - -v1.10.5 (8th Jan 2014) ----------------------- - -* #176: Fix AttributeError bugs in known_hosts file (re)loading. Thanks to - Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test - case. - -v1.10.4 (27th Sep 2013) ------------------------ - -* #179: Fix a missing variable causing errors when an ssh_config file has a - non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for catch - & patch. -* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex - Buchanan for catch & Dave Foster for patch. -* #199: Typo fix in the license header cross-project. Thanks to Armin Ronacher - for catch & patch. -v1.10.3 (20th Sep 2013) ------------------------ - -* #162: Clean up HMAC module import to avoid deadlocks in certain uses of - SSHClient. Thanks to Gernot Hillier for the catch & suggested - fix. -* #36: Fix the port-forwarding demo to avoid file descriptor errors. Thanks to - Jonathan Halcrow for catch & patch. -* #168: Update config handling to properly handle multiple 'localforward' and - 'remoteforward' keys. Thanks to Emre Yılmaz for the patch. - -v1.10.2 (26th Jul 2013) ------------------------ - -* #153, #67: Warn on parse failure when reading known_hosts file. Thanks to - `@glasserc` for patch. -* #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch - & patch. +**PLEASE NOTE:** For changes in 1.10.x and newer releases, please see +www.paramiko.org's changelog page, or the source file, sites/www/changelog.rst -v1.10.1 (5th Apr 2013) ----------------------- -* #142: (Fabric #811) SFTP put of empty file will still return the attributes - of the put file. Thanks to Jason R. Coombs for the patch. -* #154: (Fabric #876) Forwarded SSH agent connections left stale local pipes - lying around, which could cause local (and sometimes remote or network) - resource starvation when running many agent-using remote commands. Thanks to - Kevin Tegtmeier for catch & patch. - -v1.10.0 (1st Mar 2013) --------------------- - -* #66: Batch SFTP writes to help speed up file transfers. Thanks to Olle - Lundberg for the patch. -* #133: Fix handling of window-change events to be on-spec and not - attempt to wait for a response from the remote sshd; this fixes problems with - less common targets such as some Cisco devices. Thanks to Phillip Heller for - catch & patch. -* #93: Overhaul SSH config parsing to be in line with `man ssh_config` (& the - behavior of `ssh` itself), including addition of parameter expansion within - config values. Thanks to Olle Lundberg for the patch. -* #110: Honor SSH config `AddressFamily` setting when looking up local - host's FQDN. Thanks to John Hensley for the patch. -* #128: Defer FQDN resolution until needed, when parsing SSH config files. - Thanks to Parantapa Bhattacharya for catch & patch. -* #102: Forego random padding for packets when running under `*-ctr` ciphers. - This corrects some slowdowns on platforms where random byte generation is - inefficient (e.g. Windows). Thanks to `@warthog618` for catch & patch, and - Michael van der Kolff for code/technique review. -* #127: Turn `SFTPFile` into a context manager. Thanks to Michael Williamson - for the patch. -* #116: Limit `Message.get_bytes` to an upper bound of 1MB to protect against - potential DoS vectors. Thanks to `@mvschaik` for catch & patch. -* #115: Add convenience `get_pty` kwarg to `Client.exec_command` so users not - manually controlling a channel object can still toggle PTY creation. Thanks - to Michael van der Kolff for the patch. -* #71: Add `SFTPClient.putfo` and `.getfo` methods to allow direct - uploading/downloading of file-like objects. Thanks to Eric Buehl for the - patch. -* #113: Add `timeout` parameter to `SSHClient.exec_command` for easier setting - of the command's internal channel object's timeout. Thanks to Cernov Vladimir - for the patch. -* #94: Remove duplication of SSH port constant. Thanks to Olle Lundberg for the - catch. -* #80: Expose the internal "is closed" property of the file transfer class - `BufferedFile` as `.closed`, better conforming to Python's file interface. - Thanks to `@smunaut` and James Hiscock for catch & patch. +Releases +======== v1.9.0 (6th Nov 2012) --------------------- -- cgit v1.2.3