| durin42 |
| hg-reviewers |
Since the protocol is now negotiated before we construct a
peer instance, we can return the negotiated protocol from the
handshake function and instantiate an appropriate peer class
for the protocol.
Version 2 of the SSH protocol is currently identical to version
1 post handshake. So our sshv2peer class just inherits from
sshv1peer for the time being. This will obviously change
over time.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/sshpeer.py (19 lines) | |||
| M | tests/test-check-interfaces.py (2 lines) |
| # | # | ||||
| # 1. Remote isn't a Mercurial server | # 1. Remote isn't a Mercurial server | ||||
| # 2. Remote is a <0.9.1 Mercurial server | # 2. Remote is a <0.9.1 Mercurial server | ||||
| # 3. Remote is a future Mercurial server that dropped ``hello`` | # 3. Remote is a future Mercurial server that dropped ``hello`` | ||||
| # and other attempted handshake mechanisms. | # and other attempted handshake mechanisms. | ||||
| if not caps: | if not caps: | ||||
| badresponse() | badresponse() | ||||
| return caps | return protoname, caps | ||||
| class sshv1peer(wireproto.wirepeer): | class sshv1peer(wireproto.wirepeer): | ||||
| def __init__(self, ui, url, proc, stdin, stdout, stderr, caps): | def __init__(self, ui, url, proc, stdin, stdout, stderr, caps): | ||||
| """Create a peer from an existing SSH connection. | """Create a peer from an existing SSH connection. | ||||
| ``proc`` is a handle on the underlying SSH process. | ``proc`` is a handle on the underlying SSH process. | ||||
| ``stdin``, ``stdout``, and ``stderr`` are handles on the stdio | ``stdin``, ``stdout``, and ``stderr`` are handles on the stdio | ||||
| pipes for that process. | pipes for that process. | ||||
| def _send(self, data, flush=False): | def _send(self, data, flush=False): | ||||
| self._pipeo.write("%d\n" % len(data)) | self._pipeo.write("%d\n" % len(data)) | ||||
| if data: | if data: | ||||
| self._pipeo.write(data) | self._pipeo.write(data) | ||||
| if flush: | if flush: | ||||
| self._pipeo.flush() | self._pipeo.flush() | ||||
| self._readerr() | self._readerr() | ||||
| class sshv2peer(sshv1peer): | |||||
| """A peer that speakers version 2 of the transport protocol.""" | |||||
| # Currently version 2 is identical to version 1 post handshake. | |||||
| # And handshake is performed before the peer is instantiated. So | |||||
| # we need no custom code. | |||||
| def instance(ui, path, create): | def instance(ui, path, create): | ||||
| """Create an SSH peer. | """Create an SSH peer. | ||||
| The returned object conforms to the ``wireproto.wirepeer`` interface. | The returned object conforms to the ``wireproto.wirepeer`` interface. | ||||
| """ | """ | ||||
| u = util.url(path, parsequery=False, parsefragment=False) | u = util.url(path, parsequery=False, parsefragment=False) | ||||
| if u.scheme != 'ssh' or not u.host or u.path is None: | if u.scheme != 'ssh' or not u.host or u.path is None: | ||||
| raise error.RepoError(_("couldn't parse location %s") % path) | raise error.RepoError(_("couldn't parse location %s") % path) | ||||
| res = ui.system(cmd, blockedtag='sshpeer', environ=sshenv) | res = ui.system(cmd, blockedtag='sshpeer', environ=sshenv) | ||||
| if res != 0: | if res != 0: | ||||
| raise error.RepoError(_('could not create remote repo')) | raise error.RepoError(_('could not create remote repo')) | ||||
| proc, stdin, stdout, stderr = _makeconnection(ui, sshcmd, args, remotecmd, | proc, stdin, stdout, stderr = _makeconnection(ui, sshcmd, args, remotecmd, | ||||
| remotepath, sshenv) | remotepath, sshenv) | ||||
| try: | try: | ||||
| caps = _performhandshake(ui, stdin, stdout, stderr) | protoname, caps = _performhandshake(ui, stdin, stdout, stderr) | ||||
| except Exception: | except Exception: | ||||
| _cleanuppipes(ui, stdout, stdin, stderr) | _cleanuppipes(ui, stdout, stdin, stderr) | ||||
| raise | raise | ||||
| if protoname == wireprotoserver.SSHV1: | |||||
| return sshv1peer(ui, path, proc, stdin, stdout, stderr, caps) | return sshv1peer(ui, path, proc, stdin, stdout, stderr, caps) | ||||
| elif protoname == wireprotoserver.SSHV2: | |||||
| return sshv2peer(ui, path, proc, stdin, stdout, stderr, caps) | |||||
| else: | |||||
| _cleanuppipes(ui, stdout, stdin, stderr) | |||||
| raise error.RepoError(_('unknown version of SSH protocol: %s') % | |||||
| protoname) | |||||
| def main(): | def main(): | ||||
| ui = uimod.ui() | ui = uimod.ui() | ||||
| checkobject(badpeer()) | checkobject(badpeer()) | ||||
| checkobject(httppeer.httppeer(ui, 'http://localhost')) | checkobject(httppeer.httppeer(ui, 'http://localhost')) | ||||
| checkobject(localrepo.localpeer(dummyrepo())) | checkobject(localrepo.localpeer(dummyrepo())) | ||||
| checkobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', None, None, None, | checkobject(sshpeer.sshv1peer(ui, 'ssh://localhost/foo', None, None, None, | ||||
| None, None)) | None, None)) | ||||
| checkobject(sshpeer.sshv2peer(ui, 'ssh://localhost/foo', None, None, None, | |||||
| None, None)) | |||||
| checkobject(bundlerepo.bundlepeer(dummyrepo())) | checkobject(bundlerepo.bundlepeer(dummyrepo())) | ||||
| checkobject(statichttprepo.statichttppeer(dummyrepo())) | checkobject(statichttprepo.statichttppeer(dummyrepo())) | ||||
| checkobject(unionrepo.unionpeer(dummyrepo())) | checkobject(unionrepo.unionpeer(dummyrepo())) | ||||
| main() | main() | ||||