| yuja |
| hg-reviewers |
Upcoming changes to version 2 of the SSH protocol will introduce
binary components to the protocol. It will be easier to eliminate
trailing newlines and use binary in the tests if the protocol
payload is being generated by Python.
So use inline Python to write payloads to files and pipe those files
to server processes instead of shell strings/variables.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| $ cat >> server/.hg/hgrc << EOF | $ cat >> server/.hg/hgrc << EOF | ||||
| > [experimental] | > [experimental] | ||||
| > sshserver.support-v2 = true | > sshserver.support-v2 = true | ||||
| > EOF | > EOF | ||||
| Send an upgrade request to a server that supports upgrade | Send an upgrade request to a server that supports upgrade | ||||
| $ hg -R server serve --stdio << EOF | >>> with open('payload', 'wb') as fh: | ||||
| > upgrade this-is-some-token proto=exp-ssh-v2-0001 | ... fh.write(b'upgrade this-is-some-token proto=exp-ssh-v2-0001\n') | ||||
| > hello | ... fh.write(b'hello\n') | ||||
| > between | ... fh.write(b'between\n') | ||||
| > pairs 81 | ... fh.write(b'pairs 81\n') | ||||
| > 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 | ... fh.write(b'0000000000000000000000000000000000000000-0000000000000000000000000000000000000000') | ||||
| > EOF | |||||
| $ hg -R server serve --stdio < payload | |||||
| upgraded this-is-some-token exp-ssh-v2-0001 | upgraded this-is-some-token exp-ssh-v2-0001 | ||||
| 383 | 383 | ||||
| capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN | capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN | ||||
| $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server | $ hg --config experimental.sshpeer.advertise-v2=true --debug debugpeer ssh://user@dummy/server | ||||
| running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) | running * "*/tests/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) (no-windows !) | ||||
| running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) | running * "*\tests/dummyssh" "user@dummy" "hg -R server serve --stdio" (glob) (windows !) | ||||
| sending upgrade request: * proto=exp-ssh-v2-0001 (glob) | sending upgrade request: * proto=exp-ssh-v2-0001 (glob) | ||||
| heads | heads | ||||
| pushkey | pushkey | ||||
| remote-changegroup | remote-changegroup | ||||
| http | http | ||||
| https | https | ||||
| Command after upgrade to version 2 is processed | Command after upgrade to version 2 is processed | ||||
| $ hg -R server serve --stdio << EOF | >>> with open('payload', 'wb') as fh: | ||||
| > upgrade this-is-some-token proto=exp-ssh-v2-0001 | ... fh.write(b'upgrade this-is-some-token proto=exp-ssh-v2-0001\n') | ||||
| > hello | ... fh.write(b'hello\n') | ||||
| > between | ... fh.write(b'between\n') | ||||
| > pairs 81 | ... fh.write(b'pairs 81\n') | ||||
| > 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000hello | ... fh.write(b'0000000000000000000000000000000000000000-0000000000000000000000000000000000000000') | ||||
| > EOF | ... fh.write(b'hello\n') | ||||
| $ hg -R server serve --stdio < payload | |||||
| upgraded this-is-some-token exp-ssh-v2-0001 | upgraded this-is-some-token exp-ssh-v2-0001 | ||||
| 383 | 383 | ||||
| capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN | capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN | ||||
| 384 | 384 | ||||
| capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN | capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN | ||||
| Multiple upgrades is not allowed | Multiple upgrades is not allowed | ||||
| $ hg -R server serve --stdio << EOF | >>> with open('payload', 'wb') as fh: | ||||
| > upgrade this-is-some-token proto=exp-ssh-v2-0001 | ... fh.write(b'upgrade this-is-some-token proto=exp-ssh-v2-0001\n') | ||||
| > hello | ... fh.write(b'hello\n') | ||||
| > between | ... fh.write(b'between\n') | ||||
| > pairs 81 | ... fh.write(b'pairs 81\n') | ||||
| > 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000upgrade another-token proto=irrelevant | ... fh.write(b'0000000000000000000000000000000000000000-0000000000000000000000000000000000000000') | ||||
| > hello | ... fh.write(b'upgrade another-token proto=irrelevant\n') | ||||
| > EOF | ... fh.write(b'hello\n') | ||||
| $ hg -R server serve --stdio < payload | |||||
| upgraded this-is-some-token exp-ssh-v2-0001 | upgraded this-is-some-token exp-ssh-v2-0001 | ||||
| 383 | 383 | ||||
| capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN | capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN | ||||
| cannot upgrade protocols multiple times | cannot upgrade protocols multiple times | ||||
| - | - | ||||
| Malformed upgrade request line (not exactly 3 space delimited tokens) | Malformed upgrade request line (not exactly 3 space delimited tokens) | ||||