x2go-commits

x2go-commits@lists.x2go.org

37910 discussions

python-x2go.git - master (branch) updated: 0.4.0.8-7-g77bf9f6
by git-admin＠x2go.org 04 Sep '13

04 Sep '13

The branch, master has been updated via 77bf9f678ef56d3ccd60c29eba23840fa095c476 (commit) from 9a1a4ca33406da3af938254e18e568c1fc354b10 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 77bf9f678ef56d3ccd60c29eba23840fa095c476 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 4 10:58:45 2013 +0200 Invalidate SSH private keys (filename, pkey object) when look_for_keys is requested. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 4 ++++ x2go/sshproxy.py | 5 +++++ 3 files changed, 11 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 48badf3..4c675f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low plain text password. - Support encryption passphrases on SSH private key files (X2Go SSH connections as well as SSH proxy connections). + - Invalidate SSH private keys (filename, pkey object) when look_for_keys is + requested. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 648b72e..fc1deda 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -778,6 +778,10 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): if self.unique_hostkey_aliases: _fake_hostname = "[%s]:%s" % (hostname, port) + if look_for_keys: + key_filename = None + pkey = None + if use_sshproxy and sshproxy_host and sshproxy_user: try: diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 9ef3cea..8b01748 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -179,6 +179,11 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread): self.local_host = self.local_host.strip() self.remote_host = self.remote_host.strip() + # do not use explicitly given keys if look_for_keys has got activated + if look_for_keys: + sshproxy_key_filename = None + sshproxy_pkey = None + # enforce IPv4 for localhost addresses!!! _hostname = self.hostname if _hostname in ('localhost', 'localhost.localdomain'): hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-paramiko.git - x2go (branch) updated: 39aa60e05a848e7f3613422d377c5e3c0a77e764
by git-admin＠x2go.org 04 Sep '13

04 Sep '13

The branch, x2go has been updated via 39aa60e05a848e7f3613422d377c5e3c0a77e764 (commit) via e6ea5c239d850c5316ed9e73adc412bc73d57ed2 (commit) via 4477e38fa779f7c491002dbe5d0867523435cd05 (commit) via 8eae362ebca99499be1f936fe5409e36ce52c352 (commit) from 3589edbe9676dbcce32fb57885e99e35462f7507 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 39aa60e05a848e7f3613422d377c5e3c0a77e764 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 4 09:48:07 2013 +0200 New upstream release. * New upstream release. * /debian/patches: + Add patch: 002_locked-keys-are-valid.patch + Add patch: 003_hash-hostnames.patch commit e6ea5c239d850c5316ed9e73adc412bc73d57ed2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 4 09:44:31 2013 +0200 Revert "Add method kwarg ,,hash_hostname'' to hostkeys.HostKeyEntry.add() method. Enable host key hashing by default as is standard with serveral current (Open)SSH implementations." This reverts commit 61c56f03a7678124f5115eb00b5015faae11c1e8. commit 4477e38fa779f7c491002dbe5d0867523435cd05 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 4 09:44:20 2013 +0200 Revert "Add method kwarg ,,hash_hostname'' to hostkeys.HostKeyEntry.add() method. Enable host key hashing by default as is standard with serveral current (Open)SSH implementations." This reverts commit a44ccafd66925c53caed0cb9ae65641b7e87acf3. commit 8eae362ebca99499be1f936fe5409e36ce52c352 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 4 09:44:07 2013 +0200 Revert "Detect valid SSH private keys that may require unlocking/decrypting prior to being usable." This reverts commit 3a61f5253c8aba4b88003950fd1c6caa5646190c. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 +++-- debian/patches/002_locked-keys-are-valid.patch | 29 +++++++++++++++++++ debian/patches/003_hash-hostnames.patch | 37 ++++++++++++++++++++++++ debian/patches/series | 2 ++ paramiko/client.py | 5 +--- paramiko/hostkeys.py | 7 ++--- 6 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 debian/patches/002_locked-keys-are-valid.patch create mode 100644 debian/patches/003_hash-hostnames.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 282c6a1..4d9adca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ -paramiko (1.11.0-0~git20130429) UNRELEASED; urgency=low +paramiko (1.11.0-0) UNRELEASED; urgency=low - * New upstream, using Git commit: 777d1576ca825f43d00f699865ead9bc0c37c637. - Development version. + * New upstream release. + * /debian/patches: + + Add patch: 002_locked-keys-are-valid.patch + + Add patch: 003_hash-hostnames.patch -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 29 Apr 2013 13:08:38 +0200 diff --git a/debian/patches/002_locked-keys-are-valid.patch b/debian/patches/002_locked-keys-are-valid.patch new file mode 100644 index 0000000..8a6a92c --- /dev/null +++ b/debian/patches/002_locked-keys-are-valid.patch @@ -0,0 +1,29 @@ +commit 3a61f5253c8aba4b88003950fd1c6caa5646190c +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Date: Wed Sep 4 00:58:46 2013 +0200 + + Detect valid SSH private keys that may require unlocking/decrypting prior to being usable. + +diff --git a/paramiko/client.py b/paramiko/client.py +index 493d548..5b28990 100644 +--- a/paramiko/client.py ++++ b/paramiko/client.py +@@ -33,7 +33,7 @@ from paramiko.dsskey import DSSKey + from paramiko.hostkeys import HostKeys + from paramiko.resource import ResourceManager + from paramiko.rsakey import RSAKey +-from paramiko.ssh_exception import SSHException, BadHostKeyException ++from paramiko.ssh_exception import PasswordRequiredException, SSHException, BadHostKeyException + from paramiko.transport import Transport + from paramiko.util import retry_on_signal + +@@ -466,6 +466,9 @@ class SSHClient (object): + if not two_factor: + return + break ++ except PasswordRequiredException, e: ++ saved_exception = e ++ break + except SSHException, e: + saved_exception = e + diff --git a/debian/patches/003_hash-hostnames.patch b/debian/patches/003_hash-hostnames.patch new file mode 100644 index 0000000..3afa317 --- /dev/null +++ b/debian/patches/003_hash-hostnames.patch @@ -0,0 +1,37 @@ +commit 61c56f03a7678124f5115eb00b5015faae11c1e8 +Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Date: Wed May 8 13:15:59 2013 +0200 + + Add method kwarg ,,hash_hostname'' to hostkeys.HostKeyEntry.add() method. Enable host key hashing by default as is standard with serveral current (Open)SSH implementations. + +diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py +index f64e6e6..0f29f2b 100644 +--- a/paramiko/hostkeys.py ++++ b/paramiko/hostkeys.py +@@ -130,9 +130,9 @@ class HostKeys (UserDict.DictMixin): + if filename is not None: + self.load(filename) + +- def add(self, hostname, keytype, key): ++ def add(self, hostname, keytype, key, hash_hostname=True): + """ +- Add a host key entry to the table. Any existing entry for a ++ Add a host key entry to the table. Any existing entry for a + C{(hostname, keytype)} pair will be replaced. + + @param hostname: the hostname (or IP) to add +@@ -141,11 +141,14 @@ class HostKeys (UserDict.DictMixin): + @type keytype: str + @param key: the key to add + @type key: L{PKey} ++ + """ + for e in self._entries: + if (hostname in e.hostnames) and (e.key.get_name() == keytype): + e.key = key + return ++ if not hostname.startswith('|1|') and hash_hostname: ++ hostname = self.hash_host(hostname) + self._entries.append(HostKeyEntry([hostname], key)) + + def load(self, filename): diff --git a/debian/patches/series b/debian/patches/series index 0813e3c..52ca39f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 001_no-upstream-makefile.patch +002_locked-keys-are-valid.patch +003_hash-hostnames.patch diff --git a/paramiko/client.py b/paramiko/client.py index 5b28990..493d548 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -33,7 +33,7 @@ from paramiko.dsskey import DSSKey from paramiko.hostkeys import HostKeys from paramiko.resource import ResourceManager from paramiko.rsakey import RSAKey -from paramiko.ssh_exception import PasswordRequiredException, SSHException, BadHostKeyException +from paramiko.ssh_exception import SSHException, BadHostKeyException from paramiko.transport import Transport from paramiko.util import retry_on_signal @@ -466,9 +466,6 @@ class SSHClient (object): if not two_factor: return break - except PasswordRequiredException, e: - saved_exception = e - break except SSHException, e: saved_exception = e diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index 0f29f2b..f64e6e6 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -130,9 +130,9 @@ class HostKeys (UserDict.DictMixin): if filename is not None: self.load(filename) - def add(self, hostname, keytype, key, hash_hostname=True): + def add(self, hostname, keytype, key): """ - Add a host key entry to the table. Any existing entry for a + Add a host key entry to the table. Any existing entry for a C{(hostname, keytype)} pair will be replaced. @param hostname: the hostname (or IP) to add @@ -141,14 +141,11 @@ class HostKeys (UserDict.DictMixin): @type keytype: str @param key: the key to add @type key: L{PKey} - """ for e in self._entries: if (hostname in e.hostnames) and (e.key.get_name() == keytype): e.key = key return - if not hostname.startswith('|1|') and hash_hostname: - hostname = self.hash_host(hostname) self._entries.append(HostKeyEntry([hostname], key)) def load(self, filename): hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-paramiko.git" (Debian package python-paramiko).

1 0

page changed: doc:installation:x2goclient
by wiki-admin＠x2go.org 04 Sep '13

04 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/04 07:13 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient?rev=1378278815 New Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient Edit Summary: [Detailed] User : sunweaver @@ -49,9 +49,9 @@ </code> You can now start X2Go Client by typing ''x2goclient'' at the command-line or you'll find it inside the "Internet" section of your menu inside your graphical desktop environment. - If your version does not include x2go or you want to try that latest builds (it always takes some time until a new version arrives in the official repositories) you can add our repositories: + If your version does not include X2Go or you want to try that latest builds (it always takes some time until a new version arrives in the official repositories) you can add our repositories: * [[wiki:repositories:debian|Adding the X2Go repo to Debian GNU/Linux]] * [[wiki:repositories:ubuntu|Adding the X2Go repo to Ubuntu GNU/Linux]] -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:installation:x2goclient
by wiki-admin＠x2go.org 04 Sep '13

04 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/04 07:13 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient?rev=1378278797 New Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient Edit Summary: [Detailed] User : sunweaver @@ -47,9 +47,9 @@ <code bash> aptitude install x2goclient </code> - You can now start X2goClient by typing ''x2goclient'' at the command-line or you'll find it inside the "Internet" section of your menu inside your graphical desktop environment. + You can now start X2Go Client by typing ''x2goclient'' at the command-line or you'll find it inside the "Internet" section of your menu inside your graphical desktop environment. If your version does not include x2go or you want to try that latest builds (it always takes some time until a new version arrives in the official repositories) you can add our repositories: * [[wiki:repositories:debian|Adding the X2Go repo to Debian GNU/Linux]] -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:installation:x2goclient
by wiki-admin＠x2go.org 04 Sep '13

04 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/04 07:13 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 134.245.254.47 Hostname : m-047.informatik.uni-kiel.de Old Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient?rev=1378271969 New Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient Edit Summary: [Ubuntu / Debain] User : sunweaver @@ -30,9 +30,9 @@ System Preferences Config :!: To use print, local media sharing, and sound, one must also enable Remote Login in the System Preferences. - ===== Ubuntu / Debain ===== + ===== Ubuntu / Debian ===== ==== Quick ==== X2Go Client is part of Ubuntu 12.04 and 12.10 as well as Debian Wheezy. Install it using the software center or by following command: -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:installation:x2goclient
by wiki-admin＠x2go.org 04 Sep '13

04 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/04 05:19 Browser : Mozilla/5.0 (X11; Linux i686; rv:23.0) Gecko/20100101 Firefox/23.0 IP-Address : 80.187.109.105,12.19.145.234 Hostname : tmo-109-105.customers.d1-online.com,12.19.145.234 Old Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient?rev=1378271956 New Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient Edit Summary: [MacOS X] User : h1 @@ -10,9 +10,8 @@ :!: The Windows installer is based on Nullsoft and thus can be called with "/S" (case-sensitive) to perform a silent installation. ===== MacOS X ===== - [[http://code.x2go.org/releases/binary-macosx/x2goclient|Download X2Go for MacOS X™]] [[http://code.x2go.org/releases/binary-macosx/x2goclient/|Download X2Go for MacOS X™]] Xquartz -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:installation:x2goclient
by wiki-admin＠x2go.org 04 Sep '13

04 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/04 05:19 Browser : Mozilla/5.0 (X11; Linux i686; rv:23.0) Gecko/20100101 Firefox/23.0 IP-Address : 80.187.109.105,12.19.145.234 Hostname : tmo-109-105.customers.d1-online.com,12.19.145.234 Old Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient?rev=1378271881 New Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient Edit Summary: [MacOS X] User : h1 @@ -10,10 +10,10 @@ :!: The Windows installer is based on Nullsoft and thus can be called with "/S" (case-sensitive) to perform a silent installation. ===== MacOS X ===== - [[http://code.x2go.org/releases/binary-macosx/x2goclient| Download X2Go for MacOS X™]] - + [[http://code.x2go.org/releases/binary-macosx/x2goclient|Download X2Go for MacOS X™]] + [[http://code.x2go.org/releases/binary-macosx/x2goclient/|Download X2Go for MacOS X™]] Xquartz :!: The X2Go Mac client uses the OSX X11 server [[http://xquartz.macosforge.org/landing/ | Xquartz]]. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:installation:x2goclient
by wiki-admin＠x2go.org 04 Sep '13

04 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/04 05:18 Browser : Mozilla/5.0 (X11; Linux i686; rv:23.0) Gecko/20100101 Firefox/23.0 IP-Address : 80.187.109.105,12.19.145.234 Hostname : tmo-109-105.customers.d1-online.com,12.19.145.234 Old Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient?rev=1378249686 New Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goclient Edit Summary: [MacOS X] User : h1 @@ -10,9 +10,9 @@ :!: The Windows installer is based on Nullsoft and thus can be called with "/S" (case-sensitive) to perform a silent installation. ===== MacOS X ===== - [[http://code.x2go.org/releases/binary-macosx/x2goclient | Download X2Go for MacOS X™]] + [[http://code.x2go.org/releases/binary-macosx/x2goclient| Download X2Go for MacOS X™]] Xquartz -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

python-paramiko.git - x2go (branch) updated: 3589edbe9676dbcce32fb57885e99e35462f7507
by git-admin＠x2go.org 03 Sep '13

03 Sep '13

The branch, x2go has been updated via 3589edbe9676dbcce32fb57885e99e35462f7507 (commit) via 3a61f5253c8aba4b88003950fd1c6caa5646190c (commit) via 1a00a6498c75e1300455b00f92a1b5490449f0e2 (commit) via e06b0f597ec7ea78ad8dd98468ebb2fa8ef5c225 (commit) via 2a08a48dd2451e3139735c8b4f29d6d2516b8eb0 (commit) via d2c71ed9994baa167f7eaf26683f17a0be4b7c02 (commit) via 965d00dee951ffaee7458c7f8cb0a3c38ff46b25 (commit) via c8b75a489c569ea71b2166c6fbcc7f773397da3b (commit) via caf94786ca8c0bc9e3995da0a160c84921a3bfc6 (commit) via ba3ce80c14edac24c21c25aec2c0680df5927f00 (commit) via 993ecb31d2a0606cb1e95e85dd29ea2809866663 (commit) via 4ee577abc529603414836d9929f75fa8d67bbffb (commit) via 61c56f03a7678124f5115eb00b5015faae11c1e8 (commit) via d77a4d6421a726584da228c30587bfa265fee8ea (commit) via 3c2f01c91f798bc2ecefbd7c3864dc5e8c5af5c8 (commit) from 57d20a05fcf73e220e4217439d6b0b62b1c6687f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3589edbe9676dbcce32fb57885e99e35462f7507 Merge: 57d20a0 3a61f52 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 4 01:31:23 2013 +0200 Merge branch 'sunweaver-master' into x2go commit 3a61f5253c8aba4b88003950fd1c6caa5646190c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 4 00:58:46 2013 +0200 Detect valid SSH private keys that may require unlocking/decrypting prior to being usable. commit 1a00a6498c75e1300455b00f92a1b5490449f0e2 Merge: 61c56f0 e06b0f5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 4 01:01:44 2013 +0200 Merge branch 'master' into sunweaver-master commit 61c56f03a7678124f5115eb00b5015faae11c1e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 8 13:15:59 2013 +0200 Add method kwarg ,,hash_hostname'' to hostkeys.HostKeyEntry.add() method. Enable host key hashing by default as is standard with serveral current (Open)SSH implementations. ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++++++------ dev-requirements.txt | 2 ++ fabfile.py | 28 +++++++++++++++++++++++++++- paramiko/__init__.py | 4 +++- paramiko/client.py | 5 ++++- paramiko/hostkeys.py | 4 ++-- requirements.txt | 2 -- tox.ini | 2 +- 8 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 dev-requirements.txt delete mode 100644 requirements.txt The diff of changes is: diff --git a/NEWS b/NEWS index ef85eff..7365e4d 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.11.0 (DD MM YYYY) --------------------- +v1.11.0 (26th Jul 2013) +----------------------- * #98: On Windows, when interacting with the PuTTY PAgeant, Paramiko now creates the shared memory map with explicit Security Attributes of the user, @@ -29,11 +29,11 @@ v1.11.0 (DD MM YYYY) against duplicate entries during subsequent `known_hosts` loads.) Thanks to `@sunweaver` for the contribution. -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. diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 0000000..f706c46 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,2 @@ +tox>=1.4,<1.5 +epydoc>=3.0,<3.1 diff --git a/fabfile.py b/fabfile.py index 29394f9..7883dab 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1,8 +1,10 @@ -from fabric.api import task, sudo, env +from fabric.api import task, sudo, env, local, hosts from fabric.contrib.project import rsync_project +from fabric.contrib.console import confirm @task +@hosts("paramiko.org") def upload_docs(): target = "/var/www/paramiko.org" staging = "/tmp/paramiko_docs" @@ -11,3 +13,27 @@ def upload_docs(): sudo("rm -rf %s/*" % target) rsync_project(local_dir='docs/', remote_dir=staging, delete=True) sudo("cp -R %s/* %s/" % (staging, target)) + +@task +def build_docs(): + local("epydoc --no-private -o docs/ paramiko") + +@task +def clean(): + local("rm -rf build dist docs") + local("rm -f MANIFEST *.log demos/*.log") + local("rm -f paramiko/*.pyc") + local("rm -f test.log") + local("rm -rf paramiko.egg-info") + +@task +def test(): + local("python ./test.py") + +@task +def release(): + confirm("Only hit Enter if you remembered to update the version!") + confirm("Also, did you remember to tag your release?") + build_docs() + local("python setup.py sdist register upload") + upload_docs() diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 099314e..62cd51c 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -46,6 +46,8 @@ Paramiko is written entirely in python (no C or platform-dependent code) and is released under the GNU Lesser General Public License (LGPL). Website: U{https://github.com/paramiko/paramiko/} + +Mailing list: U{paramiko(a)librelist.com<mailto:paramiko@librelist.com>} """ import sys @@ -55,7 +57,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier <jeff(a)bitprophet.org>" -__version__ = "1.10.1" +__version__ = "1.11.0" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/paramiko/client.py b/paramiko/client.py index 493d548..5b28990 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -33,7 +33,7 @@ from paramiko.dsskey import DSSKey from paramiko.hostkeys import HostKeys from paramiko.resource import ResourceManager from paramiko.rsakey import RSAKey -from paramiko.ssh_exception import SSHException, BadHostKeyException +from paramiko.ssh_exception import PasswordRequiredException, SSHException, BadHostKeyException from paramiko.transport import Transport from paramiko.util import retry_on_signal @@ -466,6 +466,9 @@ class SSHClient (object): if not two_factor: return break + except PasswordRequiredException, e: + saved_exception = e + break except SSHException, e: saved_exception = e diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index 822e8e7..0f29f2b 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -66,7 +66,7 @@ class HostKeyEntry: fields = line.split(' ') if len(fields) < 3: # Bad number of fields - log.warn("Not enough fields found in known_hosts in line %s (%r)" % + log.info("Not enough fields found in known_hosts in line %s (%r)" % (lineno, line)) return None fields = fields[:3] @@ -82,7 +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,)) + log.info("Unable to handle key of type %s" % (keytype,)) return None except binascii.Error, e: raise InvalidHostKey(line, e) diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 75112a2..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pycrypto -tox diff --git a/tox.ini b/tox.ini index 6cb8001..e2a8dcf 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,5 @@ envlist = py25,py26,py27 [testenv] -commands = pip install --use-mirrors -q -r requirements.txt +commands = pip install --use-mirrors -q -r dev-requirements.txt python test.py hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-paramiko.git" (Debian package python-paramiko).

1 0

python-paramiko.git - master (branch) updated: e06b0f597ec7ea78ad8dd98468ebb2fa8ef5c225
by git-admin＠x2go.org 03 Sep '13

03 Sep '13

The branch, master has been updated via e06b0f597ec7ea78ad8dd98468ebb2fa8ef5c225 (commit) via 2a08a48dd2451e3139735c8b4f29d6d2516b8eb0 (commit) via d2c71ed9994baa167f7eaf26683f17a0be4b7c02 (commit) via 965d00dee951ffaee7458c7f8cb0a3c38ff46b25 (commit) via c8b75a489c569ea71b2166c6fbcc7f773397da3b (commit) via caf94786ca8c0bc9e3995da0a160c84921a3bfc6 (commit) via ba3ce80c14edac24c21c25aec2c0680df5927f00 (commit) via 993ecb31d2a0606cb1e95e85dd29ea2809866663 (commit) via 4ee577abc529603414836d9929f75fa8d67bbffb (commit) from d77a4d6421a726584da228c30587bfa265fee8ea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++++++------ dev-requirements.txt | 2 ++ fabfile.py | 28 +++++++++++++++++++++++++++- paramiko/__init__.py | 4 +++- requirements.txt | 2 -- tox.ini | 2 +- 6 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 dev-requirements.txt delete mode 100644 requirements.txt The diff of changes is: diff --git a/NEWS b/NEWS index ef85eff..7365e4d 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.11.0 (DD MM YYYY) --------------------- +v1.11.0 (26th Jul 2013) +----------------------- * #98: On Windows, when interacting with the PuTTY PAgeant, Paramiko now creates the shared memory map with explicit Security Attributes of the user, @@ -29,11 +29,11 @@ v1.11.0 (DD MM YYYY) against duplicate entries during subsequent `known_hosts` loads.) Thanks to `@sunweaver` for the contribution. -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. diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 0000000..f706c46 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,2 @@ +tox>=1.4,<1.5 +epydoc>=3.0,<3.1 diff --git a/fabfile.py b/fabfile.py index 29394f9..7883dab 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1,8 +1,10 @@ -from fabric.api import task, sudo, env +from fabric.api import task, sudo, env, local, hosts from fabric.contrib.project import rsync_project +from fabric.contrib.console import confirm @task +@hosts("paramiko.org") def upload_docs(): target = "/var/www/paramiko.org" staging = "/tmp/paramiko_docs" @@ -11,3 +13,27 @@ def upload_docs(): sudo("rm -rf %s/*" % target) rsync_project(local_dir='docs/', remote_dir=staging, delete=True) sudo("cp -R %s/* %s/" % (staging, target)) + +@task +def build_docs(): + local("epydoc --no-private -o docs/ paramiko") + +@task +def clean(): + local("rm -rf build dist docs") + local("rm -f MANIFEST *.log demos/*.log") + local("rm -f paramiko/*.pyc") + local("rm -f test.log") + local("rm -rf paramiko.egg-info") + +@task +def test(): + local("python ./test.py") + +@task +def release(): + confirm("Only hit Enter if you remembered to update the version!") + confirm("Also, did you remember to tag your release?") + build_docs() + local("python setup.py sdist register upload") + upload_docs() diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 099314e..62cd51c 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -46,6 +46,8 @@ Paramiko is written entirely in python (no C or platform-dependent code) and is released under the GNU Lesser General Public License (LGPL). Website: U{https://github.com/paramiko/paramiko/} + +Mailing list: U{paramiko(a)librelist.com<mailto:paramiko@librelist.com>} """ import sys @@ -55,7 +57,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier <jeff(a)bitprophet.org>" -__version__ = "1.10.1" +__version__ = "1.11.0" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 75112a2..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pycrypto -tox diff --git a/tox.ini b/tox.ini index 6cb8001..e2a8dcf 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,5 @@ envlist = py25,py26,py27 [testenv] -commands = pip install --use-mirrors -q -r requirements.txt +commands = pip install --use-mirrors -q -r dev-requirements.txt python test.py hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-paramiko.git" (Debian package python-paramiko).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits