add ssh tunnel support to qtconsole #686

Merged
merged 6 commits into from Aug 17, 2011

Projects

None yet

2 participants

@minrk
Member
minrk commented Aug 8, 2011

title pretty much covers it.

This adds init_ssh step to qtconsole app, which will use the ssh tunneling code used elsewhere to forward connections.

So, in addition to pasting the usual --existing..., just add --ssh=foo, and you should be set.

@fperez
Member
fperez commented Aug 16, 2011

This is excellent, the only thing I'd like to see is a short section added to the qt console docs explaining users how to call it. It will save us from answering that question more than once on-list.

@fperez fperez commented on an outdated diff Aug 16, 2011
IPython/frontend/qt/console/qtconsoleapp.py
@@ -25,6 +26,7 @@ import sys
from IPython.external.qt import QtGui
from pygments.styles import get_all_styles
+# from IPython.external.ssh import tunnel
@fperez
fperez Aug 16, 2011 IPython member

This should probably just be deleted, since it's commented out.

@minrk
Member
minrk commented Aug 16, 2011

@fperez I fixed the comment you mentioned with a slightly more substantial change (I fixed the circular import altogether by making external.ssh as standalone as it should be in the first place). I'm working on the doc now.

@minrk
Member
minrk commented Aug 17, 2011

doc updated, can probably be merged

@fperez
Member
fperez commented Aug 17, 2011

except right now it won't merge anymore, there's a conflict on ssh/tunnel.py. Can you have a look?

minrk added some commits Aug 8, 2011
@minrk minrk add ssh tunnel support to qtconsole fcf87c2
@minrk minrk Remove IPython dependency in external.ssh
copy parallel.util.select_random_ports into external.ssh.tunnel

This lets external.ssh be moved to another project without IPython, only changing the pexpect import.

This also resolves a circular import in the qtconsole
34eefb9
@minrk minrk increase default ssh tunnel timeout to 60 seconds
also expose timeout to tunnel_connection function
65d9f3e
@minrk minrk add security / ssh tunnel notes to qtconsole docs d3a4730
@minrk minrk fix key->kbd role name for keys in qt doc fc63d37
@minrk minrk fix check/try typo in paramiko_tunnel c001961
@minrk
Member
minrk commented Aug 17, 2011

Roger - enginessh touched external.ssh as well, which was already merged. I rebased that one, because I thought this had already been merged. Now it should be clean.

@fperez
Member
fperez commented Aug 17, 2011

Looking great, thanks! Merging now.

@fperez fperez merged commit ba8f067 into ipython:master Aug 17, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment