Commit Graph

956 Commits

Author SHA1 Message Date
Olle Lundberg ad587fa0ef 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
2012-10-16 13:57:05 +02:00
Olle Lundberg f33481cc44 Add test for host negation. 2012-10-16 13:53:06 +02:00
Olle Lundberg 3174b6c894 Updated tests for new ssh config format. 2012-10-16 13:52:21 +02:00
Jeff Forcier 786920a320 Merge branch '1.8' 2012-10-15 13:33:16 -07:00
Jeff Forcier dfb45dec7f Refactoring: it's a thing. Re #85 2012-10-15 13:21:58 -07:00
Jeff Forcier 7c12862b55 Only override unittest assertions when absolutely necessary.
Fixes #85
2012-10-15 12:57:39 -07:00
Jeff Forcier 1341e28882 Move SFTPClient.get() termination condition to loop end.
Ensures callback always executes even for zero-len files.

Fixes #90
2012-10-14 21:46:50 -07:00
Jeff Forcier 78815afe9d Merge branch '1.8'
Conflicts:
	NEWS
2012-10-14 20:40:59 -07:00
Jeff Forcier 8e5f774965 Meh fabfile for docs uploading 2012-10-14 20:40:39 -07:00
Jeff Forcier 45969670db Add 1.9.0 to master NEWS 2012-10-14 17:06:36 -07:00
Jeff Forcier e99399ce66 Set up 1.8.1 chunk in NEWS 2012-10-14 17:05:18 -07:00
Jeff Forcier e3ab0489f3 Add missing release date to NEWS for 1.8.0 2012-10-14 17:03:47 -07:00
Jeff Forcier 09488c665b 80-col fix 2012-09-25 22:09:49 -07:00
Jeff Forcier 2d7355da5e Fix module import in tests 2012-09-25 18:11:30 -07:00
Jeff Forcier 71456b8990 Correct dev-installation doc in package metadata 2012-09-25 18:10:28 -07:00
Jeff Forcier 2e016358ef Whitespace + lang tweak 2012-09-25 18:09:35 -07:00
Jeff Forcier 30a2d14b78 Init header update 2012-09-25 18:05:01 -07:00
Jeff Forcier 47c5b3a65b Nuke old copy of original README 2012-09-24 19:19:41 -07:00
Jeff Forcier 3cba95f112 Transition back to Paramiko's readme; update to be currently accurate 2012-09-24 19:19:00 -07:00
Jeff Forcier 217512430d Remove extraneous changelog lines from 'ssh' 2012-09-24 19:14:34 -07:00
Jeff Forcier f0c953dcf6 Namespace issue numbers appropriately 2012-09-24 19:12:54 -07:00
Jeff Forcier c9db81861a For now, merge ssh CHANGES file into paramiko NEWS 2012-09-24 19:09:53 -07:00
Jeff Forcier dd6fb2577d Bump to 0.8.x due to nontrivial changes
(cherry picked from commit d7def60c4784fed39fc8714753304a150da131c7)

Conflicts:
	setup.py
2012-09-24 19:00:19 -07:00
Jeff Forcier 3c01fdda14 Fix #28: hide interpreter-death threading exceptions
(cherry picked from commit 3709d2e02bf67ccc272e1f2311e5db125a922ba0)
2012-09-24 18:59:54 -07:00
Jeff Forcier 43f8236063 Changelog re #40
(cherry picked from commit c27915d55182cfa22c517c2d6d887316fc89c80a)
2012-09-24 18:59:50 -07:00
Jeff Forcier f8bb0433a2 Travis integration
(cherry picked from commit 4cb9fed74bbde4730d2901dde4adb7cb47ae796a)
2012-09-24 18:59:39 -07:00
Jeff Forcier 557eb524f0 Exit correctly so test.py can be used in CI
(cherry picked from commit d516fe71ea1d8bdb7b2e278fa519f7f860d7e234)
2012-09-24 18:59:37 -07:00
Jeff Forcier e0be91a4c9 Fixes to failing-test teardowns to avoid more exceptions or hangs
(cherry picked from commit 734f3d6f42ef1564f473fee5526e0354fc8196fc)

