This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2981

wireproto: mark SSHv2 as a version 1 transport
ClosedPublic

Authored by indygreg on Mar 30 2018, 5:16 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG27527d8cff5c: wireproto: mark SSHv2 as a version 1 transport
Summary

The version component is used for filtering/routing wire protocol
commands to their proper handler. The actual version 2 of the wire
protocol commands will use a different encoding of responses. We
already have tests using the version 2 SSH transport and version 2
of the wire protocol commands won't be implemented atomically.

This commit marks the SSHv2 transport as version 1 so it will
still invoke the version 1 commands. Once the commands are all
implemented in version 2, we can restore its proper behavior.

Some tests had to be disabled as a result of this change.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 30 2018, 5:16 PM
durin42 accepted this revision.Apr 3 2018, 11:46 AM
This revision is now accepted and ready to land.Apr 3 2018, 11:46 AM
Closed by commit rHG27527d8cff5c: wireproto: mark SSHv2 as a version 1 transport (authored by indygreg). · Explain WhyApr 3 2018, 12:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprototypes.py (3 lines)
Mtests/test-ssh-proto.t (52 lines)

Diff 7555

mercurial/wireprototypes.py

# All available wire protocol transports. # All available wire protocol transports.
TRANSPORTS = { TRANSPORTS = {
SSHV1: { SSHV1: {
'transport': 'ssh', 'transport': 'ssh',
'version': 1, 'version': 1,
}, },
SSHV2: { SSHV2: {
'transport': 'ssh', 'transport': 'ssh',
'version': 2, # TODO mark as version 2 once all commands are implemented.
'version': 1,
}, },
'http-v1': { 'http-v1': {
'transport': 'http', 'transport': 'http',
'version': 1, 'version': 1,
}, },
HTTPV2: { HTTPV2: {
'transport': 'http', 'transport': 'http',
'version': 2, 'version': 2,

tests/test-ssh-proto.t

o> upgraded this-is-some-token exp-ssh-v2-0001\n o> upgraded this-is-some-token exp-ssh-v2-0001\n
o> readline() -> 4: o> readline() -> 4:
o> 402\n o> 402\n
o> readline() -> 403: o> readline() -> 403:
o> capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n o> capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
i> write(6) -> 6: i> write(6) -> 6:
i> hello\n i> hello\n
o> readline() -> 4: o> readline() -> 4:
o> 385\n o> 403\n
o> readline() -> 385: o> readline() -> 403:
o> capabilities: lookup branchmap pushkey known getbundle unbundlehash streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n o> capabilities: lookup branchmap pushkey known getbundle unbundlehash changegroupsubset streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN batch\n
Multiple upgrades is not allowed Multiple upgrades is not allowed
$ hg debugwireproto --localssh --peer raw << EOF $ hg debugwireproto --localssh --peer raw << EOF
> raw > raw
> upgrade this-is-some-token proto=exp-ssh-v2-0001\n > upgrade this-is-some-token proto=exp-ssh-v2-0001\n
> hello\n > hello\n
> between\n > between\n
o> \n o> \n
o> read(-1) -> 0: o> read(-1) -> 0:
e> read(-1) -> 49: e> read(-1) -> 49:
e> malformed handshake protocol: missing pairs 81\n e> malformed handshake protocol: missing pairs 81\n
e> -\n e> -\n
Legacy commands are not exposed to version 2 of protocol Legacy commands are not exposed to version 2 of protocol
TODO re-enable these once we're back to actually using v2 commands
$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF $ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
> command branches > command branches
> nodes 0000000000000000000000000000000000000000 > nodes 0000000000000000000000000000000000000000
> EOF > EOF
creating ssh peer from handshake results creating ssh peer from handshake results
sending branches command sending branches command
response: response:
$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF $ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
> command changegroup > command changegroup
> roots 0000000000000000000000000000000000000000 > roots 0000000000000000000000000000000000000000
> EOF > EOF
creating ssh peer from handshake results creating ssh peer from handshake results
sending changegroup command sending changegroup command
response: response:
$ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF $ hg --config experimental.sshpeer.advertise-v2=true debugwireproto --localssh << EOF
> command changegroupsubset > command changegroupsubset
> bases 0000000000000000000000000000000000000000 > bases 0000000000000000000000000000000000000000
> heads 0000000000000000000000000000000000000000 > heads 0000000000000000000000000000000000000000
> EOF > EOF
creating ssh peer from handshake results creating ssh peer from handshake results
sending changegroupsubset command sending changegroupsubset command
response: response:
$ cd .. $ cd ..
Test listkeys for listing namespaces Test listkeys for listing namespaces
$ hg init empty $ hg init empty
$ cd empty $ cd empty
$ debugwireproto << EOF $ debugwireproto << EOF