comparison mercurial/sshpeer.py @ 35978:59e4a7781a36

sshpeer: implement peer for version 2 of wire protocol

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.

Differential Revision: https://phab.mercurial-scm.org/D2063

35977:625038cb4b1d

    # 3. Remote is a future Mercurial server that dropped ``hello``
    #    and other attempted handshake mechanisms.
    if not caps:
        badresponse()

    return caps

class sshv1peer(wireproto.wirepeer):
    def __init__(self, ui, url, proc, stdin, stdout, stderr, caps):
        """Create a peer from an existing SSH connection.

            self._pipeo.write(data)
        if flush:
            self._pipeo.flush()
        self._readerr()

def instance(ui, path, create):
    """Create an SSH peer.

    The returned object conforms to the ``wireproto.wirepeer`` interface.
    """

    proc, stdin, stdout, stderr = _makeconnection(ui, sshcmd, args, remotecmd,
                                                  remotepath, sshenv)

    try:
        caps = _performhandshake(ui, stdin, stdout, stderr)
    except Exception:
        _cleanuppipes(ui, stdout, stdin, stderr)
        raise

    return sshv1peer(ui, path, proc, stdin, stdout, stderr, caps)

35978:59e4a7781a36

    # 3. Remote is a future Mercurial server that dropped ``hello``
    #    and other attempted handshake mechanisms.
    if not caps:
        badresponse()

    return protoname, caps

class sshv1peer(wireproto.wirepeer):
    def __init__(self, ui, url, proc, stdin, stdout, stderr, caps):
        """Create a peer from an existing SSH connection.

            self._pipeo.write(data)
        if flush:
            self._pipeo.flush()
        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):
    """Create an SSH peer.

    The returned object conforms to the ``wireproto.wirepeer`` interface.
    """

    proc, stdin, stdout, stderr = _makeconnection(ui, sshcmd, args, remotecmd,
                                                  remotepath, sshenv)

    try:
        protoname, caps = _performhandshake(ui, stdin, stdout, stderr)
    except Exception:
        _cleanuppipes(ui, stdout, stdin, stderr)
        raise

    if protoname == wireprotoserver.SSHV1:
        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)