Conflicts:
	test.py
2012-09-24 18:59:33 -07:00
Jeff Forcier 212fe74f09 Whitespace
(cherry picked from commit baa930eb583b65938cfcfa272a1eb2af12df3502)
2012-09-24 18:59:09 -07:00
Jeff Forcier 88df2ac180 Changelog re #11
(cherry picked from commit c8e76e3a801098ecfec02fe52cd83bb7fab9f19a)
2012-09-24 18:59:04 -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
Laurent Peuch 400ea089d5 add the url to github in the setup.py for pypi
(cherry picked from commit abfefc2f95c377cc134d9b0b71c8cdd692f321c8)

Conflicts:
	setup.py
2012-09-24 18:56:20 -07:00
Jeff Forcier 45c1212949 Changelog re #36
(cherry picked from commit 5b8cdd990fea9269f8b5297ad1e3e52de08f2ee6)
2012-09-24 18:54:33 -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
Jeff Forcier 25942dbd90 Attribution re: #33
(cherry picked from commit 8793771f3804b3f9bb4bf63d0b36ca105de78979)
2012-09-23 16:46:03 -07:00
Jeff Forcier 7f3124dcd9 Attribution re #32
(cherry picked from commit 2f4303df3e7477dca28badee2f1cc14573befab6)
2012-09-23 16:45:54 -07:00
Thomas Vander Stichele 01aaf70fc2 show us the offending host key
(cherry picked from commit a753df8ea43c26114942147fde2f10f82da5ca29)
2012-09-23 16:45:53 -07:00
Jan Brauer 7f526044e0 re #33 - fix typo, be more pythonic
(cherry picked from commit 803820c3c8b1aaf2a11588431582916dbb23ea1e)
2012-09-23 16:45:51 -07:00
Jan Brauer d18b8cf1e9 Fix #33 - parse config as described by manpage
(cherry picked from commit 011805eae07ee7be6140b95f6d8669763c55b3d9)
2012-09-23 16:45:49 -07:00
Jeff Forcier d3dc9fcb19 Attribution for Paramiko 63
(cherry picked from commit 00518b5044344adcc9a7b2363676165d9c80b80f)
2012-09-23 16:45:47 -07:00
Jeff Forcier 627f05e116 Changelog for previous commit
(cherry picked from commit c9c7d36ce1139f3186e8494162d4fc918a38a052)
2012-09-23 16:45:44 -07:00
Jeff Forcier 898a4041a6 Fix SSHException when re-keying over a fast connection
Port of https://github.com/paramiko/paramiko/pull/63
(cherry picked from commit a7fcb4def4d43f69a00861c5e6a28dcd4d1aae6f)
2012-09-23 16:45:36 -07:00
Jeff Forcier f04ddd420d Fix broken tests
(cherry picked from commit 00e1072ee5abbc92b5df57e10cadb638d583d971)

Conflicts:
	tests/test_util.py
2012-09-23 16:45:28 -07:00
Jeff Forcier 01735419f3 Bump to 1.7.14
(cherry picked from commit c3a7e9d587)

Conflicts:
	setup.py
2012-09-23 16:20:01 -07:00
Jeff Forcier 077fdae801 Reorganize forwarded agent cxns to avoid errors
Fixes [Fabric #562](https://github.com/fabric/fabric/issues/562).
(cherry picked from commit 58aa52085b)
2012-09-23 16:19:42 -07:00
Jeff Forcier 1a033dc596 safe type checking (isinstance instead of type-is)
Maintainer note: added changelog entry.
(cherry picked from commit 8917d83221)
2012-09-23 16:19:40 -07:00