This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2206

tests: test using both versions of SSH protocol
ClosedPublic

Authored by indygreg on Feb 12 2018, 7:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1ee1a42bfdae: tests: test using both versions of SSH protocol
rHG32ffa12b5c66: tests: test using both versions of SSH protocol
Summary

Now that the version 2 of the SSH protocol is usable in core, we
can start actively testing it more widely outside of low-level
protocol tests.

We add #testcases variants to a handful of tests so we exercise both
version 1 and version 2 of the SSH protocol when testing. This will
allow us to more easily find regressions and variances as protocol 2
is developed. It will also make it easier to continue testing with
protocol version 1 once version 2 is enabled by default.

There are a handful of tests using ssh:// that should also gain test
variances. One - test-push-race.t - already has a #testcases. This
would require combinatorial cases. I didn't want to go down that
rabbit hole, so that test is unchanged. Thinking aloud, there is
probably an opportunity to automatically run tests with multiple
server/protocol implementations. Ideally any test that performed
server interaction would run with all supported server implementations
and protocols so we could find variances between servers and protocols.
But this has been a long-standing issue with our test harness. I
don't think it is an easily solved problem. But it would be nice...

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.Feb 12 2018, 7:46 PM
Closed by commit rHG32ffa12b5c66: tests: test using both versions of SSH protocol (authored by indygreg). · Explain WhyFeb 14 2018, 9:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5740

tests/test-bundle2-exchange.t

#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
Test exchange of common information using bundle2 Test exchange of common information using bundle2
$ getmainid() { $ getmainid() {
> hg -R main log --template '{node}\n' --rev "$1" > hg -R main log --template '{node}\n' --rev "$1"
> } > }
enable obsolescence enable obsolescence

tests/test-bundle2-pushback.t

#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
$ cat > bundle2.py << EOF $ cat > bundle2.py << EOF
> """A small extension to test bundle2 pushback parts. > """A small extension to test bundle2 pushback parts.
> Current bundle2 implementation doesn't provide a way to generate those > Current bundle2 implementation doesn't provide a way to generate those
> parts, so they must be created by extensions. > parts, so they must be created by extensions.
> """ > """
> from __future__ import absolute_import > from __future__ import absolute_import
> from mercurial import bundle2, exchange, pushkey, util > from mercurial import bundle2, exchange, pushkey, util
> def _newhandlechangegroup(op, inpart): > def _newhandlechangegroup(op, inpart):

tests/test-bundle2-remote-changegroup.t

#require killdaemons #require killdaemons
#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
Create an extension to test bundle2 remote-changegroup parts Create an extension to test bundle2 remote-changegroup parts
$ cat > bundle2.py << EOF $ cat > bundle2.py << EOF
> """A small extension to test bundle2 remote-changegroup parts. > """A small extension to test bundle2 remote-changegroup parts.
> >
> Current bundle2 implementation doesn't provide a way to generate those > Current bundle2 implementation doesn't provide a way to generate those
> parts, so they must be created by extensions. > parts, so they must be created by extensions.
> """ > """

tests/test-clone.t

