8a5e99a70f
Remove skipping test when scp not in path.
...
An upcoming change renders this obsolete by adding scp's path to the
test sshd's PATH, and removing this first will make the subsequent sync
easier.
2023-01-13 15:49:48 +11:00
d888de06c5
upstream: rewrite this test to use a multiplexed ssh session so we can
...
control its lifecycle without risk of race conditions; fixes some of the
Github integration tests for openssh-portable
OpenBSD-Regress-ID: 5451cad59ba0d43ae9eeda48ec80f54405fee969
2023-01-11 11:54:13 +11:00
4a5590a5ee
try to improve logging for dynamic-forward test
...
previously the logs from the ssh used to exercise the forwarding
channel would clobber the logs from the ssh actually doing the
forwarding
2023-01-09 16:33:56 +11:00
dd1249bd5c
don't test IPv6 addresses if platform lacks support
2023-01-08 12:11:25 +11:00
d77fc611a6
upstream: When OpenSSL is not available, skip parts of percent test
...
that require it. Based on github pr#368 from ren mingshuai.
OpenBSD-Regress-ID: 49a375b2cf61ccb95b52e75e2e025cd10988ebb2
2023-01-08 12:11:03 +11:00
1cd2aac312
Use our own netcat for dynamic-forward test.
...
That way we can be surer about its behaviour rather than trying to
second-guess the behaviour of various netcat implementations.
2023-01-07 23:01:11 +11:00
344a0e8240
upstream: Save debug logs from ssh for debugging purposes.
...
OpenBSD-Regress-ID: 109e40b06de1c006a3b8e0d8745b790b2c5870a0
2023-01-06 21:37:40 +11:00
e1ef172646
upstream: regression test for ChannelTimeout
...
OpenBSD-Regress-ID: 280bfbefcfa415428ad744e43f69a8dede8ad685
2023-01-06 21:37:40 +11:00
2393ea8daf
upstream: fix typo in verbose logging
...
OpenBSD-Regress-ID: 0497cdb66e003b2f50ed77291a9104fba2e017e9
2023-01-06 21:37:40 +11:00
161a5378a3
upstream: unit tests for misc.c:ptimeout_* API
...
OpenBSD-Regress-ID: 01f8fb12d08e5aaadd4bd4e71f456b6588be9a94
2023-01-06 21:37:40 +11:00
018d671d78
upstream: Copy bytes from the_banana[] rather than banana()
...
Fixes test failure due to segfault seen on arm64 with xonly snap.
ok djm
OpenBSD-Regress-ID: 86e2aa4bbd1dff1bc4ebb2969c0d6474485be046
2023-01-06 20:25:14 +11:00
845ceecea2
upstream: regression test for PermitRemoteOpen
...
OpenBSD-Regress-ID: 8271aafbf5c21950cd5bf966f08e585cebfe630c
2023-01-03 17:53:05 +11:00
9a067e8d28
upstream: Fix comment typo.
...
OpenBSD-Regress-ID: 3b04faced6511bb5e74648c6a4ef4bf2c4decf03
2022-12-09 11:24:14 +11:00
5796bf8ca9
Restore ssh-agent permissions on exit.
...
...enough that subsequent builds can overwrite ssh-agent if necessary.
2022-12-02 11:55:08 +11:00
ccf5a13868
upstream: Clean up ssh-add and ssh-agent logs.
...
OpenBSD-Regress-ID: 9eda8e4c3714d7f943ab2e73ed58a233bd29cd2c
2022-12-02 11:51:18 +11:00
7a8b40cf6a
upstream: Log output of ssh-agent and ssh-add
...
This should make debugging easier.
OpenBSD-Regress-ID: 5974b02651f428d7e1079b41304c498ca7e306c8
2022-12-02 11:51:02 +11:00
a1febadf42
upstream: Use variable for diff options
...
instead of unconditionally specifying "-rN". This will make life easier
in -portable where not all diff's understand -N.
OpenBSD-Regress-ID: 8b8a407115546be1c6d72d350b1e4f1f960d3cd3
2022-11-01 11:10:48 +11:00
7190154de2
upstream: regress test for unmatched glob characters; fails before
...
previous commit but passes now. bz3488; prodded by dtucker@
OpenBSD-Regress-ID: 0cc5cc9ea4a6fd170dc61b9212f15badaafb3bbd
2022-10-25 08:56:38 +11:00
b98a42afb6
upstream: add some tests for parse_absolute_time(), including cases
...
where it is forced to the UTC timezone. bz3468 ok dtucker
OpenBSD-Regress-ID: ea07ca31c2f3847a38df028ca632763ae44e8759
2022-08-11 12:01:50 +10:00
5a4a9f7a96
upstream: Restore missing "!" in TEST_SSH_ELAPSED_TIMES test.
...
OpenBSD-Regress-ID: 38783f9676ec348c5a792caecee9a16e354b37b0
2022-07-25 17:33:44 +10:00
0ff886be13
upstream: Test TEST_SSH_ELAPSED_TIMES for empty string not
...
executable. No-op on most platforms but should prevent warnings in -portable
on systems that don't have 'date %s'.
OpenBSD-Regress-ID: e39d79867b8065e33d0c5926fa1a31f85659d2a4
2022-07-25 11:05:27 +10:00
f69319ad8a
Convert "have_prog" function into "which".
...
"which" and its behaviour is not standardized, so convert the existing
have_prog function into "which" so we can rely on it being available
and what its semantics are. Add a have_prog wrapper that maintains the
existing behaviour.
2022-07-23 14:40:49 +10:00
ea7ecc2c3a
Skip scp3 test if there's no scp on remote path.
...
scp -3 ends up using the scp that's in the remote path and will fail if
one is not available. Based on a patch from rapier at psc.edu.
2022-07-23 14:36:38 +10:00
c46f6fed41
crank SSH_SK_VERSION_MAJOR in sk-dummy.so
2022-07-20 13:39:14 +10:00
a061792a6e
Remove unintended changes.
...
I inadvertently included a couple of local changes with the OpenSSL
3.0.4 change. Revert, anything that should be there will be committed
separately.
2022-07-14 19:22:47 +10:00
76f4e48631
Only refuse to use OpenSSL 3.0.4 on x86_64.
...
The potential RCE only impacts x86_64, so only refuse to use it if we're
targetting a potentially impacted architecture. ok djm@
2022-07-13 13:17:47 +10:00
35ef2b3b6e
upstream: Add TEST_REGRESS_CACHE_DIR.
...
If set, it is used to cache regress test names that have succeeded and
skip those on a re-run.
OpenBSD-Regress-ID: a7570dd29a58df59f2cca647c3c2ec989b49f247
2022-07-04 19:41:06 +10:00
3d9b0845f3
upstream: test setenv in both client and server, test first-match-wins
...
too
OpenBSD-Regress-ID: 4c8804f9db38a02db480b9923317457b377fe34b
2022-06-03 14:34:12 +10:00
dc7bc52372
fix some bugs in the fuzzer
2022-05-30 09:29:20 +10:00
9b3ad432ad
fuzzer for authorized_keys parsing
...
mostly redundant to authopt_fuzz, but it's sensitive code so IMO it
makes sense to test this layer too
2022-05-27 17:00:43 +10:00
bedb93415b
upstream: regress test for in-place transfers and clobbering larger
...
files with smaller ones; would have caught last regression in scp(1)
OpenBSD-Regress-ID: 19de4e88dd3a4f7e5c1618c9be3c32415bd93bc2
2022-05-16 22:59:11 +10:00
b4f0d719c2
upstream: Only run agent-ptrace.sh if gdb is available as all
...
architectures do not ship with gdb.
OpenBSD-Regress-ID: ec53e928803e6b87f9ac142d38888ca79a45348d
2022-05-16 22:59:11 +10:00
c31404426d
upstream: It looks like we can't completely avoid
...
waiting for processes to exit so retrieve the pid via controlmaster and
use that.
OpenBSD-Regress-ID: 8246f00f22b14e49d2ff1744c94897ead33d457b
2022-04-21 12:05:26 +10:00
d19b21afab
upstream: Use ssh -f and ControlPersist ..
...
to start up test forwards and ssh -O stop to shut them down intead of
sleep loops. This speeds up the test by an order of magnitude.
OpenBSD-Regress-ID: eb3db5f805100919b092a3b2579c611fba3e83e7
2022-04-20 23:45:24 +10:00
5f76286a12
upstream: Simplify forward-control test.
...
Since we no longer need to support SSH1 we don't need to run shell
commands on the other end of the connection and can use ssh -N instead.
This also makes the test less racy.
OpenBSD-Regress-ID: 32e94ce272820cc398f30b848b2b0f080d10302c
2022-04-20 15:36:53 +10:00
687bbf2357
upstream: regression test for sftp cp command
...
OpenBSD-Regress-ID: c96bea9edde3a384b254785e7f9b2b24a81cdf82
2022-04-20 15:31:55 +10:00
81d33d8e3c
Skip agent-getpeereid when running as root.
2022-02-21 21:27:20 +11:00
fbd772570a
upstream: Aproximate realpath on the expected output by deduping
...
leading slashes. Fixes test failure when user's home dir is / which is
possible in some portable configurations.
OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63
2022-02-20 15:10:19 +11:00
b2aee35a1f
find sk-dummy.so when build_dir != src_dir
...
spotted by Corinna Vinschen; feedback & ok dtucker@
2022-02-17 21:15:16 +11:00
6ee53064f4
Fix helper include path and remove excess code.
...
Looks like test_hpdelim.c was imported twice into the same file.
Spotted by kevin.brott at gmail com and chris at cataclysmal org.
2022-02-11 10:05:31 +11:00
25bd659cc7
upstream: Add test for empty hostname with port.
...
OpenBSD-Regress-ID: e19e89d3c432b68997667efea44cf015bbe2a7e3
2022-02-10 15:17:28 +11:00
a29af853cf
upstream: Add unit tests for hpdelim.
...
OpenBSD-Regress-ID: be97b85c19895e6a1ce13c639765a3b48fd95018
2022-02-10 15:17:28 +11:00
253de42753
portable-specific string array constification
...
from Mike Frysinger
2022-02-02 16:52:07 +11:00
dfdcc2220c
upstream: test 'ssh-keygen -Y find-principals' with wildcard
...
principals; from Fabian Stelzer
OpenBSD-Regress-ID: fbe4da5f0032e7ab496527a5bf0010fd700f8f40
2022-02-02 16:51:04 +11:00
968e508967
upstream: Enable all supported ciphers and macs in the server
...
before trying to benchmark them. Increase the data file size to get more
signal.
OpenBSD-Regress-ID: dc3697d9f7defdfc51c608782c8e750128e46eb6
2022-02-02 16:51:04 +11:00
2e5cfed513
Improve compatibility of early exit trap handling.
...
Dash (as used by the github runners) has some differences in its trap
builtin:
- it doesn't have -p (which is fine, that's not in posix).
- it doesn't work in a subshell (which turns out to be in compliance
with posix, which means bash isn't).
- it doesn't work in a pipeline, ie "trap|cat" produces no output.
2022-01-20 13:43:54 +11:00
20da6ed136
Invoke EXIT handler early when using Valgrind.
...
When using Valgrind, we need to wait for all invoked programs to
complete before checking their valgrind logs. Some tests, notably
agent-restrict, set an EXIT trap handler to clean up things like
ssh-agent, but those do not get invoked until test-exec.sh exits.
This causes the Valgrind wait to deadlock, so if present invoke
the EXIT handler before checking the Valgrind logs.
2022-01-19 15:37:39 +11:00
976b9588b4
Wrap OpenSSL includes in unit tests in ifdef.
...
Fixes unit test on systems that do not have OpenSSL headers installed.
2022-01-14 13:47:27 +11:00
c171879374
Remove sort wrapper.
...
agent-restrict now takes care of this itself.
2022-01-13 16:01:41 +11:00
9cc2654403
upstream: Set LC_ALL in both local and remote shells so that sorted
...
output matches regardless of what the user's shell sets it to. ok djm@
OpenBSD-Regress-ID: 4e97dd69a68b05872033175a4c2315345d01837f
2022-01-13 16:01:41 +11:00
7a75f748cb
upstream: Avoid %'s in commands (not used in OpenBSD, but used in
...
-portable's Valgrind test) being interpretted as printf format strings.
OpenBSD-Regress-ID: dc8655db27ac4acd2c386c4681bf42a10d80b043
2022-01-13 15:49:38 +11:00
4bc2ba6095
upstream: Use egrep when searching for an anchored string.
...
OpenBSD-Regress-ID: dd114a2ac27ac4b06f9e4a586d3f6320c54aeeb4
2022-01-12 18:31:45 +11:00
6bf2efa267
Add "rev" command replacement if needed.
2022-01-12 18:25:06 +11:00
acabefe3f8
upstream: remove hardcoded domain and use window.location.host, so this
...
can be run anywhere
OpenBSD-Regress-ID: 2ac2ade3b6227d9c547351d3ccdfe671e62b7f92
2022-01-12 09:36:01 +11:00
3ef403f351
Add wrapper for "sort" to set LC_ALL=C.
...
Found by djm, this should make sorts stable and reduce test flakiness.
2022-01-10 21:07:38 +11:00
bd69e29f57
upstream: Remove errant "set -x" left over from debugging.
...
OpenBSD-Regress-ID: cd989268e034264cec5df97be7581549032c87dc
2022-01-08 19:01:43 +11:00
1a7c88e26f
upstream: Enable all supported hostkey algorithms (but no others).
...
Allows hostbased test to pass when built without OpenSSL.
OpenBSD-Regress-ID: 5ddd677a68b672517e1e78460dc6ca2ccc0a9562
2022-01-08 18:42:01 +11:00
dc38236ab6
upstream: Don't explicitly set HostbasedAuthentication in
...
sshd_config. It defaults to "no", and not explicitly setting it allows us to
enable it for the (optional) hostbased test.
OpenBSD-Regress-ID: aa8e3548eb5793721641d26e56c29f363b767c0c
2022-01-07 09:50:07 +11:00
e12d912ddf
upstream: Add test for hostbased auth. It requires some external
...
setup (see comments at the top) and thus is disabled unless
TEST_SSH_HOSTBASED_AUTH and SUDO are set.
OpenBSD-Regress-ID: 3ec8ba3750c5b595fc63e7845d13483065a4827a
2022-01-07 09:50:07 +11:00
294c11b1c7
upstream: select all RSA hostkey algorithms for UpdateHostkeys tests,
...
not just RSA-SHA1
OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8
2022-01-05 19:31:37 +11:00
2ea1108c30
upstream: regress test both sshsig message hash algorithms, possible
...
now because the algorithm is controllable via the CLI
OpenBSD-Regress-ID: 0196fa87acc3544b2b4fd98de844a571cb09a39f
2022-01-05 16:06:09 +11:00
37a14249ec
upstream: regression test for find-principals NULL deref; from Fabian
...
Stelzer
OpenBSD-Regress-ID: f845a8632a5a7d5ae26978004c93e796270fd3e5
2022-01-05 15:12:46 +11:00
8f3b180305
upstream: Log command invocation while debugging.
...
This will aid in manually reproducing failing commands.
OpenBSD-Regress-ID: b4aba8d5ac5675ceebeeeefa3261ce344e67333a
2022-01-05 11:51:04 +11:00
c672f83a89
upstream: unbreak test: was picking up system ssh-add instead of the
...
one supposedly being tested. Spotted by dtucker and using his VM zoo (which
includes some systems old enough to lack ed25519 key support)
OpenBSD-Regress-ID: 7976eb3df11cc2ca3af91030a6a8c0cef1590bb5
2022-01-04 18:22:37 +11:00
715c892f0a
remove sys/param.h in -portable, after upstream
2021-12-22 09:02:50 +11:00
7a7c69d8b4
add agent-restrict.sh file, missed in last commit
2021-12-20 13:05:20 +11:00
f539136ca5
upstream: regression test for destination restrictions in ssh-agent
...
OpenBSD-Regress-ID: 3c799d91e736b1753b4a42d80c42fc40de5ad33d
2021-12-20 12:17:18 +11:00
6e4980eb8e
upstream: Make use of ntests variable, pointed out by clang 13.
...
OpenBSD-Regress-ID: 4241a3d21bdfa1630ed429b6d4fee51038d1be72
2021-12-20 12:16:49 +11:00
3eead81583
upstream: sys/param.h cleanup, mostly using MINIMUM() and
...
<limits.h> ok dtucker
OpenBSD-Regress-ID: 172a4c45d3bcf92fa6cdf6c4b9db3f1b3abe4db0
2021-12-20 12:16:49 +11:00
d4035c81a7
upstream: whitespac e
...
OpenBSD-Regress-ID: b9511d41568056bda489e13524390167889908f8
2021-11-27 18:25:23 +11:00
a443491e67
upstream: regression test for match-principals. Mostly by Fabian
...
Stelzer
OpenBSD-Regress-ID: ced0bec89af90935103438986bbbc4ad1df9cfa7
2021-11-27 18:22:47 +11:00
a823f39986
upstream: regression test for ssh-keygen -Y find-principals fix; from
...
Fabian Stelzer ok djm markus
OpenBSD-Regress-ID: 34fe4088854c1a2eb4c0c51cc4676ba24096bac4
2021-11-19 08:33:59 +11:00
ed45a01686
upstream: crank SSH_SK_VERSION_MAJOR to match recent change in
...
usr/bin/ssh
OpenBSD-Regress-ID: 113d181c7e3305e138db9b688cdb8b0a0019e552
2021-11-03 10:10:09 +11:00
0328a081f3
upstream: sshsig: add tests for signing key validity and
...
find-principals
- adds generic find-principals tests (this command had none before)
- tests certs with a timeboxed validity both with and without a
restriced lifetime for the CA
- test for a revoked CA cert
by Fabian Stelzer
OpenBSD-Regress-ID: 9704b2c6df5b8ccfbdf2c06c5431f5f8cad280c9
2021-10-29 14:25:32 +11:00
ccd358e1e2
upstream: avoid signedness warning; spotted in -portable
...
OpenBSD-Regress-ID: 4cacc126086487c0ea7f3d86b42dec458cf0d0c6
2021-10-29 14:25:32 +11:00
a1217d363b
unbreak fuzz harness for recent changes
2021-10-29 13:48:59 +11:00
c5de1fffa6
upstream: increment SSH_SK_VERSION_MAJOR to match last change
...
OpenBSD-Regress-ID: 17873814d1cbda97f49c8528d7b5ac9cadf6ddc0
2021-10-28 13:57:52 +11:00
40bd3709dd
Skip SK unit tests when built without security-key
2021-10-07 15:55:49 +11:00
7cd062c3a2
Add USE_LIBC_SHA2 for (at least) NetBSD 9.
2021-10-06 17:45:28 +11:00
639c440f6c
Define OPENSSL_NO_SHA including OpenSSL from test.
...
We don't use SHA256 from OpenSSL in the sk-dummy module and the
definitions can conflict with system sha2.h (eg on NetBSD) so define
OPENSSL_NO_SHA so we don't attempt to redefine them.
2021-10-06 17:09:31 +11:00
e3e62deb54
upstream: use libc SHA256 functions; make this work when compiled
...
!WITH_OPENSSL
OpenBSD-Regress-ID: fda0764c1097cd42f979ace29b07eb3481259890
2021-10-06 14:40:26 +11:00
12937d8670
upstream: Add test for ssh hashed known_hosts handling.
...
OpenBSD-Regress-ID: bcef3b3cd5a1ad9899327b4b2183de2541aaf9cf
2021-10-06 14:39:32 +11:00
5a37cc118f
fix broken OPENSSL_HAS_ECC test
...
spotted by dtucker
2021-10-06 13:16:21 +11:00
16a25414f3
make sk-dummy.so work without libcrypto installed
2021-10-01 22:40:06 +10:00
76a398edfb
upstream: Fix up whitespace left by previous
...
change removing privsep. No other changes.
OpenBSD-Regress-ID: 87adec225d8afaee4d6a91b2b71203f52bf14b15
2021-10-01 14:55:12 +10:00
ddcb53b7a7
upstream: Remove references to privsep.
...
This removes several do..while loops but does not change the
indentation of the now-shallower loops, which will be done in a separate
whitespace-only commit to keep changes of style and substance separate.
OpenBSD-Regress-ID: 4bed1a0249df7b4a87c965066ce689e79472a8f7
2021-10-01 14:55:12 +10:00
ece2fbe486
upstream: Use "skip" instead of "fatal"
...
if SUDO isn't set for the *-command tests. This means running "make tests"
without SUDO set will perform all of the tests that it can instead of
failing on the ones it cannot run.
OpenBSD-Regress-ID: bd4dbbb02f34b2e8c890558ad4a696248def763a
2021-10-01 14:55:12 +10:00
c9172193ea
Remove TEST_SSH_ECC.
...
Convert the only remaining user of it to runtime detection using ssh -Q.
2021-09-29 18:33:38 +10:00
4fb49899d7
upstream: Test certificate hostkeys held in ssh-agent too. Would have
...
caught regression fixed in sshd r1.575
ok markus@
OpenBSD-Regress-ID: 1f164d7bd89f83762db823eec4ddf2d2556145ed
2021-09-29 11:35:18 +10:00
9b2ee74e3a
Move the fgrep replacement to hostkey-rotate.sh.
...
The fgrep replacement for buggy greps doesn't work in the sftp-glob test
so move it to just where we know it's needed.
2021-09-24 11:08:03 +10:00
f703954157
Replacement function for buggy fgrep.
...
GNU (f)grep <=2.18, as shipped by FreeBSD<=12 and NetBSD<=9 will
occasionally fail to find ssh host keys in the hostkey-rotate test.
If we have those versions, use awk instead.
2021-09-24 08:06:48 +10:00
7cc3fe2889
upstream: Add test for client termination status on signal.
...
Based on patch from Alexxz via github PR#235 with some tweaks, to
match patch in bz#3281.
OpenBSD-Regress-ID: d87c7446fb8b5f8b45894fbbd6875df326e729e2
2021-09-03 14:35:07 +10:00
cb37e2f0c0
upstream: Fix ssh-rsa fallback for old PuTTY interop tests.
...
OpenBSD-Regress-ID: a19ac929da604843a5b5f0f48d2c0eb6e0773d37
2021-09-01 13:32:45 +10:00
8b02ef0f28
upstream: Add a function to skip remaining tests.
...
Many tests skip tests for various reasons but not in a consistent way and
don't always clean up, so add that and switch the tests that do that over.
OpenBSD-Regress-ID: 72d2ec90a3ee8849486956a808811734281af735
2021-09-01 11:40:43 +10:00
d486845c07
upstream: Specify path to PuTTY keys.
...
Portable needs this and it makes no difference on OpenBSD, so resync
them. (Id sync only, Portable already had this.)
OpenBSD-Regress-ID: 33f6f66744455886d148527af8368811e4264162
2021-09-01 11:40:17 +10:00
d22b299115
upstream: Better compat tests with old PuTTY.
...
When running PuTTY interop tests and using a PuTTY version older than
0.76, re-enable the ssh-rsa host key algorithm (the 256 and 512 variants
of RSA were added some time between 0.73 and 0.76).
OpenBSD-Regress-ID: e6138d6987aa705fa1e4f216db0bb386e1ff38e1
2021-08-31 17:08:38 +10:00
87ad70d605
Resync PuTTY interop tests.
...
Resync behaviour when REGRESS_INTEROP_PUTTY is not set with OpenBSD.
2021-08-31 17:04:50 +10:00
e47b82a7bf
upstream: Specify hostkeyalgorithms in SSHFP test.
...
Specify host key algorithms in sshd's default set for the SSHFP test,
from djm@. Make the reason for when the test is skipped a bit clearer.
OpenBSD-Regress-ID: 4f923dfc761480d5411de17ea6f0b30de3e32cea
2021-08-31 12:02:12 +10:00
7db3e0a9e8
upstream: adapt to RSA/SHA1 deprectation
...
OpenBSD-Regress-ID: 952397c39a22722880e4de9d1c50bb1a14f907bb
2021-08-30 11:26:02 +10:00
b71b2508f1
Put stdint.h inside HAVE_STDINT_H.
...
From Tom G. Christensen.
2021-08-17 07:59:27 +10:00
Darren Tucker
djm@openbsd.org
Damien Miller
dtucker@openbsd.org
tb@openbsd.org
anton@openbsd.org
deraadt@openbsd.org