diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-03-07 18:35:34 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-03-07 18:35:34 +1100 |
commit | 5d909f077336318267d4089f41c7deb5e4b6c64d (patch) | |
tree | ec0c2b55e66c7a116e48b8df4994dcec7bd20227 | |
parent | 894823ec69fbf5249c2d181e74cf42e392c623c3 (diff) |
- djm@cvs.openbsd.org 2005/03/04 08:48:46
[Makefile envpass.sh]
regress test for SendEnv config parsing bug; ok dtucker@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/Makefile | 4 | ||||
-rw-r--r-- | regress/envpass.sh | 21 |
3 files changed, 21 insertions, 9 deletions
@@ -15,6 +15,9 @@ | |||
15 | - djm@cvs.openbsd.org 2005/02/27 23:13:36 | 15 | - djm@cvs.openbsd.org 2005/02/27 23:13:36 |
16 | [login-timeout.sh] | 16 | [login-timeout.sh] |
17 | avoid nameservice lookups in regress test; ok dtucker@ | 17 | avoid nameservice lookups in regress test; ok dtucker@ |
18 | - djm@cvs.openbsd.org 2005/03/04 08:48:46 | ||
19 | [Makefile envpass.sh] | ||
20 | regress test for SendEnv config parsing bug; ok dtucker@ | ||
18 | 21 | ||
19 | 20050306 | 22 | 20050306 |
20 | - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor | 23 | - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor |
@@ -2301,4 +2304,4 @@ | |||
2301 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2304 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2302 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2305 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2303 | 2306 | ||
2304 | $Id: ChangeLog,v 1.3699 2005/03/07 07:34:04 dtucker Exp $ | 2307 | $Id: ChangeLog,v 1.3700 2005/03/07 07:35:34 dtucker Exp $ |
diff --git a/regress/Makefile b/regress/Makefile index eee1f3bf2..4f47bc3fd 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.35 2005/01/14 04:21:18 david Exp $ | 1 | # $OpenBSD: Makefile,v 1.36 2005/03/04 08:48:46 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
@@ -49,7 +49,7 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | |||
49 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ | 49 | rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \ |
50 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ | 50 | rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \ |
51 | ls.copy banner.in banner.out empty.in \ | 51 | ls.copy banner.in banner.out empty.in \ |
52 | scp-ssh-wrapper.scp \ | 52 | scp-ssh-wrapper.scp ssh_proxy_envpass \ |
53 | remote_pid | 53 | remote_pid |
54 | 54 | ||
55 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | 55 | #LTESTS += ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp |
diff --git a/regress/envpass.sh b/regress/envpass.sh index 5a7e178d8..af7eafe3d 100644 --- a/regress/envpass.sh +++ b/regress/envpass.sh | |||
@@ -1,13 +1,20 @@ | |||
1 | # $OpenBSD: envpass.sh,v 1.3 2004/06/22 22:42:02 dtucker Exp $ | 1 | # $OpenBSD: envpass.sh,v 1.4 2005/03/04 08:48:46 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="environment passing" | 4 | tid="environment passing" |
5 | 5 | ||
6 | # NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST) | 6 | # NB accepted env vars are in test-exec.sh (_XXX_TEST_* and _XXX_TEST) |
7 | 7 | ||
8 | # Prepare a custom config to test for a configuration parsing bug fixed in 4.0 | ||
9 | cat << EOF > $OBJ/ssh_proxy_envpass | ||
10 | Host test-sendenv-confparse-bug | ||
11 | SendEnv * | ||
12 | EOF | ||
13 | cat $OBJ/ssh_proxy >> $OBJ/ssh_proxy_envpass | ||
14 | |||
8 | trace "pass env, don't accept" | 15 | trace "pass env, don't accept" |
9 | verbose "test $tid: pass env, don't accept" | 16 | verbose "test $tid: pass env, don't accept" |
10 | _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy otherhost \ | 17 | _TEST_ENV=blah ${SSH} -oSendEnv="*" -F $OBJ/ssh_proxy_envpass otherhost \ |
11 | sh << 'EOF' | 18 | sh << 'EOF' |
12 | test -z "$_TEST_ENV" | 19 | test -z "$_TEST_ENV" |
13 | EOF | 20 | EOF |
@@ -18,7 +25,7 @@ fi | |||
18 | 25 | ||
19 | trace "don't pass env, accept" | 26 | trace "don't pass env, accept" |
20 | verbose "test $tid: don't pass env, accept" | 27 | verbose "test $tid: don't pass env, accept" |
21 | ${SSH} -F $OBJ/ssh_proxy otherhost \ | 28 | _XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -F $OBJ/ssh_proxy_envpass otherhost \ |
22 | sh << 'EOF' | 29 | sh << 'EOF' |
23 | test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B" | 30 | test -z "$_XXX_TEST_A" && test -z "$_XXX_TEST_B" |
24 | EOF | 31 | EOF |
@@ -29,8 +36,8 @@ fi | |||
29 | 36 | ||
30 | trace "pass single env, accept single env" | 37 | trace "pass single env, accept single env" |
31 | verbose "test $tid: pass single env, accept single env" | 38 | verbose "test $tid: pass single env, accept single env" |
32 | _XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy otherhost \ | 39 | _XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -F $OBJ/ssh_proxy_envpass \ |
33 | sh << 'EOF' | 40 | otherhost sh << 'EOF' |
34 | test X"$_XXX_TEST" = X"blah" | 41 | test X"$_XXX_TEST" = X"blah" |
35 | EOF | 42 | EOF |
36 | r=$? | 43 | r=$? |
@@ -41,7 +48,7 @@ fi | |||
41 | trace "pass multiple env, accept multiple env" | 48 | trace "pass multiple env, accept multiple env" |
42 | verbose "test $tid: pass multiple env, accept multiple env" | 49 | verbose "test $tid: pass multiple env, accept multiple env" |
43 | _XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \ | 50 | _XXX_TEST_A=1 _XXX_TEST_B=2 ${SSH} -oSendEnv="_XXX_TEST_*" \ |
44 | -F $OBJ/ssh_proxy otherhost \ | 51 | -F $OBJ/ssh_proxy_envpass otherhost \ |
45 | sh << 'EOF' | 52 | sh << 'EOF' |
46 | test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2" | 53 | test X"$_XXX_TEST_A" = X"1" -a X"$_XXX_TEST_B" = X"2" |
47 | EOF | 54 | EOF |
@@ -49,3 +56,5 @@ r=$? | |||
49 | if [ $r -ne 0 ]; then | 56 | if [ $r -ne 0 ]; then |
50 | fail "environment not found" | 57 | fail "environment not found" |
51 | fi | 58 | fi |
59 | |||
60 | rm -f $OBJ/ssh_proxy_envpass | ||