#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
Prepare repo a: Prepare repo a:
$ hg init a $ hg init a
$ cd a $ cd a
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -m test $ hg commit -m test
$ echo first line > b $ echo first line > b
$ hg clone 'ssh://-oProxyCommand=touch owned%20foo@example.com/nonexistent/path' $ hg clone 'ssh://-oProxyCommand=touch owned%20foo@example.com/nonexistent/path'
abort: potentially unsafe url: 'ssh://-oProxyCommand=touch owned foo@example.com/nonexistent/path' abort: potentially unsafe url: 'ssh://-oProxyCommand=touch owned foo@example.com/nonexistent/path'
[255] [255]
#if windows #if windows
$ hg clone "ssh://%26touch%20owned%20/" --debug $ hg clone "ssh://%26touch%20owned%20/" --debug
running sh -c "read l; read l; read l" "&touch owned " "hg -R . serve --stdio" running sh -c "read l; read l; read l" "&touch owned " "hg -R . serve --stdio"
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
$ hg clone "ssh://example.com:%26touch%20owned%20/" --debug $ hg clone "ssh://example.com:%26touch%20owned%20/" --debug
running sh -c "read l; read l; read l" -p "&touch owned " example.com "hg -R . serve --stdio" running sh -c "read l; read l; read l" -p "&touch owned " example.com "hg -R . serve --stdio"
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
#else #else
$ hg clone "ssh://%3btouch%20owned%20/" --debug $ hg clone "ssh://%3btouch%20owned%20/" --debug
running sh -c "read l; read l; read l" ';touch owned ' 'hg -R . serve --stdio' running sh -c "read l; read l; read l" ';touch owned ' 'hg -R . serve --stdio'
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
$ hg clone "ssh://example.com:%3btouch%20owned%20/" --debug $ hg clone "ssh://example.com:%3btouch%20owned%20/" --debug
running sh -c "read l; read l; read l" -p ';touch owned ' example.com 'hg -R . serve --stdio' running sh -c "read l; read l; read l" -p ';touch owned ' example.com 'hg -R . serve --stdio'
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
#endif #endif
$ hg clone "ssh://v-alid.example.com/" --debug $ hg clone "ssh://v-alid.example.com/" --debug
running sh -c "read l; read l; read l" v-alid\.example\.com ['"]hg -R \. serve --stdio['"] (re) running sh -c "read l; read l; read l" v-alid\.example\.com ['"]hg -R \. serve --stdio['"] (re)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
abort: no suitable response from remote hg! abort: no suitable response from remote hg!
[255] [255]
We should not have created a file named owned - if it exists, the We should not have created a file named owned - if it exists, the
attack succeeded. attack succeeded.
$ if test -f owned; then echo 'you got owned'; fi $ if test -f owned; then echo 'you got owned'; fi

tests/test-largefiles-wireproto.t

#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
This file contains testcases that tend to be related to the wire protocol part This file contains testcases that tend to be related to the wire protocol part
of largefiles. of largefiles.
$ USERCACHE="$TESTTMP/cache"; export USERCACHE $ USERCACHE="$TESTTMP/cache"; export USERCACHE
$ mkdir "${USERCACHE}" $ mkdir "${USERCACHE}"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> largefiles= > largefiles=

tests/test-pull.t

#require serve #require serve
#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
$ hg init test $ hg init test
$ cd test $ cd test
$ echo foo>foo $ echo foo>foo
$ hg addremove $ hg addremove
adding foo adding foo
$ hg commit -m 1 $ hg commit -m 1

tests/test-ssh-bundle1.t

This test is a duplicate of 'test-http.t' feel free to factor out This test is a duplicate of 'test-http.t' feel free to factor out
parts that are not bundle1/bundle2 specific. parts that are not bundle1/bundle2 specific.
#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [devel] > [devel]
> # This test is dedicated to interaction through old bundle > # This test is dedicated to interaction through old bundle
> legacy.exchange = bundle1 > legacy.exchange = bundle1
> [format] # temporary settings > [format] # temporary settings
> usegeneraldelta=yes > usegeneraldelta=yes
> EOF > EOF
remote: KABOOM remote: KABOOM
local stdout local stdout
debug output debug output
$ hg pull --debug ssh://user@dummy/remote $ hg pull --debug ssh://user@dummy/remote
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
sending hello command sending hello command
sending between command sending between command
remote: 384 protocol upgraded to exp-ssh-v2-0001 (sshv2 !)
remote: 384 (sshv1 !)
remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
remote: 1 remote: 1 (sshv1 !)
preparing listkeys for "bookmarks" preparing listkeys for "bookmarks"
sending listkeys command sending listkeys command
received listkey for "bookmarks": 45 bytes received listkey for "bookmarks": 45 bytes
query 1; heads query 1; heads
sending batch command sending batch command
searching for changes searching for changes
all remote heads known locally all remote heads known locally
no changes found no changes found

tests/test-ssh-clone-r.t

This test tries to exercise the ssh functionality with a dummy script This test tries to exercise the ssh functionality with a dummy script
#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
creating 'remote' repo creating 'remote' repo
$ hg init remote $ hg init remote
$ cd remote $ cd remote
$ hg unbundle "$TESTDIR/bundles/remote.hg" $ hg unbundle "$TESTDIR/bundles/remote.hg"
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes

tests/test-ssh.t

#testcases sshv1 sshv2
#if sshv2
$ cat >> $HGRCPATH << EOF
> [experimental]
> sshpeer.advertise-v2 = true
> sshserver.support-v2 = true
> EOF
#endif
This test tries to exercise the ssh functionality with a dummy script This test tries to exercise the ssh functionality with a dummy script
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [format] > [format]
> usegeneraldelta=yes > usegeneraldelta=yes
> EOF > EOF
remote: KABOOM IN PROCESS remote: KABOOM IN PROCESS
local stdout local stdout
debug output debug output
$ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes $ hg pull --debug ssh://user@dummy/remote --config devel.debug.peer-request=yes
pulling from ssh://user@dummy/remote pulling from ssh://user@dummy/remote
running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re)
sending upgrade request: * proto=exp-ssh-v2-0001 (glob) (sshv2 !)
devel-peer-request: hello devel-peer-request: hello
sending hello command sending hello command
devel-peer-request: between devel-peer-request: between
devel-peer-request: pairs: 81 bytes devel-peer-request: pairs: 81 bytes
sending between command sending between command
remote: 384 remote: 384 (sshv1 !)
protocol upgraded to exp-ssh-v2-0001 (sshv2 !)
remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN
remote: 1 remote: 1 (sshv1 !)
query 1; heads query 1; heads
devel-peer-request: batch devel-peer-request: batch
devel-peer-request: cmds: 141 bytes devel-peer-request: cmds: 141 bytes
sending batch command sending batch command
searching for changes searching for changes
all remote heads known locally all remote heads known locally
no changes found no changes found
devel-peer-request: getbundle devel-peer-request: getbundle