dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement support for parsing proxycommand.

This commit is contained in:
Olle Lundberg 2012-10-16 16:38:38 +02:00
parent d66d75f277
commit 7ce9875ed7
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
paramiko/config.py
View File

@ -23,6 +23,7 @@ L{SSHConfig}.
import fnmatch import fnmatch
import os import os
import re
import socket import socket
SSH_PORT = 22 SSH_PORT = 22
@ -43,6 +44,7 @@ class SSHConfig (object):
""" """
Create a new OpenSSH config object. Create a new OpenSSH config object.
""" """
self._proxyregex = re.compile(r"^(proxycommand)\s*=*\s*(.*)", re.I)
self._config = [] self._config = []
def parse(self, file_obj): def parse(self, file_obj):
@ -58,8 +60,15 @@ class SSHConfig (object):
if (line == '') or (line[0] == '#'): if (line == '') or (line[0] == '#'):
continue continue
if '=' in line: if '=' in line:
key, value = line.split('=', 1) if not line.lower().startswith('proxycommand'):
key = key.strip().lower() key, value = line.split('=', 1)
key = key.strip().lower()
else:
#ProxyCommand have been specified with an equal
# sign. Eat that and split in two groups.
match = self._proxyregex.match(line)
key = match.group(1).lower()
value = match.group(2)
else: else:
# find first whitespace, and split there # find first whitespace, and split there
i = 0 i = 0
@ -183,7 +192,14 @@ class SSHConfig (object):
('%l', fqdn), ('%l', fqdn),
('%u', user), ('%u', user),
('%r', remoteuser) ('%r', remoteuser)
]} ],
'proxycommand':
[
('%h', config['hostname']),
('%p', port),
('%r', remoteuser)
]
}
for k in config: for k in config:
if k in replacements: if k in replacements:
for find, replace in replacements[k]: for find, replace in replacements[k]: