Commit Graph

771 Commits

Author SHA1 Message Date
Jeff Forcier 277526315e Changelog re #93 2013-03-01 09:42:09 -08:00
Olle Lundberg 1903ee1432 Pep8 fixes 2013-02-28 12:52:01 +01:00
Olle Lundberg 732417bf98 Merge branch 'openssh-compatibility' of github.com:lndbrg/paramiko into openssh-compatibility
Conflicts:
	paramiko/config.py
	tests/test_util.py
2013-02-28 12:51:00 +01:00
Olle Lundberg 06f9704820 Pep8 fixes 2013-02-28 12:45:07 +01:00
Olle Lundberg 93dce43e86 Fix argument passed to LazyFqdn 2013-02-28 12:36:21 +01:00
Olle Lundberg 38767982cd Fix broken test. 2013-02-28 12:36:03 +01:00
Olle Lundberg f41fc8fd28 Create a copy of the identityfile list.
The copy is needed else the original
identityfile list is in the internal
config list is updated when we modify
the return dictionary.
2013-02-28 12:31:59 +01:00
Olle Lundberg 109d2b200a Add tests for identityfile parsing. 2013-02-28 12:31:53 +01:00
Olle Lundberg ea3c3f53b6 DRY up the code for populating the return list 2013-02-28 12:14:59 +01:00
Olle Lundberg c79e6a3f92 Whitespace fixes. 2013-02-28 12:14:59 +01:00
Olle Lundberg 32424ba109 Be more pythonic. 2013-02-28 12:11:41 +01:00
Olle Lundberg ac1310c4a1 Implement support for parsing proxycommand. 2013-02-28 12:11:41 +01:00
Olle Lundberg b3d5156019 Add tests for proxycommand parsing. 2013-02-28 12:10:55 +01:00
Olle Lundberg 42d77483e8 Pep8 fixes 2013-02-28 12:10:55 +01:00
Olle Lundberg 85551dffd6 Spelling 2013-02-28 12:08:59 +01:00
Olle Lundberg 57d776b318 Add host negation support to paramiko config.
This is a rewrite of the SSHConfig class to
conform with the rules specified by the
manpage for ssh_config.
This change also adds support for negation
according to the rules introduced by
OpenSSH 5.9. Reference:
http://www.openssh.com/txt/release-5.9
2013-02-28 12:08:59 +01:00
Olle Lundberg 21689d9647 Add test for host negation. 2013-02-28 12:06:51 +01:00
Olle Lundberg 98ae4e975d Updated tests for new ssh config format. 2013-02-28 12:05:03 +01:00
Jeff Forcier 3563fca994 Refactor duplicative code re #110 2013-02-27 19:54:22 -08:00
Jeff Forcier b9242c654a Changelog re #110 2013-02-27 19:49:29 -08:00
John Hensley 9d2fb82284 Document SSHConfig FQDN logic.
Merged with pre-picked changes re #128.

Conflicts:
	paramiko/config.py
2013-02-27 19:48:50 -08:00
Jeff Forcier bf4b535920 Changelog re #128 2013-02-27 19:40:09 -08:00
Parantapa Bhattacharya 2f1daad1b9 Compute host's FQDN on demand only 2013-02-27 19:03:49 -08:00
Jeff Forcier e034a24f87 Add changelog entry re #102 2013-02-27 18:50:40 -08:00
Jeff Forcier 7e5911a1ff Give sdctr a default value for backwards+test compat
Re #102
2013-02-27 18:50:37 -08:00
Kent Gibson adad068b13 Don't random pad packets for SDCTR ciphers 2013-02-27 18:47:04 -08:00
Jeff Forcier 8e697988af Changelog + docs re #127 2013-02-27 15:56:09 -08:00
Jeff Forcier a69abd4606 Merge pull request #127 from mwilliamson/sftp-file-context-manager
Turn SFTPFile into a context manager
2013-02-27 15:50:48 -08:00
Jeff Forcier f493a00c11 Merge branch 'master' of github.com:paramiko/paramiko 2013-02-27 15:32:27 -08:00
Jeff Forcier ac9370d3e0 Changelog re #116 2013-02-27 15:32:19 -08:00
Jeff Forcier 37d0247301 Merge pull request #116 from mvschaik/patch-1
Limit memory allocation of get_bytes to 1MB
2013-02-27 15:31:20 -08:00
Jeff Forcier e761502e8e Add changelog entry re #115 2013-02-03 12:54:53 -08:00
Jeff Forcier 6b5d748358 Merge pull request #115 from mvanderkolff/master
Add get_pty named argument to SSHClient.exec_command()
2013-02-03 12:53:35 -08:00
Jeff Forcier 0d38f3f1f2 Merge remote-tracking branch 'origin/master' 2013-02-03 11:53:13 -08:00
Jeff Forcier 0c56e2a40b Merge branch '1.9' 2013-02-03 11:52:36 -08:00
Jeff Forcier 6284666cfd Merge branch '1.8' into 1.9 2013-02-03 11:52:30 -08:00
Jeff Forcier bf87cd124d Update explicitly-stated Python version reqs to 2.5+ 2013-02-03 11:52:11 -08:00
Jeff Forcier 235050a67c Merge pull request #105 from clarete/master
tox structure
2013-02-03 11:22:25 -08:00
Michael Williamson 08109136b4 Replace useless version check with import from __future__ 2013-01-05 00:15:26 +00:00
Michael Williamson 0b6aebb8a9 Verify Python version >= 2.6 before running context manager test 2013-01-05 00:05:58 +00:00
Michael Williamson 602250fdf9 Turn SFTPFile into a context manager 2013-01-04 23:43:15 +00:00
Jeff Forcier 21cb9a2d86 Merge branch '1.9' 2012-12-31 16:54:00 -05:00
Jeff Forcier 876c9bdbda Merge branch '1.8' into 1.9 2012-12-31 16:53:55 -05:00
Jeff Forcier d5edad63a3 New year 2012-12-31 16:53:51 -05:00
Maarten 3bbcf808d8 Limit memory allocation of get_bytes to 1MB
If get_bytes() can pad unlimited, a RSA pub key could be crafted
that would allocate GB's of nulls, thereby forming a DoS-vector.
2012-11-30 15:14:49 +01: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 0ae0e9800c Changelog re #71 2012-11-29 18:06:38 -08:00
Jeff Forcier 2cbe383080 Apply put() version of #90 2012-11-29 16:16:35 -08:00
Eric Buehl 9c0d467667 allow uploading of files from an open file object 2012-11-29 16:09:47 -08:00
Jeff Forcier 70fce374b4 Merge branch '1.9' 2012-11-29 15:37:28 -08:00